[android] Replaced 'eye' icon with checkbox in bookmark category item and refactored it

android/res/layout/item_bookmark_category.xml

@@ -1,47 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="?clickableBackground"
-  android:gravity="center_vertical"
-  android:minHeight="@dimen/height_item_oneline"
-  android:layout_marginTop="@dimen/margin_half"
-  android:paddingEnd="@dimen/margin_base"
-  android:paddingLeft="0dp"
-  android:paddingRight="@dimen/margin_base"
-  android:paddingStart="0dp">
-
-  <ImageView
-    android:id="@+id/iv__set_visible"
+  android:gravity="center_vertical">
+  <CheckBox
+    android:id="@+id/checkbox"
+    android:layout_centerVertical="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/margin_half"
-    android:layout_marginStart="@dimen/margin_half"
-    android:layout_weight="0"
-    android:background="?clickableBackground"
-    android:scaleType="center"
-    tools:src="@drawable/ic_bookmark_show"/>
-
+    android:minHeight="@dimen/height_item_edit_bookmark"
+    android:layout_marginLeft="@dimen/margin_half_plus"
+    android:layout_marginStart="@dimen/margin_half_plus"
+    android:layout_marginRight="@dimen/margin_base_plus"
+    android:layout_marginEnd="@dimen/margin_base_plus"/>
   <TextView
-    android:id="@+id/tv__set_name"
-    android:layout_width="match_parent"
+    android:id="@+id/name"
+    android:layout_toEndOf="@id/checkbox"
+    android:layout_toRightOf="@id/checkbox"
+    android:layout_toStartOf="@+id/more"
+    android:layout_toLeftOf="@id/more"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_weight="1"
-    android:ellipsize="marquee"
+    android:layout_marginTop="@dimen/margin_base"
+    android:ellipsize="end"
     android:singleLine="true"
     android:textAppearance="@style/MwmTextAppearance.Body1"
     tools:text="Bookmark name looooooooooooooooooongasdasdasd"/>
-
   <TextView
-    android:id="@+id/tv__set_size"
+    android:id="@+id/size"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_weight="0"
-    android:textAppearance="@style/MwmTextAppearance.Body2"
+    android:layout_below="@id/name"
+    android:layout_alignLeft="@id/name"
+    android:layout_alignStart="@id/name"
+    android:layout_alignEnd="@id/name"
+    android:layout_alignRight="@id/name"
+    android:layout_toStartOf="@+id/more"
+    android:layout_toLeftOf="@id/more"
+    android:layout_marginBottom="@dimen/margin_half_plus"
+    android:ellipsize="end"
+    android:singleLine="true"
+    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:minHeight="@dimen/height_item_edit_bookmark"
+    android:paddingRight="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingLeft="@dimen/margin_double"
+    android:paddingStart="@dimen/margin_double"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:src="@drawable/ic_more"
+    android:background="?selectableItemBackgroundBorderless"
+    android:tint="?secondary"/>
+</RelativeLayout>

android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java

@@ -115,6 +115,9 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
           BookmarkManager.INSTANCE.toggleCategoryVisibility(catId);
           categoryHolder.setVisibilityState(bmManager.isVisible(catId));
         });
+    categoryHolder.setMoreListener(v -> {
+      Toast.makeText(getContext(), "Coming soon", Toast.LENGTH_SHORT).show();
+    });
   }
 
   @Override

android/src/com/mapswithme/maps/bookmarks/Holders.java

@@ -1,16 +1,13 @@
 package com.mapswithme.maps.bookmarks;
 
-import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.SearchView;
+import android.widget.CheckBox;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
-import com.mapswithme.util.Graphics;
 import com.mapswithme.util.UiUtils;
 
 public class Holders
@@ -29,34 +26,27 @@ public class Holders
     @NonNull
     private final TextView mName;
     @NonNull
-    ImageView mVisibilityMarker;
+    CheckBox mVisibilityMarker;
+    @NonNull
     TextView mSize;
+    @NonNull
+    View mMore;
 
     CategoryViewHolder(@NonNull View root)
     {
       super(root);
-      mName = root.findViewById(R.id.tv__set_name);
-      mVisibilityMarker = root.findViewById(R.id.iv__set_visible);
-      mSize = root.findViewById(R.id.tv__set_size);
+      mName = root.findViewById(R.id.name);
+      mVisibilityMarker = root.findViewById(R.id.checkbox);
+      int left = root.getResources().getDimensionPixelOffset(R.dimen.margin_half_plus);
+      int right = root.getResources().getDimensionPixelOffset(R.dimen.margin_base_plus);
+      UiUtils.expandTouchAreaForView(mVisibilityMarker, 0, left, 0, right);
+      mSize = root.findViewById(R.id.size);
+      mMore = root.findViewById(R.id.more);
     }
 
     void setVisibilityState(boolean visible)
     {
-      Drawable drawable;
-      if (visible)
-      {
-        mVisibilityMarker.setBackgroundResource(UiUtils.getStyledResourceId(
-            mVisibilityMarker.getContext(), R.attr.activeIconBackground));
-        drawable = Graphics.tint(mVisibilityMarker.getContext(), R.drawable.ic_bookmark_show, R.attr.activeIconTint);
-      }
-      else
-      {
-        mVisibilityMarker.setBackgroundResource(UiUtils.getStyledResourceId(
-            mVisibilityMarker.getContext(), R.attr.steadyIconBackground));
-        drawable = Graphics.tint(mVisibilityMarker.getContext(), R.drawable.ic_bookmark_hide,
-                                 R.attr.steadyIconTint);
-      }
-      mVisibilityMarker.setImageDrawable(drawable);
+      mVisibilityMarker.setChecked(visible);
     }
 
     void setVisibilityListener(@Nullable View.OnClickListener listener)
@@ -64,6 +54,11 @@ public class Holders
       mVisibilityMarker.setOnClickListener(listener);
     }
 
+    void setMoreListener(@Nullable View.OnClickListener listener)
+    {
+      mMore.setOnClickListener(listener);
+    }
+
     void setName(@NonNull String name)
     {
       mName.setText(name);

android/src/com/mapswithme/util/UiUtils.java

@@ -484,20 +484,32 @@ public final class UiUtils
   public static void expandTouchAreaForView(@NonNull final View view, final int extraArea)
   {
     final View parent = (View) view.getParent();
-    parent.post(new Runnable()
-    {
-      @Override
-      public void run()
-      {
-        Rect rect = new Rect();
-        view.getHitRect(rect);
-        rect.top -= extraArea;
-        rect.left -= extraArea;
-        rect.right += extraArea;
-        rect.bottom += extraArea;
-        parent.setTouchDelegate(new TouchDelegate(rect, view));
-      }
-    });
+    parent.post(() ->
+                {
+                  Rect rect = new Rect();
+                  view.getHitRect(rect);
+                  rect.top -= extraArea;
+                  rect.left -= extraArea;
+                  rect.right += extraArea;
+                  rect.bottom += extraArea;
+                  parent.setTouchDelegate(new TouchDelegate(rect, view));
+                });
+  }
+
+  public static void expandTouchAreaForView(@NonNull final View view, final int top, final int left,
+                                            final int bottom, final int right)
+  {
+    final View parent = (View) view.getParent();
+    parent.post(() ->
+                {
+                  Rect rect = new Rect();
+                  view.getHitRect(rect);
+                  rect.top -= top;
+                  rect.left -= left;
+                  rect.right += right;
+                  rect.bottom += bottom;
+                  parent.setTouchDelegate(new TouchDelegate(rect, view));
+                });
   }
 
   // utility class