mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor visual changes to dialogs and settings

Browse Source
This commit is contained in:
Arty Bishop committed 2022-01-09 18:03:21 +00:00
1 parent 7d3d746c4d
commit 82032109dd
10 files changed
+152 -134
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/card_prefs_location.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/location_title" android:id="@+id/location_title"
style="@style/SettingsCategory" style="@style/SettingsTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app/src/main/res/layout/card_prefs_other.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/other_title" android:id="@+id/other_title"
style="@style/SettingsCategory" style="@style/SettingsTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app/src/main/res/layout/card_prefs_tracking.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/tracking_title" android:id="@+id/tracking_title"
style="@style/SettingsCategory" style="@style/SettingsTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app/src/main/res/layout/card_prefs_update.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/update_title" android:id="@+id/update_title"
style="@style/SettingsCategory" style="@style/SettingsTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app/src/main/res/layout/card_prefs_warranty.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/warranty_title" android:id="@+id/warranty_title"
style="@style/SettingsCategory" style="@style/SettingsTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app/src/main/res/layout/dialog_passes.xml
+6 -8
View File
@@ -3,11 +3,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/surfaceBg"> android:background="@color/surfaceCard">
<TextView <TextView
android:id="@+id/pass_pref_title" android:id="@+id/pass_pref_title"
style="@style/DialogText" style="@style/DialogTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@@ -18,6 +18,7 @@
<TextView <TextView
android:id="@+id/hours_ahead_text" android:id="@+id/hours_ahead_text"
style="@style/DialogText"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@@ -42,6 +43,7 @@
<TextView <TextView
android:id="@+id/min_elev_text" android:id="@+id/min_elev_text"
style="@style/DialogText"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@@ -64,15 +66,13 @@
<Button <Button
android:id="@+id/pass_pref_btn_neg" android:id="@+id/pass_pref_btn_neg"
style="@style/DialogButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:backgroundTint="@color/surfaceToolbar"
android:text="@string/btn_cancel" android:text="@string/btn_cancel"
android:textAllCaps="false"
android:textColor="@color/themeAccent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pass_pref_btn_pos" app:layout_constraintEnd_toStartOf="@+id/pass_pref_btn_pos"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@@ -82,13 +82,11 @@
<Button <Button
android:id="@+id/pass_pref_btn_pos" android:id="@+id/pass_pref_btn_pos"
style="@style/DialogButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:backgroundTint="@color/surfaceToolbar"
android:text="@string/btn_accept" android:text="@string/btn_accept"
android:textAllCaps="false"
android:textColor="@color/themeAccent"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_pref_btn_neg" app:layout_constraintBaseline_toBaselineOf="@+id/pass_pref_btn_neg"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app/src/main/res/layout/dialog_sources.xml
+18 -22
View File
@@ -4,29 +4,28 @@
android:id="@+id/sources_root" android:id="@+id/sources_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/surfaceBg" android:background="@color/surfaceCard">
android:padding="4dp">
<TextView <TextView
android:id="@+id/sources_title" android:id="@+id/sources_title"
style="@style/DialogTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="16dp"
android:layout_marginTop="6dp" android:layout_marginTop="16dp"
android:text="@string/sources_title" android:text="@string/sources_title"
android:textSize="16sp"
app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/sources_warning" android:id="@+id/sources_warning"
style="@style/DialogTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:gravity="center" android:gravity="center"
android:text="@string/sources_https" android:text="@string/sources_https"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="@+id/sources_title" app:layout_constraintStart_toStartOf="@+id/sources_title"
app:layout_constraintTop_toBottomOf="@+id/sources_title" /> app:layout_constraintTop_toBottomOf="@+id/sources_title" />
@@ -34,8 +33,9 @@
android:id="@+id/sources_btn_add" android:id="@+id/sources_btn_add"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:backgroundTint="@color/surfaceToolbar" android:backgroundTint="@color/surfaceButton"
android:src="@drawable/ic_add" android:src="@drawable/ic_add"
android:tint="@color/themeAccent"
app:layout_constraintBottom_toBottomOf="@+id/sources_warning" app:layout_constraintBottom_toBottomOf="@+id/sources_warning"
app:layout_constraintDimensionRatio="h,1:1" app:layout_constraintDimensionRatio="h,1:1"
app:layout_constraintEnd_toEndOf="@+id/sources_recycler" app:layout_constraintEnd_toEndOf="@+id/sources_recycler"
@@ -44,10 +44,10 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/sources_recycler" android:id="@+id/sources_recycler"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="280dp"
android:layout_marginStart="8dp" android:layout_marginStart="16dp"
android:layout_marginTop="4dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="16dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sources_warning"> app:layout_constraintTop_toBottomOf="@+id/sources_warning">
@@ -56,30 +56,26 @@
<Button <Button
android:id="@+id/sources_btn_neg" android:id="@+id/sources_btn_neg"
style="@style/DialogButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="12dp"
android:backgroundTint="@color/surfaceToolbar"
android:text="@string/btn_cancel" android:text="@string/btn_cancel"
android:textAllCaps="false"
android:textColor="@color/themeAccent"
app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_pos" app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_pos"
app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<Button <Button
android:id="@+id/sources_btn_pos" android:id="@+id/sources_btn_pos"
style="@style/DialogButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="8dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="12dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="12dp"
android:backgroundTint="@color/surfaceToolbar"
android:text="@string/btn_accept" android:text="@string/btn_accept"
android:textAllCaps="false"
android:textColor="@color/themeAccent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sources_recycler" /> app:layout_constraintTop_toBottomOf="@+id/sources_recycler" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_entries.xml
+3 -3
View File
@@ -75,7 +75,7 @@
<Button <Button
android:id="@+id/entries_cancel" android:id="@+id/entries_cancel"
style="@style/AppButton" style="@style/DialogButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
@@ -89,7 +89,7 @@
<Button <Button
android:id="@+id/entries_select_all" android:id="@+id/entries_select_all"
style="@style/AppButton" style="@style/DialogButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/entries_select_all" android:text="@string/entries_select_all"
@@ -100,7 +100,7 @@
<Button <Button
android:id="@+id/entries_accept" android:id="@+id/entries_accept"
style="@style/AppButton" style="@style/DialogButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
app/src/main/res/layout/fragment_settings.xml
+102 -94
View File
@@ -1,120 +1,128 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:scrollbars="none">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:id="@+id/prefs_toolbar"
android:layout_height="wrap_content"> style="@style/Toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.cardview.widget.CardView <ImageButton
android:id="@+id/prefs_toolbar" android:id="@+id/prefs_back"
style="@style/Toolbar" style="@style/ToolbarButton"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="4dp"
app:layout_constraintStart_toStartOf="parent" android:src="@drawable/ic_back"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintBottom_toBottomOf="@+id/prefs_toolbar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/prefs_toolbar" />
<ImageButton <TextView
android:id="@+id/prefs_back" android:id="@+id/prefs_title"
style="@style/ToolbarButton" style="@style/ToolbarText"
android:layout_marginStart="4dp" android:text="@string/settings_title"
android:src="@drawable/ic_back" app:layout_constraintBottom_toBottomOf="@+id/prefs_toolbar"
app:layout_constraintBottom_toBottomOf="@+id/prefs_toolbar" app:layout_constraintEnd_toEndOf="@+id/prefs_toolbar"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintHorizontal_bias="0.25"
app:layout_constraintTop_toTopOf="@+id/prefs_toolbar" /> app:layout_constraintStart_toStartOf="@+id/prefs_toolbar"
app:layout_constraintTop_toTopOf="@+id/prefs_toolbar" />
<TextView <ScrollView
android:id="@+id/prefs_title" android:layout_width="0dp"
style="@style/ToolbarText" android:layout_height="0dp"
android:text="@string/settings_title" android:scrollbars="none"
app:layout_constraintBottom_toBottomOf="@+id/prefs_toolbar" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/prefs_toolbar" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.25" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/prefs_toolbar" app:layout_constraintTop_toBottomOf="@+id/prefs_toolbar">
app:layout_constraintTop_toTopOf="@+id/prefs_toolbar" />
<androidx.cardview.widget.CardView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/card_prefs_info" android:layout_width="match_parent"
style="@style/SettingsCard" android:layout_height="wrap_content">
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/prefs_toolbar">
<include <androidx.cardview.widget.CardView
android:id="@+id/prefs_info" android:id="@+id/card_prefs_info"
layout="@layout/card_prefs_about" /> style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</androidx.cardview.widget.CardView> <include
android:id="@+id/prefs_info"
layout="@layout/card_prefs_about" />
<androidx.cardview.widget.CardView </androidx.cardview.widget.CardView>
android:id="@+id/card_prefs_location"
style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_info">
<include <androidx.cardview.widget.CardView
android:id="@+id/prefs_location" android:id="@+id/card_prefs_location"
layout="@layout/card_prefs_location" /> style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_info">
</androidx.cardview.widget.CardView> <include
android:id="@+id/prefs_location"
layout="@layout/card_prefs_location" />
<androidx.cardview.widget.CardView </androidx.cardview.widget.CardView>
android:id="@+id/card_prefs_data"
style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_location">
<include <androidx.cardview.widget.CardView
android:id="@+id/prefs_data" android:id="@+id/card_prefs_data"
layout="@layout/card_prefs_update" /> style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_location">
</androidx.cardview.widget.CardView> <include
android:id="@+id/prefs_data"
layout="@layout/card_prefs_update" />
<androidx.cardview.widget.CardView </androidx.cardview.widget.CardView>
android:id="@+id/card_prefs_tracking"
style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_data">
<include <androidx.cardview.widget.CardView
android:id="@+id/prefs_tracking" android:id="@+id/card_prefs_tracking"
layout="@layout/card_prefs_tracking" /> style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_data">
</androidx.cardview.widget.CardView> <include
android:id="@+id/prefs_tracking"
layout="@layout/card_prefs_tracking" />
<androidx.cardview.widget.CardView </androidx.cardview.widget.CardView>
android:id="@+id/card_prefs_other"
style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_tracking">
<include <androidx.cardview.widget.CardView
android:id="@+id/prefs_other" android:id="@+id/card_prefs_other"
layout="@layout/card_prefs_other" /> style="@style/SettingsCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_tracking">
</androidx.cardview.widget.CardView> <include
android:id="@+id/prefs_other"
layout="@layout/card_prefs_other" />
<androidx.cardview.widget.CardView </androidx.cardview.widget.CardView>
android:id="@+id/card_prefs_warranty"
style="@style/SettingsCard"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_other">
<include <androidx.cardview.widget.CardView
android:id="@+id/prefs_warranty" android:id="@+id/card_prefs_warranty"
layout="@layout/card_prefs_warranty" /> style="@style/SettingsCard"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_prefs_other">
</androidx.cardview.widget.CardView> <include
android:id="@+id/prefs_warranty"
layout="@layout/card_prefs_warranty" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.cardview.widget.CardView>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values/styles.xml
+18 -2
View File
@@ -28,11 +28,27 @@
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="DialogButton">
<item name="android:backgroundTint">@color/surfaceButton</item>
<item name="android:ellipsize">end</item>
<item name="android:maxLines">1</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">@color/themeAccent</item>
<item name="android:textSize">16sp</item>
</style>
<style name="DialogText"> <style name="DialogText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textSize">16sp</item>
</style>
<style name="DialogTitle">
<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:textColor">@color/themeAccent</item> <item name="android:textColor">@color/themeAccent</item>
<item name="android:textSize">17sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="Toolbar"> <style name="Toolbar">
@@ -91,7 +107,7 @@
<item name="android:textColor">@color/themeLight</item> <item name="android:textColor">@color/themeLight</item>
</style> </style>
<style name="SettingsCategory"> <style name="SettingsTitle">
<item name="android:includeFontPadding">false</item> <item name="android:includeFontPadding">false</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textColor">@color/themeAccent</item> <item name="android:textColor">@color/themeAccent</item>