[editor] More types can be marked as vacant

Signed-off-by: map-per <map-per@gmx.de>

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(
-        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        ThemeUtils.getResource(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,7 +6,14 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <include layout="@layout/toolbar_default"/>
+  <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>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"

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

@@ -30,7 +30,8 @@
             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,7 +8,8 @@
     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,6 +17,7 @@
     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

@@ -0,0 +1,8 @@
+<?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,6 +148,11 @@
     <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>
@@ -159,6 +164,29 @@
     <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>

data/mapcss-mapping.csv

@@ -1361,7 +1361,7 @@ historic|memorial|plaque;[historic=memorial][memorial=plaque],[historic=memorial
 historic|castle|defensive;[historic=castle][castle_type=defensive];;name;int_name;1234;
 historic|castle|stately;[historic=castle][castle_type=stately];;name;int_name;1235;
 attraction|animal;1236;
-disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar];;;;1237;
+disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar],[disused:amenity=ice_cream],[disused:amenity=pharmacy],[disused:amenity=post_office],[disused:amenity=bank],[disused:amenity=bureau_de_change],[disused:amenity=car_rental],[disused:amenity=motorcycle_rental],[disused:amenity=casino],[disused:amenity=gambling],[disused:amenity=internet_cafe],[disused:craft=confectionery],[disused:craft=electronics_repair],[disused:craft=shoemaker],[disused:craft=tailor],[disused:craft=key_cutter],[disused:craft=locksmith],[disused:office=estate_agent],[disused:office=insurance];;;;1237;
 cuisine|regional;1238;
 cuisine|pizza;1239;
 cuisine|burger;1240;

libs/indexer/editable_map_object.cpp

@@ -104,6 +104,24 @@ bool EditableMapObject::CanMarkPlaceAsDisused() const
       "amenity-cafe",
       "amenity-pub",
       "amenity-bar",
+      "amenity-ice_cream",
+      "amenity-pharmacy",
+      "amenity-post_office",
+      "amenity-bank",
+      "amenity-bureau_de_change",
+      "amenity-car_rental",
+      "amenity-motorcycle_rental",
+      "amenity-casino",
+      "amenity-gambling",
+      "amenity-internet_cafe",
+      "craft-confectionery",
+      "craft-electronics_repair",
+      "raft-shoemaker",
+      "craft-tailor",
+      "craft-key_cutter",
+      "craft-locksmith",
+      "office-estate_agent",
+      "office-insurance",
   };
 
   for (auto const & typePrefix : typePrefixes)