From 51bfa3d372b4717b0f7b7dfa9381aec13852fd71 Mon Sep 17 00:00:00 2001 From: x7z4w Date: Fri, 10 Oct 2025 16:54:28 +0000 Subject: [PATCH] [android] Fixup Signed-off-by: x7z4w --- .../maplayer/LayerBottomSheetItem.java | 2 +- .../downloader_done.xml} | 2 +- .../downloader_download.xml} | 2 +- .../downloader_folder.xml} | 2 +- .../downloader_folder_done.xml} | 2 +- .../ic_layers_isoline.xml} | 2 +- .../ic_layers_outdoors.xml} | 8 +++---- .../ic_layers_subway.xml} | 6 +++--- ...soline_light.xml => ic_layers_isoline.xml} | 2 +- ...doors_light.xml => ic_layers_outdoors.xml} | 21 ++++--------------- .../drawable/ic_layers_outline_selector.xml | 2 +- ..._subway_light.xml => ic_layers_subway.xml} | 10 ++++----- android/app/src/main/res/values/colors.xml | 2 +- android/app/src/main/res/values/themes.xml | 8 ------- 14 files changed, 25 insertions(+), 46 deletions(-) rename android/app/src/main/res/{drawable/downloader_done_night.xml => drawable-night/downloader_done.xml} (94%) rename android/app/src/main/res/{drawable/downloader_download_night.xml => drawable-night/downloader_download.xml} (92%) rename android/app/src/main/res/{drawable/downloader_folder_night.xml => drawable-night/downloader_folder.xml} (92%) rename android/app/src/main/res/{drawable/downloader_folder_done_night.xml => drawable-night/downloader_folder_done.xml} (93%) rename android/app/src/main/res/{drawable/ic_layers_isoline_dark.xml => drawable-night/ic_layers_isoline.xml} (99%) rename android/app/src/main/res/{drawable/ic_layers_outdoors_dark.xml => drawable-night/ic_layers_outdoors.xml} (97%) rename android/app/src/main/res/{drawable/ic_layers_subway_dark.xml => drawable-night/ic_layers_subway.xml} (94%) rename android/app/src/main/res/drawable/{ic_layers_isoline_light.xml => ic_layers_isoline.xml} (99%) rename android/app/src/main/res/drawable/{ic_layers_outdoors_light.xml => ic_layers_outdoors.xml} (58%) rename android/app/src/main/res/drawable/{ic_layers_subway_light.xml => ic_layers_subway.xml} (91%) diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java index 7e34542a3..1114b96ec 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java @@ -46,7 +46,7 @@ public class LayerBottomSheetItem break; case SUBWAY: drawableResId = R.drawable.ic_layers_subway; - buttonTextResource = R.string.button_layer_subway; + buttonTextResource = R.string.subway; break; case ISOLINES: drawableResId = R.drawable.ic_layers_isoline; diff --git a/android/app/src/main/res/drawable/downloader_done_night.xml b/android/app/src/main/res/drawable-night/downloader_done.xml similarity index 94% rename from android/app/src/main/res/drawable/downloader_done_night.xml rename to android/app/src/main/res/drawable-night/downloader_done.xml index 74ae3d345..64618de23 100644 --- a/android/app/src/main/res/drawable/downloader_done_night.xml +++ b/android/app/src/main/res/drawable-night/downloader_done.xml @@ -2,7 +2,7 @@ - + diff --git a/android/app/src/main/res/drawable/downloader_download_night.xml b/android/app/src/main/res/drawable-night/downloader_download.xml similarity index 92% rename from android/app/src/main/res/drawable/downloader_download_night.xml rename to android/app/src/main/res/drawable-night/downloader_download.xml index de8b69c3c..10740954d 100644 --- a/android/app/src/main/res/drawable/downloader_download_night.xml +++ b/android/app/src/main/res/drawable-night/downloader_download.xml @@ -2,7 +2,7 @@ - + diff --git a/android/app/src/main/res/drawable/downloader_folder_night.xml b/android/app/src/main/res/drawable-night/downloader_folder.xml similarity index 92% rename from android/app/src/main/res/drawable/downloader_folder_night.xml rename to android/app/src/main/res/drawable-night/downloader_folder.xml index 00fa330a4..711951947 100644 --- a/android/app/src/main/res/drawable/downloader_folder_night.xml +++ b/android/app/src/main/res/drawable-night/downloader_folder.xml @@ -2,7 +2,7 @@ - + diff --git a/android/app/src/main/res/drawable/downloader_folder_done_night.xml b/android/app/src/main/res/drawable-night/downloader_folder_done.xml similarity index 93% rename from android/app/src/main/res/drawable/downloader_folder_done_night.xml rename to android/app/src/main/res/drawable-night/downloader_folder_done.xml index 7745e86f9..b170525c8 100644 --- a/android/app/src/main/res/drawable/downloader_folder_done_night.xml +++ b/android/app/src/main/res/drawable-night/downloader_folder_done.xml @@ -2,7 +2,7 @@ - + diff --git a/android/app/src/main/res/drawable/ic_layers_isoline_dark.xml b/android/app/src/main/res/drawable-night/ic_layers_isoline.xml similarity index 99% rename from android/app/src/main/res/drawable/ic_layers_isoline_dark.xml rename to android/app/src/main/res/drawable-night/ic_layers_isoline.xml index 305cca79c..b07c9c642 100644 --- a/android/app/src/main/res/drawable/ic_layers_isoline_dark.xml +++ b/android/app/src/main/res/drawable-night/ic_layers_isoline.xml @@ -10,7 +10,7 @@ android:pathData="M0,-0l54,0l0,54l-54,0z" android:strokeLineJoin="round" android:strokeWidth="10.145" - android:fillColor="#242020" + android:fillColor="#181715" android:fillType="evenOdd" android:strokeColor="#00000000"/> diff --git a/android/app/src/main/res/drawable/ic_layers_subway_dark.xml b/android/app/src/main/res/drawable-night/ic_layers_subway.xml similarity index 94% rename from android/app/src/main/res/drawable/ic_layers_subway_dark.xml rename to android/app/src/main/res/drawable-night/ic_layers_subway.xml index d607f1297..586ab5349 100644 --- a/android/app/src/main/res/drawable/ic_layers_subway_dark.xml +++ b/android/app/src/main/res/drawable-night/ic_layers_subway.xml @@ -10,21 +10,21 @@ android:pathData="M0,0h54v54h-54z" android:strokeLineJoin="round" android:strokeWidth="40.5" - android:fillColor="#262222" + android:fillColor="#181715" android:strokeLineCap="round"/> - - diff --git a/android/app/src/main/res/drawable/ic_layers_outline_selector.xml b/android/app/src/main/res/drawable/ic_layers_outline_selector.xml index 514f02497..d92d4b36b 100644 --- a/android/app/src/main/res/drawable/ic_layers_outline_selector.xml +++ b/android/app/src/main/res/drawable/ic_layers_outline_selector.xml @@ -4,7 +4,7 @@ - + diff --git a/android/app/src/main/res/drawable/ic_layers_subway_light.xml b/android/app/src/main/res/drawable/ic_layers_subway.xml similarity index 91% rename from android/app/src/main/res/drawable/ic_layers_subway_light.xml rename to android/app/src/main/res/drawable/ic_layers_subway.xml index a36a2c4eb..d081e0f7c 100644 --- a/android/app/src/main/res/drawable/ic_layers_subway_light.xml +++ b/android/app/src/main/res/drawable/ic_layers_subway.xml @@ -10,35 +10,35 @@ android:pathData="M0,0h54v54h-54z" android:strokeLineJoin="round" android:strokeWidth="40.5" - android:fillColor="#ede8d6" + android:fillColor="#f5eada" android:strokeLineCap="round"/> #FFC800 #FF9600 - #1E96F0 + @color/base_accent #0057ff diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml index 6f477bc14..824463200 100644 --- a/android/app/src/main/res/values/themes.xml +++ b/android/app/src/main/res/values/themes.xml @@ -84,14 +84,6 @@ @color/black_4 @color/black_4 @drawable/dot_divider - @drawable/ic_layers_outdoors_active - @drawable/ic_layers_traffic_active - @drawable/ic_layers_subway_active - @drawable/ic_layers_isoline_active - @drawable/ic_layers_outdoors_inactive - @drawable/ic_layers_traffic_inactive - @drawable/ic_layers_subway_inactive - @drawable/ic_layers_isoline_inactive @color/accent_color_selector @style/TextAppearance @style/TextAppearance.Small