[android] Simplify toolbar styles and themes

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java

@@ -6,10 +6,12 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 
@@ -42,6 +44,7 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
+    view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
     RecyclerView recyclerView = getListView();
     ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
   }

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -196,7 +196,7 @@ public final class UiUtils
   public static void showHomeUpButton(MaterialToolbar toolbar)
   {
     toolbar.setNavigationIcon(
-        ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
 
   // this method returns the total height of the display (in pixels) including notch and other touchable areas

android/app/src/main/res/layout-land/about.xml

@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">

android/app/src/main/res/layout-land/fragment_osm_login.xml

@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">

android/app/src/main/res/layout-w1020dp/activity_settings.xml

@@ -3,8 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:background="?appBackground">
+  android:orientation="vertical">
 
   <include
     layout="@layout/toolbar_extended"/>
@@ -18,8 +17,7 @@
       android:id="@+id/fragment_container"
       style="@style/MwmWidget.FrameLayout.Elevation"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="?appBackground"/>
+      android:layout_height="match_parent"/>
   </com.google.android.material.card.MaterialCardView>
 
 </FrameLayout>

android/app/src/main/res/layout/about.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">

android/app/src/main/res/layout/activity_download_resources.xml

@@ -5,7 +5,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?appBackground">
+  android:background="?cardBackground">
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"

android/app/src/main/res/layout/activity_map_placeholder.xml

@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?appBackground"
+  android:background="?cardBackground"
   android:gravity="center"
   android:orientation="vertical">
 

android/app/src/main/res/layout/activity_request_permissions.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:gravity="center"
     android:orientation="vertical">
 

android/app/src/main/res/layout/activity_settings.xml

@@ -3,8 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:background="?appBackground">
+  android:orientation="vertical">
 
   <include
     layout="@layout/toolbar_default"/>

android/app/src/main/res/layout/fragment_driving_options.xml

@@ -2,18 +2,11 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?appBackground"
+  android:background="?cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
-    android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme">
-  </com.google.android.material.appbar.MaterialToolbar>
+  <include layout="@layout/toolbar_default"/>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"

android/app/src/main/res/layout/fragment_osm_login.xml

@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">

android/app/src/main/res/layout/fragment_osm_profile.xml

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
-  android:background="?appBackground">
+  android:background="?cardBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/fragment_prefs_storage.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?appBackground">
+    android:background="?cardBackground">
 
   <com.google.android.material.textview.MaterialTextView
       android:id="@+id/header"

android/app/src/main/res/layout/place_page_map_too_old.xml

@@ -9,7 +9,7 @@ android:layout_marginHorizontal="@dimen/margin_base"
 android:layout_marginTop="@dimen/margin_half"
 app:strokeWidth="1dp"
 app:strokeColor="@color/base_accent"
-app:cardBackgroundColor="?cardBackground">
+app:cardBackgroundColor="@color/bg_cards">
 
 <LinearLayout
   android:layout_width="match_parent"

android/app/src/main/res/layout/routing_plan.xml

@@ -30,8 +30,7 @@
             android:layout_alignParentStart="true"
             android:background="?selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
-            android:scaleType="center"
-            tools:src="@drawable/ic_expand_more" />
+            android:scaleType="center" />
 
         <RadioGroup
             android:id="@+id/route_type"

android/app/src/main/res/layout/toolbar_extended.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
@@ -9,7 +10,8 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme.DownButton"/>
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    app:navigationIcon="@drawable/ic_expand_more"/>
 
   <View
     android:layout_width="match_parent"

android/app/src/main/res/layout/toolbar_search_controls.xml

@@ -17,7 +17,6 @@
     android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
-    tools:src="@drawable/ic_expand_more"
     android:contentDescription="@string/back"/>
 
   <com.google.android.material.textfield.TextInputEditText

android/app/src/main/res/layout/toolbar_transparent.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/toolbar"
-  style="@style/MwmWidget.ToolbarStyle"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:theme="@style/MwmWidget.ToolbarTheme.Transparent"/>

android/app/src/main/res/values-night/themes.xml

@@ -150,8 +150,6 @@
     <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
     <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
     <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
-
-    <item name="appBackground">?android:attr/colorBackground</item>
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>

android/app/src/main/res/values/colors.xml

@@ -64,7 +64,6 @@
   <color name="bg_cards">@android:color/white</color>
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
-  <color name="bg_app">@android:color/white</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>

android/app/src/main/res/values/styles.xml

@@ -148,11 +148,6 @@
     <item name="buttonGravity">center_vertical</item>
   </style>
 
-  <style name="MwmWidget.ToolbarStyle.Light">
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
-    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
-  </style>
-
   <style name="MwmWidget.ToolbarStyle.NoElevation">
     <item name="android:elevation">0dp</item>
   </style>
@@ -164,29 +159,6 @@
     <item name="iconTint">@color/white_primary</item>
   </style>
 
-  <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
-    <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
-    <item name="colorSecondary">#FF32363A</item>
-  </style>
-
-  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.Dark.ActionBar">
-    <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
-    <item name="colorSecondary">@android:color/white</item>
-    <item name="android:windowActionBarOverlay">true</item>
-    <item name="windowActionBarOverlay">true</item>
-  </style>
-
-  <style
-    name="MwmWidget.ToolbarTheme.DownButton"
-    parent="ThemeOverlay.Material3.Dark.ActionBar">
-    <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
-    <item name="colorSecondary">@android:color/white</item>
-    <item name="android:homeAsUpIndicator">@drawable/ic_expand_more</item>
-  </style>
-
   <style name="MwmWidget.ListView" parent="android:Widget.Material.ListView">
     <item name="android:fadingEdge">none</item>
     <item name="android:divider">@color/divider</item>

android/app/src/main/res/values/themes-attrs.xml

@@ -6,7 +6,6 @@
     <attr name="textDialogTheme" format="reference" />
     <attr name="windowBackgroundForced" format="reference|color" />
     <attr name="cardBackground" format="reference" />
-    <attr name="appBackground" format="reference|color" />
     <attr name="clickableBackground" format="reference" />
     <attr name="statusBar" format="color" />
     <attr name="secondary" format="color" />

android/app/src/main/res/values/themes.xml

@@ -158,8 +158,6 @@
     <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
     <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
 
-    <item name="appBackground">@color/bg_app</item>
-
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>

data/countries_meta.txt

@@ -1,10 +1,4 @@
 {
-"World": {
- "languages": ["int_name", "en", "default"]
-},
-"WorldCoasts": {
- "languages": ["int_name", "en", "default"]
-},
 "Abkhazia": {
  "languages": ["ab", "ru"]
 },

data/taginfo.json

@@ -1,7 +1,7 @@
 {
     "data_format": 1,
     "data_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/taginfo.json",
-    "data_updated": "20251228T203737Z",
+    "data_updated": "20251120T121118Z",
     "project": {
         "name": "CoMaps",
         "description": "CoMaps is a community-focused privacy navigation iOS & Android app for travelers - drivers, hikers, and cyclists.",
@@ -176,7 +176,7 @@
             "description": "amenity=car_pooling",
             "key": "amenity",
             "value": "car_pooling",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking_pooling-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking-pooling-m.svg"
         },
         {
             "description": "amenity=car_rental",
@@ -431,12 +431,6 @@
             "value": "hunting_stand",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hunting-tower-m.svg"
         },
-        {
-            "description": "amenity=hydrant",
-            "key": "amenity",
-            "value": "hydrant",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hydrant-m.svg"
-        },
         {
             "description": "amenity=ice_cream",
             "key": "amenity",