From ef77314d7a45a2417e32ee141ed7d04595f1bac4 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Tue, 19 Aug 2025 20:53:31 +0200
Subject: [PATCH] [android] Move styles for button search frame components

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../res/layout-h400dp/map_buttons_search_frame.xml    | 10 +++++-----
 .../src/main/res/layout/map_buttons_search_frame.xml  | 10 +++++-----
 android/app/src/main/res/values/styles.xml            | 11 ++++++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml b/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml
index f730693c3..c81214477 100644
--- a/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml
+++ b/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml
@@ -20,7 +20,7 @@
     tools:visibility="visible">
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_fuel"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentTop="true"
       android:layout_centerHorizontal="true"
       android:layout_marginStart="@dimen/margin_half_plus"
@@ -29,14 +29,14 @@
       app:srcCompat="@drawable/ic_routing_fuel_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_parking"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_marginTop="@dimen/margin_base_plus"
       android:layout_toEndOf="@id/search_fuel"
       android:contentDescription="@string/category_parking"
       app:srcCompat="@drawable/ic_routing_parking_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_eat"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentEnd="true"
       android:layout_centerVertical="true"
       android:layout_marginEnd="@dimen/margin_half"
@@ -44,7 +44,7 @@
       app:srcCompat="@drawable/ic_routing_eat_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_food"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentBottom="true"
       android:layout_marginBottom="@dimen/margin_base_plus"
       android:layout_toEndOf="@id/search_fuel"
@@ -52,7 +52,7 @@
       app:srcCompat="@drawable/ic_routing_food_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_atm"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentBottom="true"
       android:layout_centerHorizontal="true"
       android:layout_marginStart="@dimen/margin_half_plus"
diff --git a/android/app/src/main/res/layout/map_buttons_search_frame.xml b/android/app/src/main/res/layout/map_buttons_search_frame.xml
index bb5b4a255..b2a4c10ee 100644
--- a/android/app/src/main/res/layout/map_buttons_search_frame.xml
+++ b/android/app/src/main/res/layout/map_buttons_search_frame.xml
@@ -21,35 +21,35 @@
     tools:visibility="visible">
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_fuel"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="50dp"
       android:contentDescription="@string/category_fuel"
       app:srcCompat="@drawable/ic_routing_fuel_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_parking"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_parking"
       app:srcCompat="@drawable/ic_routing_parking_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_eat"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_eat"
       app:srcCompat="@drawable/ic_routing_eat_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_food"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_shopping"
       app:srcCompat="@drawable/ic_routing_food_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_atm"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_atm"
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index ae6bc4e1d..a2af6c49f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -31,7 +31,16 @@
     <item name="maxImageSize">34dp</item>
   </style>
 
-  <style name="MwmWidget.MapButton.Search">
+  <style name="MwmWidget.Components.SearchWheel" parent="Theme.Material3.Dark">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:backgroundTint">?menuBackground</item>
+    <item name="elevation">0dp</item>
+    <item name="hoveredFocusedTranslationZ">0dp</item>
+    <item name="pressedTranslationZ">0dp</item>
+    <item name="android:tint">?iconTint</item>
+    <item name="maxImageSize">@dimen/map_button_icon_size</item>
+    <item name="borderWidth">0dp</item>
     <item name="fabCustomSize">38dp</item>
   </style>