mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-05 12:07:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted the toolbar and pass card text size

Browse Source
This commit is contained in:
Arty Bishop committed 2020-01-29 10:12:00 +00:00
1 parent 4c1badacb3
commit b3a47dc5db
3 files changed
+61 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/app_bar_main.xml
+3 -1
View File
@@ -19,11 +19,13 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbar_layout" android:id="@+id/toolbar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/toolbar_timer" android:id="@+id/toolbar_timer"
style="@style/ToolbarText" style="@style/ToolbarText"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/toolbar_filter" app:layout_constraintEnd_toStartOf="@+id/toolbar_filter"
app/src/main/res/layout/card_pass.xml
+56 -44
View File
@@ -29,17 +29,44 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@drawable/card_pass_bg"> android:background="@drawable/card_pass_bg">
<TextView
android:id="@+id/pass_losAz"
style="@style/CardPassText"
android:text="@string/pass_los_az"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"
app:layout_constraintEnd_toEndOf="@+id/pass_progress"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/pass_maxEl" />
<TextView
android:id="@+id/pass_satId"
style="@style/CardPassName"
android:layout_marginTop="4dp"
android:text="@string/pass_satId"
app:layout_constraintEnd_toEndOf="@+id/pass_progress"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/pass_maxEl"
style="@style/CardPassText"
android:layout_marginTop="4dp"
android:text="@string/pass_maxEl"
app:layout_constraintEnd_toStartOf="@+id/pass_losAz"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/pass_aosAz"
app:layout_constraintTop_toBottomOf="@+id/pass_satId" />
<ImageView <ImageView
android:id="@+id/pass_img" android:id="@+id/pass_img"
android:layout_width="22dp" android:layout_width="20dp"
android:layout_height="22dp" android:layout_height="20dp"
android:layout_marginStart="8dp"
android:contentDescription="@string/placeholder" android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="@+id/pass_satName" app:layout_constraintBottom_toBottomOf="@+id/pass_satName"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/pass_progress"
app:layout_constraintTop_toTopOf="@+id/pass_satName"
app:srcCompat="@drawable/ic_pass_inactive" /> app:srcCompat="@drawable/ic_pass_inactive" />
<TextView <TextView
@@ -47,68 +74,53 @@
style="@style/CardPassName" style="@style/CardPassName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:text="@string/pass_satName" android:text="@string/pass_satName"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_satId" app:layout_constraintBottom_toBottomOf="@+id/pass_satId"
app:layout_constraintStart_toEndOf="@+id/pass_img" /> app:layout_constraintEnd_toStartOf="@+id/pass_satId"
app:layout_constraintHorizontal_bias="0.02"
<TextView app:layout_constraintStart_toEndOf="@+id/pass_img"
android:id="@+id/pass_satId" app:layout_constraintTop_toTopOf="@+id/pass_satId" />
style="@style/CardPassName"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:text="@string/pass_satId"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/pass_aosAz" android:id="@+id/pass_aosAz"
style="@style/CardPassText" style="@style/CardPassText"
android:text="@string/pass_aos_az" android:text="@string/pass_aos_az"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl" app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"
app:layout_constraintStart_toStartOf="@+id/pass_progress" /> app:layout_constraintEnd_toStartOf="@+id/pass_maxEl"
<TextView
android:id="@+id/pass_losAz"
style="@style/CardPassText"
android:text="@string/pass_los_az"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"
app:layout_constraintEnd_toEndOf="@+id/pass_progress" />
<TextView
android:id="@+id/pass_maxEl"
style="@style/CardPassText"
android:layout_marginTop="4dp"
android:text="@string/pass_maxEl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/pass_aosAz" app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/pass_progress" />
app:layout_constraintTop_toBottomOf="@+id/pass_satId" />
<TextView <TextView
android:id="@+id/pass_aosTime" android:id="@+id/pass_aosTime"
style="@style/CardPassText" style="@style/CardPassText"
android:layout_marginBottom="6dp"
android:text="@string/pass_dateTime" android:text="@string/pass_dateTime"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBaseline_toBaselineOf="@+id/pass_losTime"
app:layout_constraintStart_toStartOf="@+id/pass_progress" app:layout_constraintEnd_toStartOf="@+id/pass_losTime"
app:layout_constraintTop_toBottomOf="@+id/pass_progress" /> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/pass_progress" />
<TextView <TextView
android:id="@+id/pass_losTime" android:id="@+id/pass_losTime"
style="@style/CardPassText" style="@style/CardPassText"
android:layout_marginBottom="4dp"
android:text="@string/pass_dateTime" android:text="@string/pass_dateTime"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_aosTime" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/pass_progress" /> app:layout_constraintEnd_toEndOf="@+id/pass_progress"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/pass_aosTime"
app:layout_constraintTop_toBottomOf="@+id/pass_progress" />
<ProgressBar <ProgressBar
android:id="@+id/pass_progress" android:id="@+id/pass_progress"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="14dp" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@+id/pass_satId" android:layout_marginStart="6dp"
app:layout_constraintStart_toStartOf="@+id/pass_img" android:layout_marginEnd="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pass_maxEl" /> app:layout_constraintTop_toBottomOf="@+id/pass_maxEl" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values/styles.xml
+2 -2
View File
@@ -70,7 +70,7 @@
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:textSize">32sp</item> <item name="android:textSize">28sp</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
<item name="android:textColor">@color/themeAccent</item> <item name="android:textColor">@color/themeAccent</item>
</style> </style>
@@ -91,7 +91,7 @@
<style name="CardPassName"> <style name="CardPassName">
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item> <item name="android:textSize">16sp</item>
<item name="android:textColor">@color/themeAccent</item> <item name="android:textColor">@color/themeAccent</item>
</style> </style>