From 1aa07e583dd2fd7af108d26bc2deb5f902ee7204 Mon Sep 17 00:00:00 2001
From: kavikhalique <kavikhalique3@gmail.com>
Date: Wed, 20 Nov 2024 17:13:43 +0530
Subject: [PATCH 1/2] increases touch area

Signed-off-by: kavikhalique <kavikhalique3@gmail.com>
Signed-off-by: Kavi Khalique <kavikhalique@Kavis-MacBook-Air.local>
---
 .../app/organicmaps/bookmarks/Holders.java    |  6 ++
 .../res/layout/item_bookmark_category.xml     | 66 ++++++++++++-------
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
index a5c0495189..912abe904e 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
@@ -273,6 +273,8 @@ public class Holders
     CheckBox mVisibilityMarker;
     @NonNull
     ImageView mMoreButton;
+    private final View mVisibilityContainer;
+    private final View mMoreContainer;
 
     CategoryViewHolder(@NonNull View root)
     {
@@ -280,6 +282,8 @@ public class Holders
       mName = root.findViewById(R.id.name);
       mVisibilityMarker = root.findViewById(R.id.checkbox);
       mMoreButton = root.findViewById(R.id.more);
+      mVisibilityContainer = root.findViewById(R.id.visibility_container);
+      mMoreContainer = root.findViewById(R.id.more_container);
     }
 
     void setVisibilityState(boolean visible)
@@ -290,11 +294,13 @@ public class Holders
     void setVisibilityListener(@Nullable View.OnClickListener listener)
     {
       mVisibilityMarker.setOnClickListener(listener);
+      mVisibilityContainer.setOnClickListener(listener);
     }
 
     void setMoreButtonClickListener(@Nullable View.OnClickListener listener)
     {
       mMoreButton.setOnClickListener(listener);
+      mMoreContainer.setOnClickListener(listener);
     }
 
     void setName(@NonNull String name)
diff --git a/android/app/src/main/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml
index ee8d743e65..546246bd78 100644
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -6,22 +6,33 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="@drawable/bg_clickable_card">
-  <CheckBox
-    android:id="@+id/checkbox"
-    android:layout_width="@dimen/margin_double_plus"
-    android:layout_height="match_parent"
-    android:layout_centerVertical="true"
-    android:layout_marginStart="@dimen/margin_quarter"
-    android:background="@null"
-    android:button="@drawable/button_visibility_centre_inset"
-    android:buttonTint="?accentColorSelector" />
+
+  <LinearLayout
+      android:id="@+id/visibility_container"
+      android:gravity="center_vertical"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_centerVertical="true">
+
+    <CheckBox
+        android:id="@+id/checkbox"
+        android:layout_width="@dimen/margin_double_plus"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/margin_half"
+        android:layout_marginTop="@dimen/margin_base"
+        android:layout_marginStart="6dp"
+        android:layout_marginBottom="18dp"
+        android:background="@null"
+        android:button="@drawable/button_visibility_centre_inset"
+        android:buttonTint="?accentColorSelector" />
+  </LinearLayout>
   <TextView
     android:id="@+id/name"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_base"
-    android:layout_toStartOf="@id/more"
-    android:layout_toEndOf="@id/checkbox"
+      android:layout_toStartOf="@id/more_container"
+      android:layout_toEndOf="@id/visibility_container"
     android:ellipsize="middle"
     android:singleLine="true"
     android:textAppearance="?fontBody1"
@@ -33,7 +44,7 @@
     android:layout_below="@id/name"
     android:layout_alignStart="@id/name"
     android:layout_marginBottom="@dimen/margin_half_plus"
-    android:layout_toStartOf="@id/more"
+      android:layout_toStartOf="@id/more_container"
     android:orientation="horizontal">
     <TextView
       android:id="@+id/size"
@@ -45,15 +56,24 @@
       android:textAppearance="@style/MwmTextAppearance.Body3"
       tools:text="42000000" />
   </LinearLayout>
-  <ImageView
-    android:id="@+id/more"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_alignParentEnd="true"
-    android:layout_centerVertical="true"
-    android:background="?selectableItemBackgroundBorderless"
-    android:importantForAccessibility="no"
-    android:paddingHorizontal="@dimen/margin_half"
-    app:srcCompat="@drawable/ic_more"
-    app:tint="?secondary" />
+
+  <LinearLayout
+      android:id="@+id/more_container"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_centerVertical="true">
+
+    <ImageView
+        android:id="@+id/more"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:layout_marginBottom="24dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:importantForAccessibility="no"
+        android:paddingHorizontal="@dimen/margin_half"
+        app:srcCompat="@drawable/ic_more"
+        app:tint="?secondary" />
+  </LinearLayout>
 </RelativeLayout>
-- 
2.45.3


From dafa698cd4bce40c56c64ec7428aebc6b08292b5 Mon Sep 17 00:00:00 2001
From: kavikhalique <kavikhalique3@gmail.com>
Date: Wed, 20 Nov 2024 22:57:14 +0530
Subject: [PATCH 2/2] expansion of buttons

Signed-off-by: kavikhalique <kavikhalique3@gmail.com>
---
 .../app/organicmaps/bookmarks/Holders.java    |  6 --
 .../res/layout/item_bookmark_category.xml     | 70 +++++++------------
 2 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
index 912abe904e..a5c0495189 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
@@ -273,8 +273,6 @@ public class Holders
     CheckBox mVisibilityMarker;
     @NonNull
     ImageView mMoreButton;
-    private final View mVisibilityContainer;
-    private final View mMoreContainer;
 
     CategoryViewHolder(@NonNull View root)
     {
@@ -282,8 +280,6 @@ public class Holders
       mName = root.findViewById(R.id.name);
       mVisibilityMarker = root.findViewById(R.id.checkbox);
       mMoreButton = root.findViewById(R.id.more);
-      mVisibilityContainer = root.findViewById(R.id.visibility_container);
-      mMoreContainer = root.findViewById(R.id.more_container);
     }
 
     void setVisibilityState(boolean visible)
@@ -294,13 +290,11 @@ public class Holders
     void setVisibilityListener(@Nullable View.OnClickListener listener)
     {
       mVisibilityMarker.setOnClickListener(listener);
-      mVisibilityContainer.setOnClickListener(listener);
     }
 
     void setMoreButtonClickListener(@Nullable View.OnClickListener listener)
     {
       mMoreButton.setOnClickListener(listener);
-      mMoreContainer.setOnClickListener(listener);
     }
 
     void setName(@NonNull String name)
diff --git a/android/app/src/main/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml
index 546246bd78..24bffb5f1d 100644
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -6,33 +6,24 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="@drawable/bg_clickable_card">
-
-  <LinearLayout
-      android:id="@+id/visibility_container"
-      android:gravity="center_vertical"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_centerVertical="true">
-
-    <CheckBox
-        android:id="@+id/checkbox"
-        android:layout_width="@dimen/margin_double_plus"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_half"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginStart="6dp"
-        android:layout_marginBottom="18dp"
-        android:background="@null"
-        android:button="@drawable/button_visibility_centre_inset"
-        android:buttonTint="?accentColorSelector" />
-  </LinearLayout>
+  <CheckBox
+    android:id="@+id/checkbox"
+    android:layout_width="@dimen/margin_double_plus"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:paddingHorizontal="8dp"
+    android:paddingTop="24dp"
+    android:paddingBottom="26dp"
+    android:background="@null"
+    android:button="@drawable/button_visibility_centre_inset"
+    android:buttonTint="?accentColorSelector" />
   <TextView
     android:id="@+id/name"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_base"
-      android:layout_toStartOf="@id/more_container"
-      android:layout_toEndOf="@id/visibility_container"
+    android:layout_toStartOf="@id/more"
+    android:layout_toEndOf="@id/checkbox"
     android:ellipsize="middle"
     android:singleLine="true"
     android:textAppearance="?fontBody1"
@@ -44,7 +35,7 @@
     android:layout_below="@id/name"
     android:layout_alignStart="@id/name"
     android:layout_marginBottom="@dimen/margin_half_plus"
-      android:layout_toStartOf="@id/more_container"
+    android:layout_toStartOf="@id/more"
     android:orientation="horizontal">
     <TextView
       android:id="@+id/size"
@@ -56,24 +47,17 @@
       android:textAppearance="@style/MwmTextAppearance.Body3"
       tools:text="42000000" />
   </LinearLayout>
-
-  <LinearLayout
-      android:id="@+id/more_container"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:layout_centerVertical="true">
-
-    <ImageView
-        android:id="@+id/more"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="22dp"
-        android:layout_marginBottom="24dp"
-        android:background="?selectableItemBackgroundBorderless"
-        android:importantForAccessibility="no"
-        android:paddingHorizontal="@dimen/margin_half"
-        app:srcCompat="@drawable/ic_more"
-        app:tint="?secondary" />
-  </LinearLayout>
+  <ImageView
+    android:id="@+id/more"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_centerVertical="true"
+    android:background="?selectableItemBackgroundBorderless"
+    android:importantForAccessibility="no"
+    android:paddingHorizontal="@dimen/margin_half"
+    android:paddingTop="22dp"
+    android:paddingBottom="24dp"
+    app:srcCompat="@drawable/ic_more"
+    app:tint="?secondary" />
 </RelativeLayout>
-- 
2.45.3