From 766014752e1d3ec01db7ae3907bafc31d0acf35e Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sun, 29 Dec 2024 19:59:41 +0000
Subject: [PATCH] use night drawable variants instead of getting category icons
 programatically

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../app/organicmaps/search/CategoriesAdapter.java   |   3 ---
 .../anim_traffic_loading.xml}                       |   0
 .../bg_altitude.xml}                                |   0
 .../bg_nav_next_next_turn.xml}                      |   0
 .../bg_nav_next_turn.xml}                           |   0
 .../bg_point_desc.xml}                              |   0
 .../bg_rounded_rect.xml}                            |   0
 .../bg_search_wheel_background_rect.xml}            |   0
 .../bg_search_wheel_background_round.xml}           |   0
 .../bg_your_location_pin.xml}                       |   0
 .../button_night.xml => drawable-night/button.xml}  |   0
 .../button_accent.xml}                              |   0
 .../button_accent_disabled.xml}                     |   0
 .../button_accent_internal.xml}                     |   0
 .../button_accent_normal.xml}                       |   0
 .../button_accent_pressed.xml}                      |   0
 .../button_disabled.xml}                            |   0
 .../button_normal.xml}                              |   0
 .../button_pressed.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
 46 files changed, 3 deletions(-)
 rename android/app/src/main/res/{drawable/anim_traffic_loading_night.xml => drawable-night/anim_traffic_loading.xml} (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_nav_next_next_turn_night.xml => drawable-night/bg_nav_next_next_turn.xml} (100%)
 rename android/app/src/main/res/{drawable/bg_nav_next_turn_night.xml => drawable-night/bg_nav_next_turn.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_search_wheel_background_rect_night.xml => drawable-night/bg_search_wheel_background_rect.xml} (100%)
 rename android/app/src/main/res/{drawable/bg_search_wheel_background_round_night.xml => drawable-night/bg_search_wheel_background_round.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/button_night.xml => drawable-night/button.xml} (100%)
 rename android/app/src/main/res/{drawable/button_accent_night.xml => drawable-night/button_accent.xml} (100%)
 rename android/app/src/main/res/{drawable/button_accent_disabled_night.xml => drawable-night/button_accent_disabled.xml} (100%)
 rename android/app/src/main/res/{drawable/button_accent_night_internal.xml => drawable-night/button_accent_internal.xml} (100%)
 rename android/app/src/main/res/{drawable/button_accent_normal_night.xml => drawable-night/button_accent_normal.xml} (100%)
 rename android/app/src/main/res/{drawable/button_accent_pressed_night.xml => drawable-night/button_accent_pressed.xml} (100%)
 rename android/app/src/main/res/{drawable/button_disabled_night.xml => drawable-night/button_disabled.xml} (100%)
 rename android/app/src/main/res/{drawable/button_normal_night.xml => drawable-night/button_normal.xml} (100%)
 rename android/app/src/main/res/{drawable/button_pressed_night.xml => drawable-night/button_pressed.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%)

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 ea8bf7504b..aacaaf0671 100644
--- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
@@ -110,10 +110,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
                                            @NonNull String packageName,
                                            @NonNull String key)
   {
-    final boolean isNightTheme = ThemeUtils.isNightTheme(context);
     String iconId = "ic_" + key;
-    if (isNightTheme)
-      iconId = iconId + "_night";
     return context.getResources().getIdentifier(iconId, "drawable", packageName);
   }
 
diff --git a/android/app/src/main/res/drawable/anim_traffic_loading_night.xml b/android/app/src/main/res/drawable-night/anim_traffic_loading.xml
similarity index 100%
rename from android/app/src/main/res/drawable/anim_traffic_loading_night.xml
rename to android/app/src/main/res/drawable-night/anim_traffic_loading.xml
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_nav_next_next_turn_night.xml b/android/app/src/main/res/drawable-night/bg_nav_next_next_turn.xml
similarity index 100%
rename from android/app/src/main/res/drawable/bg_nav_next_next_turn_night.xml
rename to android/app/src/main/res/drawable-night/bg_nav_next_next_turn.xml
diff --git a/android/app/src/main/res/drawable/bg_nav_next_turn_night.xml b/android/app/src/main/res/drawable-night/bg_nav_next_turn.xml
similarity index 100%
rename from android/app/src/main/res/drawable/bg_nav_next_turn_night.xml
rename to android/app/src/main/res/drawable-night/bg_nav_next_turn.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_search_wheel_background_rect_night.xml b/android/app/src/main/res/drawable-night/bg_search_wheel_background_rect.xml
similarity index 100%
rename from android/app/src/main/res/drawable/bg_search_wheel_background_rect_night.xml
rename to android/app/src/main/res/drawable-night/bg_search_wheel_background_rect.xml
diff --git a/android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml b/android/app/src/main/res/drawable-night/bg_search_wheel_background_round.xml
similarity index 100%
rename from android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml
rename to android/app/src/main/res/drawable-night/bg_search_wheel_background_round.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/button_night.xml b/android/app/src/main/res/drawable-night/button.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_night.xml
rename to android/app/src/main/res/drawable-night/button.xml
diff --git a/android/app/src/main/res/drawable/button_accent_night.xml b/android/app/src/main/res/drawable-night/button_accent.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_accent_night.xml
rename to android/app/src/main/res/drawable-night/button_accent.xml
diff --git a/android/app/src/main/res/drawable/button_accent_disabled_night.xml b/android/app/src/main/res/drawable-night/button_accent_disabled.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_accent_disabled_night.xml
rename to android/app/src/main/res/drawable-night/button_accent_disabled.xml
diff --git a/android/app/src/main/res/drawable/button_accent_night_internal.xml b/android/app/src/main/res/drawable-night/button_accent_internal.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_accent_night_internal.xml
rename to android/app/src/main/res/drawable-night/button_accent_internal.xml
diff --git a/android/app/src/main/res/drawable/button_accent_normal_night.xml b/android/app/src/main/res/drawable-night/button_accent_normal.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_accent_normal_night.xml
rename to android/app/src/main/res/drawable-night/button_accent_normal.xml
diff --git a/android/app/src/main/res/drawable/button_accent_pressed_night.xml b/android/app/src/main/res/drawable-night/button_accent_pressed.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_accent_pressed_night.xml
rename to android/app/src/main/res/drawable-night/button_accent_pressed.xml
diff --git a/android/app/src/main/res/drawable/button_disabled_night.xml b/android/app/src/main/res/drawable-night/button_disabled.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_disabled_night.xml
rename to android/app/src/main/res/drawable-night/button_disabled.xml
diff --git a/android/app/src/main/res/drawable/button_normal_night.xml b/android/app/src/main/res/drawable-night/button_normal.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_normal_night.xml
rename to android/app/src/main/res/drawable-night/button_normal.xml
diff --git a/android/app/src/main/res/drawable/button_pressed_night.xml b/android/app/src/main/res/drawable-night/button_pressed.xml
similarity index 100%
rename from android/app/src/main/res/drawable/button_pressed_night.xml
rename to android/app/src/main/res/drawable-night/button_pressed.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