From 428ff30af7939dfae1acbb5ed8f7c7caf28fd1f6 Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Fri, 22 Aug 2025 19:56:29 +0200 Subject: [PATCH] [android] Proper usage of dark theme Signed-off-by: Andrei Shkrob --- android/app/src/main/AndroidManifest.xml | 6 + .../DownloadResourcesLegacyActivity.java | 8 - .../java/app/organicmaps/MwmActivity.java | 13 - .../java/app/organicmaps/SplashActivity.java | 9 - .../base/BaseMwmDialogFragment.java | 18 +- .../base/BaseMwmFragmentActivity.java | 33 +-- .../bookmarks/BookmarkCategoriesActivity.java | 9 - .../bookmarks/BookmarkListActivity.java | 9 - .../car/screens/CategoriesScreen.java | 22 +- .../editor/HoursMinutesPickerFragment.java | 23 +- .../maplayer/LayerBottomSheetItem.java | 15 +- .../traffic/widget/TrafficButton.java | 7 +- .../organicmaps/search/CategoriesAdapter.java | 7 +- .../organicmaps/search/SearchActivity.java | 7 - .../settings/BaseXmlSettingsFragment.java | 14 +- .../settings/SettingsPrefsFragment.java | 2 +- .../VoiceInstructionsSettingsFragment.java | 2 +- .../app/organicmaps/util/ThemeSwitcher.java | 2 +- .../java/app/organicmaps/util/ThemeUtils.java | 26 -- .../widget/RoutingToolbarButton.java | 5 +- .../res/color/accent_color_selector_night.xml | 15 -- .../main/res/color/button_accent_night.xml | 7 - .../app/src/main/res/color/button_night.xml | 7 - .../color/routing_toolbar_icon_tint_night.xml | 11 - ...1_night.webp => ic_spinner_pending_1.webp} | Bin ..._night.webp => ic_spinner_pending_10.webp} | Bin ..._night.webp => ic_spinner_pending_11.webp} | Bin ..._night.webp => ic_spinner_pending_12.webp} | Bin ..._night.webp => ic_spinner_pending_13.webp} | Bin ..._night.webp => ic_spinner_pending_14.webp} | Bin ..._night.webp => ic_spinner_pending_15.webp} | Bin ..._night.webp => ic_spinner_pending_16.webp} | Bin ..._night.webp => ic_spinner_pending_17.webp} | Bin ..._night.webp => ic_spinner_pending_18.webp} | Bin ...2_night.webp => ic_spinner_pending_2.webp} | Bin ...3_night.webp => ic_spinner_pending_3.webp} | Bin ...4_night.webp => ic_spinner_pending_4.webp} | Bin ...5_night.webp => ic_spinner_pending_5.webp} | Bin ...6_night.webp => ic_spinner_pending_6.webp} | Bin ...7_night.webp => ic_spinner_pending_7.webp} | Bin ...8_night.webp => ic_spinner_pending_8.webp} | Bin ...9_night.webp => ic_spinner_pending_9.webp} | Bin ...1_night.webp => ic_spinner_pending_1.webp} | Bin ..._night.webp => ic_spinner_pending_10.webp} | Bin ..._night.webp => ic_spinner_pending_11.webp} | Bin ..._night.webp => ic_spinner_pending_12.webp} | Bin ..._night.webp => ic_spinner_pending_13.webp} | Bin ..._night.webp => ic_spinner_pending_14.webp} | Bin ..._night.webp => ic_spinner_pending_15.webp} | Bin ..._night.webp => ic_spinner_pending_16.webp} | Bin ..._night.webp => ic_spinner_pending_17.webp} | Bin ..._night.webp => ic_spinner_pending_18.webp} | Bin ...2_night.webp => ic_spinner_pending_2.webp} | Bin ...3_night.webp => ic_spinner_pending_3.webp} | Bin ...4_night.webp => ic_spinner_pending_4.webp} | Bin ...5_night.webp => ic_spinner_pending_5.webp} | Bin ...6_night.webp => ic_spinner_pending_6.webp} | Bin ...7_night.webp => ic_spinner_pending_7.webp} | Bin ...8_night.webp => ic_spinner_pending_8.webp} | Bin ...9_night.webp => ic_spinner_pending_9.webp} | Bin .../ic_traffic_download_1.webp} | Bin .../ic_traffic_download_2.webp} | Bin .../ic_traffic_download_3.webp} | Bin .../ic_traffic_on.webp} | Bin .../ic_traffic_outdated.webp} | Bin .../ic_triangle.webp} | Bin .../ic_triangle_elevation.webp} | Bin .../ic_traffic_download_1.webp} | Bin .../ic_traffic_download_2.webp} | Bin .../ic_traffic_download_3.webp} | Bin .../ic_traffic_on.webp} | Bin .../ic_traffic_outdated.webp} | Bin .../ic_triangle.webp} | Bin .../ic_triangle_elevation.webp} | Bin .../ic_traffic_download_1.webp} | Bin .../ic_traffic_download_2.webp} | Bin .../ic_traffic_download_3.webp} | Bin .../ic_traffic_on.webp} | Bin .../ic_traffic_outdated.webp} | Bin .../ic_triangle.webp} | Bin .../ic_triangle_elevation.webp} | Bin .../ic_traffic_download_1.webp} | Bin .../ic_traffic_download_2.webp} | Bin .../ic_traffic_download_3.webp} | Bin .../ic_traffic_on.webp} | Bin .../ic_traffic_outdated.webp} | Bin .../ic_triangle.webp} | Bin .../ic_triangle_elevation.webp} | Bin .../ic_traffic_download_1.webp} | Bin .../ic_traffic_download_2.webp} | Bin .../ic_traffic_download_3.webp} | Bin .../ic_traffic_on.webp} | Bin .../ic_traffic_outdated.webp} | Bin .../ic_triangle.webp} | Bin .../ic_triangle_elevation.webp} | Bin .../bg_altitude.xml} | 0 .../bg_point_desc.xml} | 0 .../bg_rounded_rect.xml} | 0 .../bg_your_location_pin.xml} | 0 .../dot_divider.xml} | 0 .../ic_category_atm.xml} | 0 .../ic_category_bank.xml} | 0 .../ic_category_children.xml} | 0 .../ic_category_eat.xml} | 0 .../ic_category_entertainment.xml} | 0 .../ic_category_food.xml} | 0 .../ic_category_fuel.xml} | 0 .../ic_category_hospital.xml} | 0 .../ic_category_hotel.xml} | 0 .../ic_category_luggagehero.xml} | 0 .../ic_category_nightlife.xml} | 0 .../ic_category_parking.xml} | 0 .../ic_category_pharmacy.xml} | 0 .../ic_category_police.xml} | 0 .../ic_category_post.xml} | 0 .../ic_category_recycling.xml} | 0 .../ic_category_rv.xml} | 0 .../ic_category_secondhand.xml} | 0 .../ic_category_shopping.xml} | 0 .../ic_category_toilet.xml} | 0 .../ic_category_tourism.xml} | 0 .../ic_category_transport.xml} | 0 .../ic_category_water.xml} | 0 .../ic_category_wifi.xml} | 0 .../ic_menu_location_pending.png} | Bin .../list_divider.xml} | 0 ...1_night.webp => ic_spinner_pending_1.webp} | Bin ..._night.webp => ic_spinner_pending_10.webp} | Bin ..._night.webp => ic_spinner_pending_11.webp} | Bin ..._night.webp => ic_spinner_pending_12.webp} | Bin ..._night.webp => ic_spinner_pending_13.webp} | Bin ..._night.webp => ic_spinner_pending_14.webp} | Bin ..._night.webp => ic_spinner_pending_15.webp} | Bin ..._night.webp => ic_spinner_pending_16.webp} | Bin ..._night.webp => ic_spinner_pending_17.webp} | Bin ..._night.webp => ic_spinner_pending_18.webp} | Bin ...2_night.webp => ic_spinner_pending_2.webp} | Bin ...3_night.webp => ic_spinner_pending_3.webp} | Bin ...4_night.webp => ic_spinner_pending_4.webp} | Bin ...5_night.webp => ic_spinner_pending_5.webp} | Bin ...6_night.webp => ic_spinner_pending_6.webp} | Bin ...7_night.webp => ic_spinner_pending_7.webp} | Bin ...8_night.webp => ic_spinner_pending_8.webp} | Bin ...9_night.webp => ic_spinner_pending_9.webp} | Bin ...1_night.webp => ic_spinner_pending_1.webp} | Bin ..._night.webp => ic_spinner_pending_10.webp} | Bin ..._night.webp => ic_spinner_pending_11.webp} | Bin ..._night.webp => ic_spinner_pending_12.webp} | Bin ..._night.webp => ic_spinner_pending_13.webp} | Bin ..._night.webp => ic_spinner_pending_14.webp} | Bin ..._night.webp => ic_spinner_pending_15.webp} | Bin ..._night.webp => ic_spinner_pending_16.webp} | Bin ..._night.webp => ic_spinner_pending_17.webp} | Bin ..._night.webp => ic_spinner_pending_18.webp} | Bin ...2_night.webp => ic_spinner_pending_2.webp} | Bin ...3_night.webp => ic_spinner_pending_3.webp} | Bin ...4_night.webp => ic_spinner_pending_4.webp} | Bin ...5_night.webp => ic_spinner_pending_5.webp} | Bin ...6_night.webp => ic_spinner_pending_6.webp} | Bin ...7_night.webp => ic_spinner_pending_7.webp} | Bin ...8_night.webp => ic_spinner_pending_8.webp} | Bin ...9_night.webp => ic_spinner_pending_9.webp} | Bin ...1_night.webp => ic_spinner_pending_1.webp} | Bin ..._night.webp => ic_spinner_pending_10.webp} | Bin ..._night.webp => ic_spinner_pending_11.webp} | Bin ..._night.webp => ic_spinner_pending_12.webp} | Bin ..._night.webp => ic_spinner_pending_13.webp} | Bin ..._night.webp => ic_spinner_pending_14.webp} | Bin ..._night.webp => ic_spinner_pending_15.webp} | Bin ..._night.webp => ic_spinner_pending_16.webp} | Bin ..._night.webp => ic_spinner_pending_17.webp} | Bin ..._night.webp => ic_spinner_pending_18.webp} | Bin ...2_night.webp => ic_spinner_pending_2.webp} | Bin ...3_night.webp => ic_spinner_pending_3.webp} | Bin ...4_night.webp => ic_spinner_pending_4.webp} | Bin ...5_night.webp => ic_spinner_pending_5.webp} | Bin ...6_night.webp => ic_spinner_pending_6.webp} | Bin ...7_night.webp => ic_spinner_pending_7.webp} | Bin ...8_night.webp => ic_spinner_pending_8.webp} | Bin ...9_night.webp => ic_spinner_pending_9.webp} | Bin .../res/drawable/anim_spinner_pending.xml | 36 +-- .../drawable/anim_traffic_loading_night.xml | 11 - .../drawable/bg_nav_next_next_turn_night.xml | 6 - .../res/drawable/bg_nav_next_turn_night.xml | 6 - .../bg_search_wheel_background_rect_night.xml | 7 - ...bg_search_wheel_background_round_night.xml | 6 - .../drawable/button_accent_disabled_night.xml | 6 - .../main/res/drawable/button_accent_night.xml | 7 - .../drawable/button_accent_night_internal.xml | 9 - .../drawable/button_accent_normal_night.xml | 6 - .../drawable/button_accent_pressed_night.xml | 6 - .../src/main/res/drawable/button_disabled.xml | 6 - .../res/drawable/button_disabled_night.xml | 6 - .../src/main/res/drawable/button_night.xml | 10 - .../src/main/res/drawable/button_normal.xml | 6 - .../main/res/drawable/button_normal_night.xml | 6 - .../src/main/res/drawable/button_pressed.xml | 6 - .../res/drawable/button_pressed_night.xml | 6 - ...fic_inactive.xml => ic_layers_traffic.xml} | 0 .../res/drawable/ic_layers_traffic_active.xml | 51 ---- .../drawable/routing_toolbar_button_night.xml | 13 - .../routing_toolbar_button_normal_night.xml | 7 - .../app/src/main/res/values-night/colors.xml | 44 ++++ .../app/src/main/res/values-night/themes.xml | 136 +++++++++++ .../app/src/main/res/values-v27/themes.xml | 8 - android/app/src/main/res/values/colors.xml | 33 +-- android/app/src/main/res/values/styles.xml | 2 +- android/app/src/main/res/values/themes.xml | 231 +----------------- 208 files changed, 256 insertions(+), 698 deletions(-) delete mode 100644 android/app/src/main/res/color/accent_color_selector_night.xml delete mode 100644 android/app/src/main/res/color/button_accent_night.xml delete mode 100644 android/app/src/main/res/color/button_night.xml delete mode 100644 android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_1_night.webp => ic_spinner_pending_1.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_10_night.webp => ic_spinner_pending_10.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_11_night.webp => ic_spinner_pending_11.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_12_night.webp => ic_spinner_pending_12.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_13_night.webp => ic_spinner_pending_13.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_14_night.webp => ic_spinner_pending_14.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_15_night.webp => ic_spinner_pending_15.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_16_night.webp => ic_spinner_pending_16.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_17_night.webp => ic_spinner_pending_17.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_18_night.webp => ic_spinner_pending_18.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_2_night.webp => ic_spinner_pending_2.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_3_night.webp => ic_spinner_pending_3.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_4_night.webp => ic_spinner_pending_4.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_5_night.webp => ic_spinner_pending_5.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_6_night.webp => ic_spinner_pending_6.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_7_night.webp => ic_spinner_pending_7.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_8_night.webp => ic_spinner_pending_8.webp} (100%) rename android/app/src/main/res/drawable-hdpi/{ic_spinner_pending_9_night.webp => ic_spinner_pending_9.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_1_night.webp => ic_spinner_pending_1.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_10_night.webp => ic_spinner_pending_10.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_11_night.webp => ic_spinner_pending_11.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_12_night.webp => ic_spinner_pending_12.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_13_night.webp => ic_spinner_pending_13.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_14_night.webp => ic_spinner_pending_14.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_15_night.webp => ic_spinner_pending_15.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_16_night.webp => ic_spinner_pending_16.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_17_night.webp => ic_spinner_pending_17.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_18_night.webp => ic_spinner_pending_18.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_2_night.webp => ic_spinner_pending_2.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_3_night.webp => ic_spinner_pending_3.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_4_night.webp => ic_spinner_pending_4.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_5_night.webp => ic_spinner_pending_5.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_6_night.webp => ic_spinner_pending_6.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_7_night.webp => ic_spinner_pending_7.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_8_night.webp => ic_spinner_pending_8.webp} (100%) rename android/app/src/main/res/drawable-mdpi/{ic_spinner_pending_9_night.webp => ic_spinner_pending_9.webp} (100%) rename android/app/src/main/res/{drawable-hdpi/ic_traffic_download_night_1.webp => drawable-night-hdpi/ic_traffic_download_1.webp} (100%) rename android/app/src/main/res/{drawable-hdpi/ic_traffic_download_night_2.webp => drawable-night-hdpi/ic_traffic_download_2.webp} (100%) rename android/app/src/main/res/{drawable-hdpi/ic_traffic_download_night_3.webp => drawable-night-hdpi/ic_traffic_download_3.webp} (100%) rename android/app/src/main/res/{drawable-hdpi/ic_traffic_on_night.webp => drawable-night-hdpi/ic_traffic_on.webp} (100%) rename android/app/src/main/res/{drawable-hdpi/ic_traffic_outdated_night.webp => drawable-night-hdpi/ic_traffic_outdated.webp} (100%) rename android/app/src/main/res/{drawable-hdpi/ic_triangle_night.webp => drawable-night-hdpi/ic_triangle.webp} (100%) rename android/app/src/main/res/{drawable-hdpi/ic_triangle_elevation_night.webp => drawable-night-hdpi/ic_triangle_elevation.webp} (100%) rename android/app/src/main/res/{drawable-mdpi/ic_traffic_download_night_1.webp => drawable-night-mdpi/ic_traffic_download_1.webp} (100%) rename android/app/src/main/res/{drawable-mdpi/ic_traffic_download_night_2.webp => drawable-night-mdpi/ic_traffic_download_2.webp} (100%) rename android/app/src/main/res/{drawable-mdpi/ic_traffic_download_night_3.webp => drawable-night-mdpi/ic_traffic_download_3.webp} (100%) rename android/app/src/main/res/{drawable-mdpi/ic_traffic_on_night.webp => drawable-night-mdpi/ic_traffic_on.webp} (100%) rename android/app/src/main/res/{drawable-mdpi/ic_traffic_outdated_night.webp => drawable-night-mdpi/ic_traffic_outdated.webp} (100%) rename android/app/src/main/res/{drawable-mdpi/ic_triangle_night.webp => drawable-night-mdpi/ic_triangle.webp} (100%) rename android/app/src/main/res/{drawable-mdpi/ic_triangle_elevation_night.webp => drawable-night-mdpi/ic_triangle_elevation.webp} (100%) rename android/app/src/main/res/{drawable-xhdpi/ic_traffic_download_night_1.webp => drawable-night-xhdpi/ic_traffic_download_1.webp} (100%) rename android/app/src/main/res/{drawable-xhdpi/ic_traffic_download_night_2.webp => drawable-night-xhdpi/ic_traffic_download_2.webp} (100%) rename android/app/src/main/res/{drawable-xhdpi/ic_traffic_download_night_3.webp => drawable-night-xhdpi/ic_traffic_download_3.webp} (100%) rename android/app/src/main/res/{drawable-xhdpi/ic_traffic_on_night.webp => drawable-night-xhdpi/ic_traffic_on.webp} (100%) rename android/app/src/main/res/{drawable-xhdpi/ic_traffic_outdated_night.webp => drawable-night-xhdpi/ic_traffic_outdated.webp} (100%) rename android/app/src/main/res/{drawable-xhdpi/ic_triangle_night.webp => drawable-night-xhdpi/ic_triangle.webp} (100%) rename android/app/src/main/res/{drawable-xhdpi/ic_triangle_elevation_night.webp => drawable-night-xhdpi/ic_triangle_elevation.webp} (100%) rename android/app/src/main/res/{drawable-xxhdpi/ic_traffic_download_night_1.webp => drawable-night-xxhdpi/ic_traffic_download_1.webp} (100%) rename android/app/src/main/res/{drawable-xxhdpi/ic_traffic_download_night_2.webp => drawable-night-xxhdpi/ic_traffic_download_2.webp} (100%) rename android/app/src/main/res/{drawable-xxhdpi/ic_traffic_download_night_3.webp => drawable-night-xxhdpi/ic_traffic_download_3.webp} (100%) rename android/app/src/main/res/{drawable-xxhdpi/ic_traffic_on_night.webp => drawable-night-xxhdpi/ic_traffic_on.webp} (100%) rename android/app/src/main/res/{drawable-xxhdpi/ic_traffic_outdated_night.webp => drawable-night-xxhdpi/ic_traffic_outdated.webp} (100%) rename android/app/src/main/res/{drawable-xxhdpi/ic_triangle_night.webp => drawable-night-xxhdpi/ic_triangle.webp} (100%) rename android/app/src/main/res/{drawable-xxhdpi/ic_triangle_elevation_night.webp => drawable-night-xxhdpi/ic_triangle_elevation.webp} (100%) rename android/app/src/main/res/{drawable-xxxhdpi/ic_traffic_download_night_1.webp => drawable-night-xxxhdpi/ic_traffic_download_1.webp} (100%) rename android/app/src/main/res/{drawable-xxxhdpi/ic_traffic_download_night_2.webp => drawable-night-xxxhdpi/ic_traffic_download_2.webp} (100%) rename android/app/src/main/res/{drawable-xxxhdpi/ic_traffic_download_night_3.webp => drawable-night-xxxhdpi/ic_traffic_download_3.webp} (100%) rename android/app/src/main/res/{drawable-xxxhdpi/ic_traffic_on_night.webp => drawable-night-xxxhdpi/ic_traffic_on.webp} (100%) rename android/app/src/main/res/{drawable-xxxhdpi/ic_traffic_outdated_night.webp => drawable-night-xxxhdpi/ic_traffic_outdated.webp} (100%) rename android/app/src/main/res/{drawable-xxxhdpi/ic_triangle_night.webp => drawable-night-xxxhdpi/ic_triangle.webp} (100%) rename android/app/src/main/res/{drawable-xxxhdpi/ic_triangle_elevation_night.webp => drawable-night-xxxhdpi/ic_triangle_elevation.webp} (100%) rename android/app/src/main/res/{drawable/bg_altitude_night.xml => drawable-night/bg_altitude.xml} (100%) rename android/app/src/main/res/{drawable/bg_point_desc_night.xml => drawable-night/bg_point_desc.xml} (100%) rename android/app/src/main/res/{drawable/bg_rounded_rect_night.xml => drawable-night/bg_rounded_rect.xml} (100%) rename android/app/src/main/res/{drawable/bg_your_location_pin_night.xml => drawable-night/bg_your_location_pin.xml} (100%) rename android/app/src/main/res/{drawable/dot_divider_night.xml => drawable-night/dot_divider.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_atm_night.xml => drawable-night/ic_category_atm.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_bank_night.xml => drawable-night/ic_category_bank.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_children_night.xml => drawable-night/ic_category_children.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_eat_night.xml => drawable-night/ic_category_eat.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_entertainment_night.xml => drawable-night/ic_category_entertainment.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_food_night.xml => drawable-night/ic_category_food.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_fuel_night.xml => drawable-night/ic_category_fuel.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_hospital_night.xml => drawable-night/ic_category_hospital.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_hotel_night.xml => drawable-night/ic_category_hotel.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_luggagehero_night.xml => drawable-night/ic_category_luggagehero.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_nightlife_night.xml => drawable-night/ic_category_nightlife.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_parking_night.xml => drawable-night/ic_category_parking.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_pharmacy_night.xml => drawable-night/ic_category_pharmacy.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_police_night.xml => drawable-night/ic_category_police.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_post_night.xml => drawable-night/ic_category_post.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_recycling_night.xml => drawable-night/ic_category_recycling.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_rv_night.xml => drawable-night/ic_category_rv.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_secondhand_night.xml => drawable-night/ic_category_secondhand.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_shopping_night.xml => drawable-night/ic_category_shopping.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_toilet_night.xml => drawable-night/ic_category_toilet.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_tourism_night.xml => drawable-night/ic_category_tourism.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_transport_night.xml => drawable-night/ic_category_transport.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_water_night.xml => drawable-night/ic_category_water.xml} (100%) rename android/app/src/main/res/{drawable/ic_category_wifi_night.xml => drawable-night/ic_category_wifi.xml} (100%) rename android/app/src/main/res/{drawable/ic_menu_location_pending_night.png => drawable-night/ic_menu_location_pending.png} (100%) rename android/app/src/main/res/{drawable/list_divider_night.xml => drawable-night/list_divider.xml} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_1_night.webp => ic_spinner_pending_1.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_10_night.webp => ic_spinner_pending_10.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_11_night.webp => ic_spinner_pending_11.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_12_night.webp => ic_spinner_pending_12.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_13_night.webp => ic_spinner_pending_13.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_14_night.webp => ic_spinner_pending_14.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_15_night.webp => ic_spinner_pending_15.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_16_night.webp => ic_spinner_pending_16.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_17_night.webp => ic_spinner_pending_17.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_18_night.webp => ic_spinner_pending_18.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_2_night.webp => ic_spinner_pending_2.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_3_night.webp => ic_spinner_pending_3.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_4_night.webp => ic_spinner_pending_4.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_5_night.webp => ic_spinner_pending_5.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_6_night.webp => ic_spinner_pending_6.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_7_night.webp => ic_spinner_pending_7.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_8_night.webp => ic_spinner_pending_8.webp} (100%) rename android/app/src/main/res/drawable-xhdpi/{ic_spinner_pending_9_night.webp => ic_spinner_pending_9.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_1_night.webp => ic_spinner_pending_1.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_10_night.webp => ic_spinner_pending_10.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_11_night.webp => ic_spinner_pending_11.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_12_night.webp => ic_spinner_pending_12.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_13_night.webp => ic_spinner_pending_13.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_14_night.webp => ic_spinner_pending_14.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_15_night.webp => ic_spinner_pending_15.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_16_night.webp => ic_spinner_pending_16.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_17_night.webp => ic_spinner_pending_17.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_18_night.webp => ic_spinner_pending_18.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_2_night.webp => ic_spinner_pending_2.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_3_night.webp => ic_spinner_pending_3.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_4_night.webp => ic_spinner_pending_4.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_5_night.webp => ic_spinner_pending_5.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_6_night.webp => ic_spinner_pending_6.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_7_night.webp => ic_spinner_pending_7.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_8_night.webp => ic_spinner_pending_8.webp} (100%) rename android/app/src/main/res/drawable-xxhdpi/{ic_spinner_pending_9_night.webp => ic_spinner_pending_9.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_1_night.webp => ic_spinner_pending_1.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_10_night.webp => ic_spinner_pending_10.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_11_night.webp => ic_spinner_pending_11.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_12_night.webp => ic_spinner_pending_12.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_13_night.webp => ic_spinner_pending_13.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_14_night.webp => ic_spinner_pending_14.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_15_night.webp => ic_spinner_pending_15.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_16_night.webp => ic_spinner_pending_16.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_17_night.webp => ic_spinner_pending_17.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_18_night.webp => ic_spinner_pending_18.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_2_night.webp => ic_spinner_pending_2.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_3_night.webp => ic_spinner_pending_3.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_4_night.webp => ic_spinner_pending_4.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_5_night.webp => ic_spinner_pending_5.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_6_night.webp => ic_spinner_pending_6.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_7_night.webp => ic_spinner_pending_7.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_8_night.webp => ic_spinner_pending_8.webp} (100%) rename android/app/src/main/res/drawable-xxxhdpi/{ic_spinner_pending_9_night.webp => ic_spinner_pending_9.webp} (100%) delete mode 100644 android/app/src/main/res/drawable/anim_traffic_loading_night.xml delete mode 100644 android/app/src/main/res/drawable/bg_nav_next_next_turn_night.xml delete mode 100644 android/app/src/main/res/drawable/bg_nav_next_turn_night.xml delete mode 100644 android/app/src/main/res/drawable/bg_search_wheel_background_rect_night.xml delete mode 100644 android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml delete mode 100644 android/app/src/main/res/drawable/button_accent_disabled_night.xml delete mode 100644 android/app/src/main/res/drawable/button_accent_night.xml delete mode 100644 android/app/src/main/res/drawable/button_accent_night_internal.xml delete mode 100644 android/app/src/main/res/drawable/button_accent_normal_night.xml delete mode 100644 android/app/src/main/res/drawable/button_accent_pressed_night.xml delete mode 100644 android/app/src/main/res/drawable/button_disabled.xml delete mode 100644 android/app/src/main/res/drawable/button_disabled_night.xml delete mode 100644 android/app/src/main/res/drawable/button_night.xml delete mode 100644 android/app/src/main/res/drawable/button_normal.xml delete mode 100644 android/app/src/main/res/drawable/button_normal_night.xml delete mode 100644 android/app/src/main/res/drawable/button_pressed.xml delete mode 100644 android/app/src/main/res/drawable/button_pressed_night.xml rename android/app/src/main/res/drawable/{ic_layers_traffic_inactive.xml => ic_layers_traffic.xml} (100%) delete mode 100644 android/app/src/main/res/drawable/ic_layers_traffic_active.xml delete mode 100644 android/app/src/main/res/drawable/routing_toolbar_button_night.xml delete mode 100644 android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml create mode 100644 android/app/src/main/res/values-night/colors.xml create mode 100644 android/app/src/main/res/values-night/themes.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 51cad9fe3..83ca286ee 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -89,6 +89,7 @@ @@ -349,6 +350,7 @@ @@ -365,6 +367,7 @@ mAlertDialog = null) .show(); } - - @Override - @StyleRes - public int getThemeResourceId(@NonNull String theme) - { - return R.style.MwmTheme_DownloadResourcesLegacy; - } } diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index d10c7cc20..fbf480b7e 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -455,19 +455,6 @@ public class MwmActivity extends BaseMwmFragmentActivity } } - @Override - @StyleRes - protected int getThemeResourceId(@NonNull String theme) - { - if (Config.UiTheme.isDefault(theme)) - return R.style.MwmTheme_MainActivity; - - if (Config.UiTheme.isNight(theme)) - return R.style.MwmTheme_Night_MainActivity; - - return super.getThemeResourceId(theme); - } - @Override public void onDisplayChangedToCar(@NonNull Runnable onTaskFinishedCallback) { diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java index bcd2e41b3..9c417efda 100644 --- a/android/app/src/main/java/app/organicmaps/SplashActivity.java +++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java @@ -56,15 +56,6 @@ public class SplashActivity extends AppCompatActivity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - final String theme = Config.UiTheme.getCurrent(); - if (Config.UiTheme.isDefault(theme)) - setTheme(R.style.MwmTheme_Splash); - else if (Config.UiTheme.isNight(theme)) - setTheme(R.style.MwmTheme_Night_Splash); - else - throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme); - UiThread.cancelDelayedTasks(mInitCoreDelayedTask); setContentView(R.layout.activity_splash); diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java index 1f513dac2..8559b0ac6 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java @@ -8,14 +8,13 @@ import androidx.annotation.Nullable; import androidx.annotation.StyleRes; import androidx.fragment.app.DialogFragment; import app.organicmaps.R; -import app.organicmaps.util.ThemeUtils; public class BaseMwmDialogFragment extends DialogFragment { @StyleRes protected final int getFullscreenTheme() { - return ThemeUtils.isNightTheme() ? getFullscreenDarkTheme() : getFullscreenLightTheme(); + return R.style.MwmTheme_DialogFragment_Fullscreen; } protected int getStyle() @@ -23,7 +22,8 @@ public class BaseMwmDialogFragment extends DialogFragment return STYLE_NORMAL; } - protected @StyleRes int getCustomTheme() + @StyleRes + protected int getCustomTheme() { return 0; } @@ -40,18 +40,6 @@ public class BaseMwmDialogFragment extends DialogFragment setStyle(style, theme); } - @StyleRes - protected int getFullscreenLightTheme() - { - return R.style.MwmTheme_DialogFragment_Fullscreen; - } - - @StyleRes - protected int getFullscreenDarkTheme() - { - return R.style.MwmTheme_DialogFragment_Fullscreen_Night; - } - @NonNull protected Application getAppContextOrThrow() { diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java index 518373f8f..0f5c054ff 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java @@ -11,7 +11,6 @@ import androidx.activity.SystemBarStyle; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.StyleRes; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentFactory; @@ -20,7 +19,6 @@ import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.SplashActivity; import app.organicmaps.sdk.util.Config; -import app.organicmaps.sdk.util.concurrency.UiThread; import app.organicmaps.sdk.util.log.Logger; import app.organicmaps.util.RtlUtils; import com.google.android.material.appbar.MaterialToolbar; @@ -32,24 +30,9 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity private boolean mSafeCreated; - @NonNull - private String mThemeName; - - @StyleRes - protected int getThemeResourceId(@NonNull String theme) - { - if (Config.UiTheme.isDefault(theme)) - return R.style.MwmTheme; - - if (Config.UiTheme.isNight(theme)) - return R.style.MwmTheme_Night; - - throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme); - } - /** * Shows splash screen and initializes the core in case when it was not initialized. - * + *

* Do not override this method! * Use {@link #onSafeCreate(Bundle savedInstanceState)} */ @@ -58,8 +41,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity protected final void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mThemeName = Config.UiTheme.getCurrent(); - setTheme(getThemeResourceId(mThemeName)); EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT)); RtlUtils.manageRtl(this); if (!MwmApplication.from(this).getOrganicMaps().arePlatformAndCoreInitialized()) @@ -113,18 +94,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity mSafeCreated = false; } - @CallSuper - @Override - public void onPostResume() - { - super.onPostResume(); - if (!mThemeName.equals(Config.UiTheme.getCurrent())) - { - // Workaround described in https://code.google.com/p/android/issues/detail?id=93731 - UiThread.runLater(this::recreate); - } - } - @Override public boolean onOptionsItemSelected(MenuItem item) { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java index a3f8c28f2..e0fff2cd9 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java @@ -6,13 +6,11 @@ import android.os.Bundle; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.StyleRes; import androidx.fragment.app.Fragment; import app.organicmaps.R; import app.organicmaps.base.BaseToolbarActivity; import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; import app.organicmaps.sdk.bookmarks.data.BookmarkManager; -import app.organicmaps.util.ThemeUtils; public class BookmarkCategoriesActivity extends BaseToolbarActivity { @@ -38,13 +36,6 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity super.onPause(); } - @Override - @StyleRes - public int getThemeResourceId(@NonNull String theme) - { - return ThemeUtils.getWindowBgThemeResourceId(theme); - } - @Override protected Class getFragmentClass() { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java index 8dd111fac..6a2be1c62 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java @@ -5,13 +5,11 @@ import android.os.Bundle; import androidx.activity.result.ActivityResultLauncher; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; -import androidx.annotation.StyleRes; import androidx.fragment.app.Fragment; import app.organicmaps.R; import app.organicmaps.base.BaseToolbarActivity; import app.organicmaps.sdk.bookmarks.data.BookmarkCategory; import app.organicmaps.sdk.bookmarks.data.BookmarkManager; -import app.organicmaps.util.ThemeUtils; public class BookmarkListActivity extends BaseToolbarActivity { @@ -37,13 +35,6 @@ public class BookmarkListActivity extends BaseToolbarActivity super.onPause(); } - @Override - @StyleRes - public int getThemeResourceId(@NonNull String theme) - { - return ThemeUtils.getCardBgThemeResourceId(theme); - } - @Override protected Class getFragmentClass() { diff --git a/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java index 9d46d4033..df58d5fe2 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java @@ -18,23 +18,22 @@ import app.organicmaps.R; import app.organicmaps.car.SurfaceRenderer; import app.organicmaps.car.screens.base.BaseMapScreen; import app.organicmaps.car.screens.search.SearchOnMapScreen; -import app.organicmaps.car.util.ThemeUtils; import app.organicmaps.car.util.UiHelpers; import java.util.Arrays; import java.util.List; public class CategoriesScreen extends BaseMapScreen { - private record CategoryData(@StringRes int nameResId, @DrawableRes int iconResId, @DrawableRes int iconNightResId) {} + private record CategoryData(@StringRes int nameResId, @DrawableRes int iconResId) {} - private static final List CATEGORIES = Arrays.asList( - new CategoryData(R.string.category_fuel, R.drawable.ic_category_fuel, R.drawable.ic_category_fuel_night), - new CategoryData(R.string.category_parking, R.drawable.ic_category_parking, R.drawable.ic_category_parking_night), - new CategoryData(R.string.category_eat, R.drawable.ic_category_eat, R.drawable.ic_category_eat_night), - new CategoryData(R.string.category_food, R.drawable.ic_category_food, R.drawable.ic_category_food_night), - new CategoryData(R.string.category_hotel, R.drawable.ic_category_hotel, R.drawable.ic_category_hotel_night), - new CategoryData(R.string.category_toilet, R.drawable.ic_category_toilet, R.drawable.ic_category_toilet_night), - new CategoryData(R.string.category_rv, R.drawable.ic_category_rv, R.drawable.ic_category_rv_night)); + private static final List CATEGORIES = + Arrays.asList(new CategoryData(R.string.category_fuel, R.drawable.ic_category_fuel), + new CategoryData(R.string.category_parking, R.drawable.ic_category_parking), + new CategoryData(R.string.category_eat, R.drawable.ic_category_eat), + new CategoryData(R.string.category_food, R.drawable.ic_category_food), + new CategoryData(R.string.category_hotel, R.drawable.ic_category_hotel), + new CategoryData(R.string.category_toilet, R.drawable.ic_category_toilet), + new CategoryData(R.string.category_rv, R.drawable.ic_category_rv)); private final int MAX_CATEGORIES_SIZE; @@ -67,7 +66,6 @@ public class CategoriesScreen extends BaseMapScreen @NonNull private GridTemplate createCategoriesListTemplate() { - final boolean isNightMode = ThemeUtils.isNightMode(getCarContext()); final ItemList.Builder builder = new ItemList.Builder(); final int categoriesSize = Math.min(CATEGORIES.size(), MAX_CATEGORIES_SIZE); for (int i = 0; i < categoriesSize; ++i) @@ -75,7 +73,7 @@ public class CategoriesScreen extends BaseMapScreen final GridItem.Builder itemBuilder = new GridItem.Builder(); final String title = getCarContext().getString(CATEGORIES.get(i).nameResId); @DrawableRes - final int iconResId = isNightMode ? CATEGORIES.get(i).iconNightResId : CATEGORIES.get(i).iconResId; + final int iconResId = CATEGORIES.get(i).iconResId; itemBuilder.setTitle(title); itemBuilder.setImage(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), iconResId)).build()); diff --git a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java index 923c5f5c3..c09ad53c5 100644 --- a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java @@ -13,7 +13,6 @@ import android.widget.TextView; import android.widget.TimePicker; import androidx.annotation.IntRange; import androidx.annotation.NonNull; -import androidx.annotation.StyleRes; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.content.res.AppCompatResources; import androidx.fragment.app.FragmentManager; @@ -21,7 +20,6 @@ import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; import app.organicmaps.sdk.editor.data.HoursMinutes; import app.organicmaps.sdk.util.DateUtils; -import app.organicmaps.util.ThemeUtils; import app.organicmaps.util.Utils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.tabs.TabLayout; @@ -79,15 +77,13 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment // noinspection ConstantConditions mTabs.getTabAt(mSelectedTab).select(); - @StyleRes - final int theme = ThemeUtils.isNightTheme() ? R.style.MwmMain_DialogFragment_TimePicker_Night - : R.style.MwmMain_DialogFragment_TimePicker; - final AlertDialog dialog = new MaterialAlertDialogBuilder(requireActivity(), theme) - .setView(root) - .setNegativeButton(R.string.cancel, null) - .setPositiveButton(R.string.ok, null) - .setCancelable(true) - .create(); + final AlertDialog dialog = + new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmMain_DialogFragment_TimePicker) + .setView(root) + .setNegativeButton(R.string.cancel, null) + .setPositiveButton(R.string.ok, null) + .setCancelable(true) + .create(); dialog.setOnShowListener(dialogInterface -> { mOkButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE); @@ -141,9 +137,8 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment mTabs = root.findViewById(R.id.tabs); MaterialTextView tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false); tabView.setText(getResources().getString(R.string.editor_time_from)); - final ColorStateList textColor = AppCompatResources.getColorStateList( - requireContext(), - ThemeUtils.isNightTheme() ? R.color.accent_color_selector_night : R.color.accent_color_selector); + final ColorStateList textColor = + AppCompatResources.getColorStateList(requireContext(), R.color.accent_color_selector); tabView.setTextColor(textColor); mTabs.addTab(mTabs.newTab().setCustomView(tabView), true); tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false); 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 3aa543822..7e34542a3 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java @@ -2,6 +2,7 @@ package app.organicmaps.maplayer; import android.content.Context; import android.view.View; +import androidx.annotation.AttrRes; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; @@ -33,31 +34,29 @@ public class LayerBottomSheetItem public static LayerBottomSheetItem create(@NonNull Context mContext, Mode mode, @NonNull OnItemClickListener layerItemClickListener) { - @AttrRes - int drawableRes = 0; + @DrawableRes + int drawableResId = 0; @StringRes int buttonTextResource = R.string.layers_title; switch (mode) { case OUTDOORS: - drawableRes = R.attr.outdoorsMenuIcon; + drawableResId = R.drawable.ic_layers_outdoors; buttonTextResource = R.string.button_layer_outdoor; break; case SUBWAY: - drawableRes = R.attr.subwayMenuIcon; + drawableResId = R.drawable.ic_layers_subway; buttonTextResource = R.string.button_layer_subway; break; case ISOLINES: - drawableRes = R.attr.isolinesMenuIcon; + drawableResId = R.drawable.ic_layers_isoline; buttonTextResource = R.string.button_layer_isolines; break; case TRAFFIC: - drawableRes = R.attr.trafficMenuIcon; + drawableResId = R.drawable.ic_layers_traffic; buttonTextResource = R.string.button_layer_traffic; break; } - @DrawableRes - final int drawableResId = ThemeUtils.getResource(mContext, drawableRes); return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener); } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java index ccf986ab1..e129fe1a4 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java @@ -43,20 +43,19 @@ public class TrafficButton void turnOff() { stopWaitingAnimation(); - mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_on_night : R.drawable.ic_traffic_on); + mButton.setImageResource(R.drawable.ic_traffic_on); } void turnOn() { stopWaitingAnimation(); - mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_on_night : R.drawable.ic_traffic_on); + mButton.setImageResource(R.drawable.ic_traffic_on); } void markAsOutdated() { stopWaitingAnimation(); - mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_outdated_night - : R.drawable.ic_traffic_outdated); + mButton.setImageResource(R.drawable.ic_traffic_outdated); } void startWaitingAnimation() diff --git a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java index 53d80fc89..0f3b72227 100644 --- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java @@ -20,7 +20,6 @@ import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; import app.organicmaps.sdk.search.DisplayedCategories; import app.organicmaps.sdk.util.Language; -import app.organicmaps.util.ThemeUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Locale; @@ -91,11 +90,7 @@ class CategoriesAdapter extends RecyclerView.Adapter getFragmentClass() { diff --git a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java index ddc63a6ea..3961d2218 100644 --- a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java @@ -12,7 +12,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.util.ThemeUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener; @@ -35,24 +34,17 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat } @Override - public void onAttach(Context context) + public void onAttach(@NonNull Context context) { super.onAttach(context); Utils.detachFragmentIfCoreNotInitialized(context, this); } @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - - int color; - if (ThemeUtils.isDefaultTheme()) - color = ContextCompat.getColor(requireContext(), R.color.bg_cards); - else - color = ContextCompat.getColor(requireContext(), R.color.bg_cards_night); - view.setBackgroundColor(color); - + view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards)); RecyclerView recyclerView = getListView(); ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView)); } diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java index 9fd2b0a67..26eade991 100644 --- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java @@ -50,7 +50,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La } @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java index 2a9292153..e9633d7ef 100644 --- a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java @@ -137,7 +137,7 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment } @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java index c82c0d5ed..0fd76f918 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java @@ -86,7 +86,7 @@ public enum ThemeSwitcher String oldTheme = Config.UiTheme.getCurrent(); MapStyle style; - if (ThemeUtils.isNightTheme()) + if (Config.UiTheme.isNight(theme)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES); diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java index 8f44e5654..9225e057d 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java @@ -6,8 +6,6 @@ import android.util.TypedValue; import androidx.annotation.AttrRes; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; -import androidx.annotation.StyleRes; -import app.organicmaps.R; import app.organicmaps.sdk.util.Config; public final class ThemeUtils @@ -64,28 +62,4 @@ public final class ThemeUtils { return Config.UiTheme.isNavAuto(Config.UiTheme.getUiThemeSettings()); } - - @StyleRes - public static int getCardBgThemeResourceId(@NonNull String theme) - { - if (Config.UiTheme.isDefault(theme)) - return R.style.MwmTheme_CardBg; - - if (Config.UiTheme.isNight(theme)) - return R.style.MwmTheme_Night_CardBg; - - throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme); - } - - @StyleRes - public static int getWindowBgThemeResourceId(@NonNull String theme) - { - if (Config.UiTheme.isDefault(theme)) - return R.style.MwmTheme_WindowBg; - - if (Config.UiTheme.isNight(theme)) - return R.style.MwmTheme_Night_WindowBg; - - throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme); - } } diff --git a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java index e51e84105..3e1744a95 100644 --- a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java +++ b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java @@ -35,9 +35,8 @@ public class RoutingToolbarButton extends AppCompatRadioButton private void initView() { - final boolean isNightTheme = ThemeUtils.isNightTheme(); - setBackgroundResource(isNightTheme ? R.drawable.routing_toolbar_button_night : R.drawable.routing_toolbar_button); - setButtonTintList(isNightTheme ? R.color.routing_toolbar_icon_tint_night : R.color.routing_toolbar_icon_tint); + setBackgroundResource(R.drawable.routing_toolbar_button); + setButtonTintList(R.color.routing_toolbar_icon_tint); } public void progress() diff --git a/android/app/src/main/res/color/accent_color_selector_night.xml b/android/app/src/main/res/color/accent_color_selector_night.xml deleted file mode 100644 index 5ac5acec9..000000000 --- a/android/app/src/main/res/color/accent_color_selector_night.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/android/app/src/main/res/color/button_accent_night.xml b/android/app/src/main/res/color/button_accent_night.xml deleted file mode 100644 index 15851ecf2..000000000 --- a/android/app/src/main/res/color/button_accent_night.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/color/button_night.xml b/android/app/src/main/res/color/button_night.xml deleted file mode 100644 index e526e5ac6..000000000 --- a/android/app/src/main/res/color/button_night.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml b/android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml deleted file mode 100644 index 883a8200a..000000000 --- a/android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_1.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_1.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_10.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_10.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_11.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_11.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_12.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_12.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_13.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_13.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_14.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_14.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_15.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_15.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_16.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_16.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_17.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_17.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_18.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_18.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_2.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_2.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_3.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_3.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_4.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_4.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_5.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_5.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_6.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_6.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_7.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_7.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_8.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_8.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_9.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_9.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_1.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_1.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_10.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_10.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_11.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_11.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_12.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_12.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_13.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_13.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_14.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_14.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_15.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_15.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_16.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_16.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_17.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_17.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_18.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_18.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_2.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_2.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_3.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_3.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_4.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_4.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_5.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_5.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_6.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_6.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_7.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_7.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_8.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_8.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_9.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_9.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-night-hdpi/ic_traffic_download_1.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-night-hdpi/ic_traffic_download_1.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-night-hdpi/ic_traffic_download_2.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-night-hdpi/ic_traffic_download_2.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-night-hdpi/ic_traffic_download_3.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-night-hdpi/ic_traffic_download_3.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-night-hdpi/ic_traffic_on.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-night-hdpi/ic_traffic_on.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-night-hdpi/ic_traffic_outdated.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-night-hdpi/ic_traffic_outdated.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-night-hdpi/ic_triangle.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-night-hdpi/ic_triangle.webp diff --git a/android/app/src/main/res/drawable-hdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-night-hdpi/ic_triangle_elevation.webp similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-night-hdpi/ic_triangle_elevation.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-night-mdpi/ic_traffic_download_1.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-night-mdpi/ic_traffic_download_1.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-night-mdpi/ic_traffic_download_2.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-night-mdpi/ic_traffic_download_2.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-night-mdpi/ic_traffic_download_3.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-night-mdpi/ic_traffic_download_3.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-night-mdpi/ic_traffic_on.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-night-mdpi/ic_traffic_on.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-night-mdpi/ic_traffic_outdated.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-night-mdpi/ic_traffic_outdated.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-night-mdpi/ic_triangle.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-night-mdpi/ic_triangle.webp diff --git a/android/app/src/main/res/drawable-mdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-night-mdpi/ic_triangle_elevation.webp similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-night-mdpi/ic_triangle_elevation.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-night-xhdpi/ic_traffic_download_1.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-night-xhdpi/ic_traffic_download_1.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-night-xhdpi/ic_traffic_download_2.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-night-xhdpi/ic_traffic_download_2.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-night-xhdpi/ic_traffic_download_3.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-night-xhdpi/ic_traffic_download_3.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-night-xhdpi/ic_traffic_on.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-night-xhdpi/ic_traffic_on.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-night-xhdpi/ic_traffic_outdated.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-night-xhdpi/ic_traffic_outdated.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-night-xhdpi/ic_triangle.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-night-xhdpi/ic_triangle.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-night-xhdpi/ic_triangle_elevation.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-night-xhdpi/ic_triangle_elevation.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_download_1.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_download_1.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_download_2.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_download_2.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_download_3.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_download_3.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_on.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_on.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_outdated.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-night-xxhdpi/ic_traffic_outdated.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-night-xxhdpi/ic_triangle.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-night-xxhdpi/ic_triangle.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-night-xxhdpi/ic_triangle_elevation.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-night-xxhdpi/ic_triangle_elevation.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_download_1.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_download_1.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_download_2.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_download_2.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_download_3.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_download_3.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_on.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_on.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_outdated.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-night-xxxhdpi/ic_traffic_outdated.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-night-xxxhdpi/ic_triangle.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-night-xxxhdpi/ic_triangle.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-night-xxxhdpi/ic_triangle_elevation.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-night-xxxhdpi/ic_triangle_elevation.webp diff --git a/android/app/src/main/res/drawable/bg_altitude_night.xml b/android/app/src/main/res/drawable-night/bg_altitude.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_altitude_night.xml rename to android/app/src/main/res/drawable-night/bg_altitude.xml diff --git a/android/app/src/main/res/drawable/bg_point_desc_night.xml b/android/app/src/main/res/drawable-night/bg_point_desc.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_point_desc_night.xml rename to android/app/src/main/res/drawable-night/bg_point_desc.xml diff --git a/android/app/src/main/res/drawable/bg_rounded_rect_night.xml b/android/app/src/main/res/drawable-night/bg_rounded_rect.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_rounded_rect_night.xml rename to android/app/src/main/res/drawable-night/bg_rounded_rect.xml diff --git a/android/app/src/main/res/drawable/bg_your_location_pin_night.xml b/android/app/src/main/res/drawable-night/bg_your_location_pin.xml similarity index 100% rename from android/app/src/main/res/drawable/bg_your_location_pin_night.xml rename to android/app/src/main/res/drawable-night/bg_your_location_pin.xml diff --git a/android/app/src/main/res/drawable/dot_divider_night.xml b/android/app/src/main/res/drawable-night/dot_divider.xml similarity index 100% rename from android/app/src/main/res/drawable/dot_divider_night.xml rename to android/app/src/main/res/drawable-night/dot_divider.xml diff --git a/android/app/src/main/res/drawable/ic_category_atm_night.xml b/android/app/src/main/res/drawable-night/ic_category_atm.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_atm_night.xml rename to android/app/src/main/res/drawable-night/ic_category_atm.xml diff --git a/android/app/src/main/res/drawable/ic_category_bank_night.xml b/android/app/src/main/res/drawable-night/ic_category_bank.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_bank_night.xml rename to android/app/src/main/res/drawable-night/ic_category_bank.xml diff --git a/android/app/src/main/res/drawable/ic_category_children_night.xml b/android/app/src/main/res/drawable-night/ic_category_children.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_children_night.xml rename to android/app/src/main/res/drawable-night/ic_category_children.xml diff --git a/android/app/src/main/res/drawable/ic_category_eat_night.xml b/android/app/src/main/res/drawable-night/ic_category_eat.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_eat_night.xml rename to android/app/src/main/res/drawable-night/ic_category_eat.xml diff --git a/android/app/src/main/res/drawable/ic_category_entertainment_night.xml b/android/app/src/main/res/drawable-night/ic_category_entertainment.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_entertainment_night.xml rename to android/app/src/main/res/drawable-night/ic_category_entertainment.xml diff --git a/android/app/src/main/res/drawable/ic_category_food_night.xml b/android/app/src/main/res/drawable-night/ic_category_food.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_food_night.xml rename to android/app/src/main/res/drawable-night/ic_category_food.xml diff --git a/android/app/src/main/res/drawable/ic_category_fuel_night.xml b/android/app/src/main/res/drawable-night/ic_category_fuel.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_fuel_night.xml rename to android/app/src/main/res/drawable-night/ic_category_fuel.xml diff --git a/android/app/src/main/res/drawable/ic_category_hospital_night.xml b/android/app/src/main/res/drawable-night/ic_category_hospital.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_hospital_night.xml rename to android/app/src/main/res/drawable-night/ic_category_hospital.xml diff --git a/android/app/src/main/res/drawable/ic_category_hotel_night.xml b/android/app/src/main/res/drawable-night/ic_category_hotel.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_hotel_night.xml rename to android/app/src/main/res/drawable-night/ic_category_hotel.xml diff --git a/android/app/src/main/res/drawable/ic_category_luggagehero_night.xml b/android/app/src/main/res/drawable-night/ic_category_luggagehero.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_luggagehero_night.xml rename to android/app/src/main/res/drawable-night/ic_category_luggagehero.xml diff --git a/android/app/src/main/res/drawable/ic_category_nightlife_night.xml b/android/app/src/main/res/drawable-night/ic_category_nightlife.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_nightlife_night.xml rename to android/app/src/main/res/drawable-night/ic_category_nightlife.xml diff --git a/android/app/src/main/res/drawable/ic_category_parking_night.xml b/android/app/src/main/res/drawable-night/ic_category_parking.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_parking_night.xml rename to android/app/src/main/res/drawable-night/ic_category_parking.xml diff --git a/android/app/src/main/res/drawable/ic_category_pharmacy_night.xml b/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_pharmacy_night.xml rename to android/app/src/main/res/drawable-night/ic_category_pharmacy.xml diff --git a/android/app/src/main/res/drawable/ic_category_police_night.xml b/android/app/src/main/res/drawable-night/ic_category_police.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_police_night.xml rename to android/app/src/main/res/drawable-night/ic_category_police.xml diff --git a/android/app/src/main/res/drawable/ic_category_post_night.xml b/android/app/src/main/res/drawable-night/ic_category_post.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_post_night.xml rename to android/app/src/main/res/drawable-night/ic_category_post.xml diff --git a/android/app/src/main/res/drawable/ic_category_recycling_night.xml b/android/app/src/main/res/drawable-night/ic_category_recycling.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_recycling_night.xml rename to android/app/src/main/res/drawable-night/ic_category_recycling.xml diff --git a/android/app/src/main/res/drawable/ic_category_rv_night.xml b/android/app/src/main/res/drawable-night/ic_category_rv.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_rv_night.xml rename to android/app/src/main/res/drawable-night/ic_category_rv.xml diff --git a/android/app/src/main/res/drawable/ic_category_secondhand_night.xml b/android/app/src/main/res/drawable-night/ic_category_secondhand.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_secondhand_night.xml rename to android/app/src/main/res/drawable-night/ic_category_secondhand.xml diff --git a/android/app/src/main/res/drawable/ic_category_shopping_night.xml b/android/app/src/main/res/drawable-night/ic_category_shopping.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_shopping_night.xml rename to android/app/src/main/res/drawable-night/ic_category_shopping.xml diff --git a/android/app/src/main/res/drawable/ic_category_toilet_night.xml b/android/app/src/main/res/drawable-night/ic_category_toilet.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_toilet_night.xml rename to android/app/src/main/res/drawable-night/ic_category_toilet.xml diff --git a/android/app/src/main/res/drawable/ic_category_tourism_night.xml b/android/app/src/main/res/drawable-night/ic_category_tourism.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_tourism_night.xml rename to android/app/src/main/res/drawable-night/ic_category_tourism.xml diff --git a/android/app/src/main/res/drawable/ic_category_transport_night.xml b/android/app/src/main/res/drawable-night/ic_category_transport.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_transport_night.xml rename to android/app/src/main/res/drawable-night/ic_category_transport.xml diff --git a/android/app/src/main/res/drawable/ic_category_water_night.xml b/android/app/src/main/res/drawable-night/ic_category_water.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_water_night.xml rename to android/app/src/main/res/drawable-night/ic_category_water.xml diff --git a/android/app/src/main/res/drawable/ic_category_wifi_night.xml b/android/app/src/main/res/drawable-night/ic_category_wifi.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_category_wifi_night.xml rename to android/app/src/main/res/drawable-night/ic_category_wifi.xml diff --git a/android/app/src/main/res/drawable/ic_menu_location_pending_night.png b/android/app/src/main/res/drawable-night/ic_menu_location_pending.png similarity index 100% rename from android/app/src/main/res/drawable/ic_menu_location_pending_night.png rename to android/app/src/main/res/drawable-night/ic_menu_location_pending.png diff --git a/android/app/src/main/res/drawable/list_divider_night.xml b/android/app/src/main/res/drawable-night/list_divider.xml similarity index 100% rename from android/app/src/main/res/drawable/list_divider_night.xml rename to android/app/src/main/res/drawable-night/list_divider.xml diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_1.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_1.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_10.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_10.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_11.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_11.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_12.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_12.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_13.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_13.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_14.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_14.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_15.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_15.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_16.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_16.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_17.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_17.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_18.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_18.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_2.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_2.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_3.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_3.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_4.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_4.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_5.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_5.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_6.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_6.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_7.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_7.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_8.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_8.webp diff --git a/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_9.webp similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_9.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_1.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_1.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_10.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_10.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_11.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_11.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_12.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_12.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_13.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_13.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_14.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_14.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_15.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_15.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_16.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_16.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_17.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_17.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_18.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_18.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_2.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_2.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_3.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_3.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_4.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_4.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_5.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_5.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_6.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_6.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_7.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_7.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_8.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_8.webp diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_9.webp similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_9.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_1.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_1.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_10.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_10.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_11.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_11.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_12.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_12.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_13.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_13.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_14.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_14.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_15.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_15.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_16.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_16.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_17.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_17.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_18.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_18.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_2.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_2.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_3.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_3.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_4.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_4.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_5.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_5.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_6.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_6.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_7.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_7.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_8.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_8.webp diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_9.webp similarity index 100% rename from android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_9.webp diff --git a/android/app/src/main/res/drawable/anim_spinner_pending.xml b/android/app/src/main/res/drawable/anim_spinner_pending.xml index 182e0ac42..520f0784a 100644 --- a/android/app/src/main/res/drawable/anim_spinner_pending.xml +++ b/android/app/src/main/res/drawable/anim_spinner_pending.xml @@ -1,56 +1,56 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/anim_traffic_loading_night.xml b/android/app/src/main/res/drawable/anim_traffic_loading_night.xml deleted file mode 100644 index e97d26257..000000000 --- a/android/app/src/main/res/drawable/anim_traffic_loading_night.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/android/app/src/main/res/drawable/bg_nav_next_next_turn_night.xml b/android/app/src/main/res/drawable/bg_nav_next_next_turn_night.xml deleted file mode 100644 index f8c3d5eb5..000000000 --- a/android/app/src/main/res/drawable/bg_nav_next_next_turn_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/bg_nav_next_turn_night.xml b/android/app/src/main/res/drawable/bg_nav_next_turn_night.xml deleted file mode 100644 index 46212ff7a..000000000 --- a/android/app/src/main/res/drawable/bg_nav_next_turn_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/bg_search_wheel_background_rect_night.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_rect_night.xml deleted file mode 100644 index 13509a5d5..000000000 --- a/android/app/src/main/res/drawable/bg_search_wheel_background_rect_night.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml deleted file mode 100644 index 00e31d17a..000000000 --- a/android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_accent_disabled_night.xml b/android/app/src/main/res/drawable/button_accent_disabled_night.xml deleted file mode 100644 index f7c73a817..000000000 --- a/android/app/src/main/res/drawable/button_accent_disabled_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_accent_night.xml b/android/app/src/main/res/drawable/button_accent_night.xml deleted file mode 100644 index 192a6af3e..000000000 --- a/android/app/src/main/res/drawable/button_accent_night.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/android/app/src/main/res/drawable/button_accent_night_internal.xml b/android/app/src/main/res/drawable/button_accent_night_internal.xml deleted file mode 100644 index 67c7755d2..000000000 --- a/android/app/src/main/res/drawable/button_accent_night_internal.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/android/app/src/main/res/drawable/button_accent_normal_night.xml b/android/app/src/main/res/drawable/button_accent_normal_night.xml deleted file mode 100644 index 9c9af0b2f..000000000 --- a/android/app/src/main/res/drawable/button_accent_normal_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_accent_pressed_night.xml b/android/app/src/main/res/drawable/button_accent_pressed_night.xml deleted file mode 100644 index 32a06fe28..000000000 --- a/android/app/src/main/res/drawable/button_accent_pressed_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_disabled.xml b/android/app/src/main/res/drawable/button_disabled.xml deleted file mode 100644 index 0e5b6478e..000000000 --- a/android/app/src/main/res/drawable/button_disabled.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_disabled_night.xml b/android/app/src/main/res/drawable/button_disabled_night.xml deleted file mode 100644 index 508f68863..000000000 --- a/android/app/src/main/res/drawable/button_disabled_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_night.xml b/android/app/src/main/res/drawable/button_night.xml deleted file mode 100644 index a4f3d16e0..000000000 --- a/android/app/src/main/res/drawable/button_night.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_normal.xml b/android/app/src/main/res/drawable/button_normal.xml deleted file mode 100644 index 7f363de8a..000000000 --- a/android/app/src/main/res/drawable/button_normal.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_normal_night.xml b/android/app/src/main/res/drawable/button_normal_night.xml deleted file mode 100644 index 5c7a45a0a..000000000 --- a/android/app/src/main/res/drawable/button_normal_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_pressed.xml b/android/app/src/main/res/drawable/button_pressed.xml deleted file mode 100644 index 948c7ba2e..000000000 --- a/android/app/src/main/res/drawable/button_pressed.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/button_pressed_night.xml b/android/app/src/main/res/drawable/button_pressed_night.xml deleted file mode 100644 index 2cb80bf0c..000000000 --- a/android/app/src/main/res/drawable/button_pressed_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/ic_layers_traffic_inactive.xml b/android/app/src/main/res/drawable/ic_layers_traffic.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_layers_traffic_inactive.xml rename to android/app/src/main/res/drawable/ic_layers_traffic.xml diff --git a/android/app/src/main/res/drawable/ic_layers_traffic_active.xml b/android/app/src/main/res/drawable/ic_layers_traffic_active.xml deleted file mode 100644 index 7877be682..000000000 --- a/android/app/src/main/res/drawable/ic_layers_traffic_active.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/android/app/src/main/res/drawable/routing_toolbar_button_night.xml b/android/app/src/main/res/drawable/routing_toolbar_button_night.xml deleted file mode 100644 index 0be952a4b..000000000 --- a/android/app/src/main/res/drawable/routing_toolbar_button_night.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml b/android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml deleted file mode 100644 index 47906aacb..000000000 --- a/android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml new file mode 100644 index 000000000..6cda6a17c --- /dev/null +++ b/android/app/src/main/res/values-night/colors.xml @@ -0,0 +1,44 @@ + + + #FF7CBC7B + #FF588157 + + #FFC4C6C7 + + #FF76797C + + #1EFFFFFF + + + #FF32363A + #37653F + #FF3C4044 + @color/bg_window + #FF588157 + + #CC2D3237 + + #004120 + + + #40CCCCCC + @color/white_12 + #FFFFFFFF + #4CFFFFFF + + @color/base_accent + @color/base_accent_pressed + #FF505050 + #FF000000 + #4CFFFFFF + + + @color/black_primary + + #FF9600 + @color/base_accent + + + #54575b + #ffe68c + diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml new file mode 100644 index 000000000..3aedf386c --- /dev/null +++ b/android/app/src/main/res/values-night/themes.xml @@ -0,0 +1,136 @@ + + + + + + + + diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml index be189822b..1f4882c4d 100644 --- a/android/app/src/main/res/values-v27/themes.xml +++ b/android/app/src/main/res/values-v27/themes.xml @@ -9,12 +9,4 @@ shortEdges - diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index be3c9f4b7..a27b7c0c8 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -9,9 +9,7 @@ @color/white_lightest #FF37653F - #FF7CBC7B #FF588157 - #FF588157 #1EF9B42D #F51E30 @@ -55,35 +53,25 @@ #3C8C3C #FF757575 - #FFC4C6C7 #FFBDBDBD - #FF76797C #1E000000 - #1EFFFFFF #FFEEEEEE - #FF32363A #588157 - #37653F @android:color/white - #FF3C4044 @color/bg_window - @color/bg_window_night #37653F - #FF588157 #BB000000 #99FFFFFF #CCFFFFFF - #CC2D3237 #004120 #66000000 - #121417 @color/bg_primary @@ -101,26 +89,16 @@ #00000000 - #00000000 #66999999 - #40CCCCCC #00000000 - @color/white_12 #FF000000 - #FFFFFFFF #42000000 - #4CFFFFFF @color/base_accent - @color/base_accent_night @color/base_accent_pressed - @color/base_accent_pressed_night @color/black_12 - #FF505050 #FFFFFFFF - #FF000000 #42000000 - #4CFFFFFF @color/base_red #FFFFFFFF @@ -129,14 +107,11 @@ #1F000000 #FFFFFFFF @color/bg_statusbar - @color/bg_statusbar_night #80FFFFFF - @color/white_primary - @color/black_primary - @color/black_30 - @color/black_30 + @color/white_primary + @color/black_20 #FFF2F6F6 @@ -147,7 +122,6 @@ #FF9600 #1E96F0 - #4BB9E6 #0057ff @@ -156,8 +130,7 @@ #ebebeb - #54575b #FF37653F - #ffe68c #ffc30a + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index e6a6fd847..b4faab183 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -165,7 +165,7 @@ - - - - - - - - - - - - - - - - - - @@ -369,33 +205,11 @@ @android:color/transparent - - - - - - - @@ -435,43 +240,19 @@ @drawable/downloader_folder_done - - - - - - - - - - -