From 5dba44c1db6f3e25e5cbfe10425adfbe68c4fb2d Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Tue, 13 Oct 2020 19:37:33 +0100 Subject: [PATCH] Further changes to the theme and colors --- .../rtbishop/look4sat/ui/views/PolarView.kt | 6 +++--- app/src/main/res/color/nav_bottom_item.xml | 4 ++-- app/src/main/res/drawable/ic_add.xml | 2 +- app/src/main/res/drawable/ic_arrow.xml | 2 +- app/src/main/res/drawable/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 +- app/src/main/res/layout/activity_main.xml | 1 - app/src/main/res/layout/fragment_entries.xml | 5 +---- app/src/main/res/layout/fragment_info.xml | 2 +- app/src/main/res/layout/fragment_map.xml | 12 +++++------ app/src/main/res/layout/fragment_passes.xml | 4 ++-- app/src/main/res/layout/item_pass_geo.xml | 4 ++-- app/src/main/res/layout/item_pass_leo.xml | 4 ++-- app/src/main/res/layout/item_sat_entry.xml | 2 +- app/src/main/res/layout/item_trans.xml | 2 +- app/src/main/res/values/colors.xml | 20 +++--------------- app/src/main/res/values/styles.xml | 21 +++++++------------ 35 files changed, 61 insertions(+), 84 deletions(-) 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 c5af45c8..a770a901 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.onPrimary) + color = ContextCompat.getColor(context, R.color.greyLight) style = Paint.Style.STROKE strokeWidth = scale } private val txtPaint = Paint().apply { isAntiAlias = true - color = ContextCompat.getColor(context, R.color.secondary) + color = ContextCompat.getColor(context, R.color.themeLight) 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.secondary) + color = ContextCompat.getColor(context, R.color.themeLight) 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 index 7c57159d..44c5deec 100644 --- a/app/src/main/res/color/nav_bottom_item.xml +++ b/app/src/main/res/color/nav_bottom_item.xml @@ -1,5 +1,5 @@ - - + + \ 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 5c247365..3183f67d 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 2894e824..ea5ac792 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.xml b/app/src/main/res/drawable/ic_fdroid.xml index 29c4eb57..98f48512 100644 --- a/app/src/main/res/drawable/ic_fdroid.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 0764aef3..1a0ab379 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/greyDark" + android:startColor="@color/greyDark" /> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 572bd784..dac9f4c7 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 82e171fb..1e05f62c 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 78ead447..dc884469 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 db477027..f4153d46 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 89031791..30e81588 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 a8932207..49b81d11 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 52403faa..2246bd00 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 d7cff8df..5c7a1173 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 7af13efd..fa5a8366 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 243b70a4..8e552c35 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 5ad0a42f..5d836bd3 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 69052294..0efb1d73 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 b6f450cb..b34ab2e7 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 12a3ae87..6a33bba8 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 7e98778d..47355b1f 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 32103cdf..6724b2a8 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 3d91300d..09972f82 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/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a9ebd8cb..bdf38b2c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,7 +20,6 @@ android:id="@+id/nav_bottom" android:layout_width="match_parent" android:layout_height="48dp" - android:background="@color/primary" app:itemIconTint="@color/nav_bottom_item" app:itemTextColor="@color/nav_bottom_item" app:labelVisibilityMode="labeled" diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml index 6275d7fe..94b18ab5 100644 --- a/app/src/main/res/layout/fragment_entries.xml +++ b/app/src/main/res/layout/fragment_entries.xml @@ -30,7 +30,6 @@ android:id="@+id/entries_bar" android:layout_width="0dp" android:layout_height="48dp" - android:background="@color/primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -50,7 +49,6 @@ android:id="@+id/import_web" android:layout_width="64dp" android:layout_height="48dp" - android:backgroundTint="@color/background" android:contentDescription="@string/placeholder" android:src="@drawable/ic_update_web" app:layout_constraintBottom_toBottomOf="@+id/import_file" @@ -62,7 +60,6 @@ android:layout_width="64dp" android:layout_height="48dp" android:layout_marginEnd="4dp" - android:backgroundTint="@color/background" android:contentDescription="@string/placeholder" android:src="@drawable/ic_update_file" app:layout_constraintEnd_toEndOf="parent" @@ -83,7 +80,6 @@ android:id="@+id/select_all" android:layout_width="64dp" android:layout_height="48dp" - android:backgroundTint="@color/primary" android:contentDescription="@string/placeholder" android:src="@drawable/ic_select_all" app:layout_constraintEnd_toEndOf="@+id/import_file" @@ -106,6 +102,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|center" android:layout_margin="24dp" + android:contentDescription="@string/placeholder" android:src="@drawable/ic_proceed" app:fabSize="mini" /> diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml index 147a0350..5c91c8bb 100644 --- a/app/src/main/res/layout/fragment_info.xml +++ b/app/src/main/res/layout/fragment_info.xml @@ -35,7 +35,7 @@ android:layout_marginStart="4dp" android:layout_marginEnd="16dp" android:text="@string/app_name" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" android:textSize="42sp" app:layout_constraintBottom_toBottomOf="@+id/title_img" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml index 24293b51..4abccb71 100644 --- a/app/src/main/res/layout/fragment_map.xml +++ b/app/src/main/res/layout/fragment_map.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/pat_osm_idName" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="@string/pat_altitude" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/id_name" /> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:text="@string/pat_distance" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/altitude" app:layout_constraintTop_toBottomOf="@+id/altitude" /> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="4dp" android:text="@string/pat_osm_vel" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" app:layout_constraintBaseline_toBaselineOf="@+id/altitude" app:layout_constraintEnd_toEndOf="parent" /> @@ -88,7 +88,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pat_osm_latLon" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" app:layout_constraintBaseline_toBaselineOf="@+id/distance" app:layout_constraintEnd_toEndOf="@+id/velocity" /> @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="@string/osmCopyright" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml index c189418d..cf7fb901 100644 --- a/app/src/main/res/layout/fragment_passes.xml +++ b/app/src/main/res/layout/fragment_passes.xml @@ -31,7 +31,6 @@ android:id="@+id/passes_bar" android:layout_width="0dp" android:layout_height="48dp" - android:background="@color/primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -42,7 +41,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/digital_dismay" android:text="@string/timer_zero" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" android:textSize="48sp" app:layout_constraintBottom_toBottomOf="@+id/passes_bar" app:layout_constraintEnd_toEndOf="parent" @@ -70,6 +69,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|center" android:layout_marginBottom="24dp" + android:contentDescription="@string/placeholder" app:fabSize="mini" app:srcCompat="@drawable/ic_refresh" /> diff --git a/app/src/main/res/layout/item_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xml index e0ee50ad..9dd34d93 100644 --- a/app/src/main/res/layout/item_pass_geo.xml +++ b/app/src/main/res/layout/item_pass_geo.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pass_satName" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" android:textSize="16sp" app:layout_constraintBaseline_toBaselineOf="@+id/pass_geo_id" app:layout_constraintEnd_toStartOf="@+id/pass_geo_id" @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/pass_satId" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" android:textSize="16sp" app:layout_constraintEnd_toEndOf="@+id/pass_geo_el" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xml index f959f4cc..9687717b 100644 --- a/app/src/main/res/layout/item_pass_leo.xml +++ b/app/src/main/res/layout/item_pass_leo.xml @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/pass_satId" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" android:textSize="16sp" app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress" app:layout_constraintTop_toTopOf="parent" /> @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pass_satName" - android:textColor="@color/secondary" + android:textColor="@color/themeLight" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="@+id/pass_leo_satId" app:layout_constraintEnd_toStartOf="@+id/pass_leo_satId" diff --git a/app/src/main/res/layout/item_sat_entry.xml b/app/src/main/res/layout/item_sat_entry.xml index ec4a7565..7986cb86 100644 --- a/app/src/main/res/layout/item_sat_entry.xml +++ b/app/src/main/res/layout/item_sat_entry.xml @@ -17,7 +17,7 @@ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - - #191919 - #E0E0E0 - #242424 - - #FFE082 - #121212 - #B00020 - - #B00020 - #E0E0E0 - - #121212 - #E0E0E0 - - #121212 - #E0E0E0 - + #FFE082 + #121212 + #E0E0E0 #B00020 #26FFE082 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ddd7a8b5..45d7a93a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -20,22 +20,17 @@