From 4e9b312ae52f56014e17501305e568f943a3681c Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Mon, 12 Oct 2020 21:58:00 +0100 Subject: [PATCH] Cleared colors and styles, basic application-wide dark theme setup --- .../look4sat/ui/fragments/EntriesFragment.kt | 2 +- .../rtbishop/look4sat/ui/views/PolarView.kt | 6 +- app/src/main/res/color/nav_bottom_item.xml | 5 + app/src/main/res/color/nav_item_selector.xml | 5 - app/src/main/res/drawable/ic_add.xml | 2 +- app/src/main/res/drawable/ic_arrow.xml | 2 +- .../{ic_fdroid_logo.xml => ic_fdroid.xml} | 4 +- app/src/main/res/drawable/ic_github.xml | 2 +- .../res/drawable/ic_launcher_background.xml | 4 +- .../res/drawable/ic_launcher_foreground.xml | 4 +- app/src/main/res/drawable/ic_map_pos.xml | 2 +- app/src/main/res/drawable/ic_map_sat.xml | 2 +- app/src/main/res/drawable/ic_menu_entries.xml | 4 +- app/src/main/res/drawable/ic_menu_info.xml | 2 +- app/src/main/res/drawable/ic_menu_map.xml | 2 +- app/src/main/res/drawable/ic_menu_passes.xml | 2 +- app/src/main/res/drawable/ic_menu_prefs.xml | 2 +- app/src/main/res/drawable/ic_pass_active.xml | 2 +- .../main/res/drawable/ic_pass_inactive.xml | 2 +- app/src/main/res/drawable/ic_proceed.xml | 2 +- app/src/main/res/drawable/ic_refresh.xml | 2 +- app/src/main/res/drawable/ic_select_all.xml | 2 +- app/src/main/res/drawable/ic_trans.xml | 2 +- .../main/res/drawable/ic_trans_doppler.xml | 8 +- app/src/main/res/drawable/ic_update_file.xml | 2 +- app/src/main/res/drawable/ic_update_web.xml | 2 +- ...es_divider.xml => rec_entries_divider.xml} | 2 +- app/src/main/res/layout/activity_main.xml | 7 +- app/src/main/res/layout/dialog_sources.xml | 16 +++- app/src/main/res/layout/fragment_entries.xml | 8 +- app/src/main/res/layout/fragment_info.xml | 23 ++++- app/src/main/res/layout/fragment_map.xml | 26 +++-- app/src/main/res/layout/fragment_passes.xml | 4 +- app/src/main/res/layout/fragment_polar.xml | 19 +++- app/src/main/res/layout/item_pass_geo.xml | 18 +++- app/src/main/res/layout/item_pass_leo.xml | 28 ++++-- app/src/main/res/layout/item_sat_entry.xml | 1 - app/src/main/res/layout/item_trans.xml | 32 +++++-- app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values/colors.xml | 33 ++++--- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 95 +++---------------- 42 files changed, 207 insertions(+), 184 deletions(-) create mode 100644 app/src/main/res/color/nav_bottom_item.xml delete mode 100644 app/src/main/res/color/nav_item_selector.xml rename app/src/main/res/drawable/{ic_fdroid_logo.xml => ic_fdroid.xml} (97%) rename app/src/main/res/drawable/{entries_divider.xml => rec_entries_divider.xml} (82%) diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt index 27a556e3..9b4485b7 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt @@ -41,7 +41,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) { val linearLayoutMgr = LinearLayoutManager(requireContext()) val divider = DividerItemDecoration(requireContext(), linearLayoutMgr.orientation) val drawable = ResourcesCompat - .getDrawable(resources, R.drawable.entries_divider, requireActivity().theme) + .getDrawable(resources, R.drawable.rec_entries_divider, requireActivity().theme) drawable?.let { divider.setDrawable(it) } layoutManager = linearLayoutMgr adapter = entriesAdapter diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt index 4f692a8f..c5af45c8 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt @@ -29,13 +29,13 @@ class PolarView(context: Context) : View(context) { private val radarPaint = Paint().apply { isAntiAlias = true - color = ContextCompat.getColor(context, R.color.themePrimText) + color = ContextCompat.getColor(context, R.color.onPrimary) style = Paint.Style.STROKE strokeWidth = scale } private val txtPaint = Paint().apply { isAntiAlias = true - color = ContextCompat.getColor(context, R.color.themeAccent) + color = ContextCompat.getColor(context, R.color.secondary) textSize = txtSize } private val trackPaint = Paint().apply { @@ -46,7 +46,7 @@ class PolarView(context: Context) : View(context) { } private val satPaint = Paint().apply { isAntiAlias = true - color = ContextCompat.getColor(context, R.color.themeAccent) + color = ContextCompat.getColor(context, R.color.secondary) style = Paint.Style.FILL } diff --git a/app/src/main/res/color/nav_bottom_item.xml b/app/src/main/res/color/nav_bottom_item.xml new file mode 100644 index 00000000..7c57159d --- /dev/null +++ b/app/src/main/res/color/nav_bottom_item.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/nav_item_selector.xml b/app/src/main/res/color/nav_item_selector.xml deleted file mode 100644 index 9a61fd78..00000000 --- a/app/src/main/res/color/nav_item_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index 185e6535..5c247365 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml index 221e9ac9..2894e824 100644 --- a/app/src/main/res/drawable/ic_arrow.xml +++ b/app/src/main/res/drawable/ic_arrow.xml @@ -23,6 +23,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_fdroid_logo.xml b/app/src/main/res/drawable/ic_fdroid.xml similarity index 97% rename from app/src/main/res/drawable/ic_fdroid_logo.xml rename to app/src/main/res/drawable/ic_fdroid.xml index 3a910813..29c4eb57 100644 --- a/app/src/main/res/drawable/ic_fdroid_logo.xml +++ b/app/src/main/res/drawable/ic_fdroid.xml @@ -5,7 +5,7 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 23d3d482..0764aef3 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -20,6 +20,6 @@ + android:endColor="@color/background" + android:startColor="@color/background" /> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index ead50a59..572bd784 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -30,10 +30,10 @@ android:translateX="70.26573" android:translateY="70.26573"> diff --git a/app/src/main/res/drawable/ic_map_pos.xml b/app/src/main/res/drawable/ic_map_pos.xml index 23dfe20f..82e171fb 100644 --- a/app/src/main/res/drawable/ic_map_pos.xml +++ b/app/src/main/res/drawable/ic_map_pos.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_map_sat.xml b/app/src/main/res/drawable/ic_map_sat.xml index cb15a017..78ead447 100644 --- a/app/src/main/res/drawable/ic_map_sat.xml +++ b/app/src/main/res/drawable/ic_map_sat.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_menu_entries.xml b/app/src/main/res/drawable/ic_menu_entries.xml index 66d61d98..db477027 100644 --- a/app/src/main/res/drawable/ic_menu_entries.xml +++ b/app/src/main/res/drawable/ic_menu_entries.xml @@ -5,10 +5,10 @@ android:viewportWidth="128" android:viewportHeight="128"> diff --git a/app/src/main/res/drawable/ic_menu_info.xml b/app/src/main/res/drawable/ic_menu_info.xml index 4620235d..89031791 100644 --- a/app/src/main/res/drawable/ic_menu_info.xml +++ b/app/src/main/res/drawable/ic_menu_info.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_menu_map.xml b/app/src/main/res/drawable/ic_menu_map.xml index f8719a00..a8932207 100644 --- a/app/src/main/res/drawable/ic_menu_map.xml +++ b/app/src/main/res/drawable/ic_menu_map.xml @@ -23,6 +23,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_menu_passes.xml b/app/src/main/res/drawable/ic_menu_passes.xml index 4a2250f1..52403faa 100644 --- a/app/src/main/res/drawable/ic_menu_passes.xml +++ b/app/src/main/res/drawable/ic_menu_passes.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_menu_prefs.xml b/app/src/main/res/drawable/ic_menu_prefs.xml index 04c3c2ef..d7cff8df 100644 --- a/app/src/main/res/drawable/ic_menu_prefs.xml +++ b/app/src/main/res/drawable/ic_menu_prefs.xml @@ -23,6 +23,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_pass_active.xml b/app/src/main/res/drawable/ic_pass_active.xml index b8579448..7af13efd 100644 --- a/app/src/main/res/drawable/ic_pass_active.xml +++ b/app/src/main/res/drawable/ic_pass_active.xml @@ -23,6 +23,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_pass_inactive.xml b/app/src/main/res/drawable/ic_pass_inactive.xml index e8d43b7c..243b70a4 100644 --- a/app/src/main/res/drawable/ic_pass_inactive.xml +++ b/app/src/main/res/drawable/ic_pass_inactive.xml @@ -23,6 +23,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_proceed.xml b/app/src/main/res/drawable/ic_proceed.xml index 0e761d37..5ad0a42f 100644 --- a/app/src/main/res/drawable/ic_proceed.xml +++ b/app/src/main/res/drawable/ic_proceed.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 92e942ad..69052294 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml index 01948a0e..b6f450cb 100644 --- a/app/src/main/res/drawable/ic_select_all.xml +++ b/app/src/main/res/drawable/ic_select_all.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_trans.xml b/app/src/main/res/drawable/ic_trans.xml index da8d3d54..12a3ae87 100644 --- a/app/src/main/res/drawable/ic_trans.xml +++ b/app/src/main/res/drawable/ic_trans.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_trans_doppler.xml b/app/src/main/res/drawable/ic_trans_doppler.xml index 536164e4..7e98778d 100644 --- a/app/src/main/res/drawable/ic_trans_doppler.xml +++ b/app/src/main/res/drawable/ic_trans_doppler.xml @@ -4,15 +4,15 @@ android:viewportWidth="100" android:viewportHeight="100"> diff --git a/app/src/main/res/drawable/ic_update_file.xml b/app/src/main/res/drawable/ic_update_file.xml index 0e122f79..32103cdf 100644 --- a/app/src/main/res/drawable/ic_update_file.xml +++ b/app/src/main/res/drawable/ic_update_file.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_update_web.xml b/app/src/main/res/drawable/ic_update_web.xml index f6bfc51b..3d91300d 100644 --- a/app/src/main/res/drawable/ic_update_web.xml +++ b/app/src/main/res/drawable/ic_update_web.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/entries_divider.xml b/app/src/main/res/drawable/rec_entries_divider.xml similarity index 82% rename from app/src/main/res/drawable/entries_divider.xml rename to app/src/main/res/drawable/rec_entries_divider.xml index b8f65133..530c4c76 100644 --- a/app/src/main/res/drawable/entries_divider.xml +++ b/app/src/main/res/drawable/rec_entries_divider.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bd306265..a9ebd8cb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,10 +20,9 @@ android:id="@+id/nav_bottom" android:layout_width="match_parent" android:layout_height="48dp" - android:background="@color/themeDark" - app:itemIconSize="24dp" - app:itemIconTint="@color/nav_item_selector" - app:itemTextColor="@color/nav_item_selector" + android:background="@color/primary" + app:itemIconTint="@color/nav_bottom_item" + app:itemTextColor="@color/nav_bottom_item" app:labelVisibilityMode="labeled" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_sources.xml b/app/src/main/res/layout/dialog_sources.xml index b5e80ff5..bd40ee96 100644 --- a/app/src/main/res/layout/dialog_sources.xml +++ b/app/src/main/res/layout/dialog_sources.xml @@ -8,10 +8,12 @@ diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml index c880d509..6275d7fe 100644 --- a/app/src/main/res/layout/fragment_entries.xml +++ b/app/src/main/res/layout/fragment_entries.xml @@ -30,7 +30,7 @@ android:id="@+id/entries_bar" android:layout_width="0dp" android:layout_height="48dp" - android:background="@color/themeDark" + android:background="@color/primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -50,7 +50,7 @@ android:id="@+id/import_web" android:layout_width="64dp" android:layout_height="48dp" - android:backgroundTint="@color/darkBackground" + android:backgroundTint="@color/background" android:contentDescription="@string/placeholder" android:src="@drawable/ic_update_web" app:layout_constraintBottom_toBottomOf="@+id/import_file" @@ -62,7 +62,7 @@ android:layout_width="64dp" android:layout_height="48dp" android:layout_marginEnd="4dp" - android:backgroundTint="@color/darkBackground" + android:backgroundTint="@color/background" android:contentDescription="@string/placeholder" android:src="@drawable/ic_update_file" app:layout_constraintEnd_toEndOf="parent" @@ -83,7 +83,7 @@ android:id="@+id/select_all" android:layout_width="64dp" android:layout_height="48dp" - android:backgroundTint="@color/themeDark" + android:backgroundTint="@color/primary" android:contentDescription="@string/placeholder" android:src="@drawable/ic_select_all" app:layout_constraintEnd_toEndOf="@+id/import_file" diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml index 55dd463f..147a0350 100644 --- a/app/src/main/res/layout/fragment_info.xml +++ b/app/src/main/res/layout/fragment_info.xml @@ -30,10 +30,13 @@ @@ -86,8 +96,12 @@ diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml index 5f7f2bba..c189418d 100644 --- a/app/src/main/res/layout/fragment_passes.xml +++ b/app/src/main/res/layout/fragment_passes.xml @@ -31,7 +31,7 @@ android:id="@+id/passes_bar" android:layout_width="0dp" android:layout_height="48dp" - android:background="@color/themeDark" + android:background="@color/primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/digital_dismay" android:text="@string/timer_zero" - android:textColor="@color/themeAccent" + android:textColor="@color/secondary" android:textSize="48sp" app:layout_constraintBottom_toBottomOf="@+id/passes_bar" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_polar.xml b/app/src/main/res/layout/fragment_polar.xml index 2ecd4a60..dd1cbe74 100644 --- a/app/src/main/res/layout/fragment_polar.xml +++ b/app/src/main/res/layout/fragment_polar.xml @@ -34,33 +34,41 @@ @@ -76,11 +84,12 @@ diff --git a/app/src/main/res/layout/item_trans.xml b/app/src/main/res/layout/item_trans.xml index 145ed4a2..5785bdbb 100644 --- a/app/src/main/res/layout/item_trans.xml +++ b/app/src/main/res/layout/item_trans.xml @@ -1,5 +1,4 @@ - - - - #FFE082 - #E8E8E8 - #808080 - - #282828 - #242424 - #191919 - #121212 - #66000000 - - #CE2029 + + #191919 + #E0E0E0 + #242424 + + #FFE082 + #121212 + #B00020 + + #B00020 + #E0E0E0 + + #121212 + #E0E0E0 + + #121212 + #E0E0E0 + + + #B00020 #26FFE082 + #66000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 124efa06..1e0098d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -122,7 +122,7 @@ OK Cancel - https:// + TLE source Please use HTTPS URLs only Placeholder Wikimedia maps | Map data © OpenStreetMap contributors diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d7ef4e76..ddd7a8b5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -20,89 +20,24 @@ - - - - - - - - - - - - - - - - - - - - - -