From b5d65a0f784a3905c416615869cdcddd309bfadf Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 19 Oct 2025 20:49:30 +0200
Subject: [PATCH] [android] Improve edit bookmark button on the place page

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../organicmaps/widget/placepage/PlacePageView.java   |  2 +-
 .../placepage/sections/PlacePageBookmarkFragment.java |  2 --
 .../main/res/layout/place_page_bookmark_fragment.xml  | 10 ----------
 .../app/src/main/res/layout/place_page_preview.xml    | 11 ++++-------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 64a6c0d2e..46cf8439f 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -152,7 +152,7 @@ public class PlacePageView extends Fragment
   private View mEditTopSpace;
   private ShapeableImageView mColorIcon;
   private MaterialTextView mTvCategory;
-  private ShapeableImageView mEditBookmark;
+  private MaterialButton mEditBookmark;
 
   // Data
   private CoordinatesFormat mCoordsFormat = CoordinatesFormat.LatLonDecimal;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
index 157bcebc0..c6eb7dd9c 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -59,8 +59,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
     mFrame = view;
     mTvBookmarkNote = mFrame.findViewById(R.id.tv__bookmark_notes);
     mTvBookmarkNote.setOnLongClickListener(this);
-    final View editBookmarkBtn = mFrame.findViewById(R.id.tv__bookmark_edit);
-    editBookmarkBtn.setOnClickListener(this);
   }
 
   private void initWebView()
diff --git a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
index 62a4fd16d..58abc7138 100644
--- a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
@@ -18,16 +18,6 @@
     android:textAppearance="?android:attr/textAppearance"
     tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
 
-  <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/tv__bookmark_edit"
-      style="@style/PlacePageMetadataText.Button"
-      android:gravity="center"
-      android:layout_height="@dimen/height_block_base"
-      android:background="?clickableBackground"
-      android:paddingEnd="@dimen/margin_base"
-      android:paddingStart="@dimen/margin_base"
-      android:text="@string/placepage_edit_bookmark_button"/>
-
   <include
     layout="@layout/divider_horizontal"/>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 8952290e6..80377f98d 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -217,17 +217,14 @@
         android:background="?clickableBackground"
         android:textAllCaps="false"
         tools:text="@string/categories" />
-      <com.google.android.material.imageview.ShapeableImageView
+      <com.google.android.material.button.MaterialButton
         android:id="@+id/edit_Bookmark"
-        style="@style/MwmWidget.Editor.MetadataIcon"
+        style="@style/MwmWidget.M3.Button.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_margin="@dimen/margin_base"
-        android:background="?clickableBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_edit" />
+        android:text="@string/edit"
+        app:icon="@drawable/ic_edit" />
     </LinearLayout>
     <androidx.fragment.app.FragmentContainerView
       android:id="@+id/place_page_bookmark_fragment"