[android] Simplify toolbar styles and themes

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

android/app/build.gradle

@@ -351,7 +351,6 @@ dependencies {
   implementation libs.androidx.recyclerview
   implementation libs.androidx.work.runtime
   implementation libs.androidx.lifecycle.process
-  implementation libs.androidx.documentfile
   implementation libs.android.material
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106

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/fragment_driving_options.xml

@@ -6,14 +6,7 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
+  <include layout="@layout/toolbar_default"/>
-    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>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"

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"
+            android:scaleType="center" />
-            tools:src="@drawable/ic_expand_more" />
 
         <RadioGroup
             android:id="@+id/route_type"

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

@@ -8,8 +8,7 @@
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="wrap_content" />
-    android:theme="@style/MwmWidget.ToolbarTheme.DownButton"/>
 
   <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/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/gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-androidGradlePlugin = "8.13.2"
+androidGradlePlugin = "8.11.2"
 androidxCarApp = "1.7.0"
 
 [libraries]
 android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
-triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.13.0" }
+triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.12.1" }
 huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" }
 android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
 microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" }
 androidx-core = { module = "androidx.core:core", version = "1.17.0" }
-jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.21" }
+jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.20" }
 androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
 androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" }
@@ -21,13 +21,12 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
 androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.5" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.4" }
 androidx-media = { module = "androidx.media:media", version = "1.7.1" }
-androidx-documentfile= { module = "androidx.documentfile:documentfile", version ="1.1.0" }
 android-material = { module = "com.google.android.material:material", version = "1.12.0" }
-google-guava = { module = "com.google.guava:guava", version = "33.5.0-android" }
+google-guava = { module = "com.google.guava:guava", version = "33.4.8-android" }
 appdevnext-androidchart = { module = "com.github.AppDevNext:AndroidChart", version = "3.1.0.31" }
 androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
 junit = { module = "junit:junit", version = "4.13.2" }
-mockito-core = { module = "org.mockito:mockito-core", version = "5.21.0" }
+mockito-core = { module = "org.mockito:mockito-core", version = "5.20.0" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

android/sdk/build.gradle

@@ -126,7 +126,6 @@ dependencies {
   implementation libs.androidx.recyclerview
   implementation libs.androidx.preference
   implementation libs.android.material
-  implementation libs.androidx.documentfile
 
   testImplementation libs.junit
 }

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",