[android] Refactored BookmarkCategoryAdapter and layout

[android] Implemented part of new bookmark category list design

android/res/layout/fragment_bookmark_categories.xml

@@ -1,53 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<android.support.v4.widget.NestedScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  style="@style/MwmWidget.FrameLayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <LinearLayout
+  <FrameLayout
+    style="@style/MwmWidget.FrameLayout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-    <com.mapswithme.maps.widget.BookmarkBackupView
-      android:id="@+id/backup"
+    android:layout_height="match_parent"
+    android:focusableInTouchMode="true">
+    <LinearLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
-    <include layout="@layout/recycler_default"/>
-  </LinearLayout>
-
-  <com.mapswithme.maps.widget.PlaceholderView
-    android:id="@+id/placeholder"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="@dimen/margin_double_and_half"
-    android:paddingRight="@dimen/margin_double_and_half"
-    android:paddingTop="@dimen/placeholder_margin_top"
-    android:visibility="gone"
-    tools:visibility="visible"/>
-
-  <LinearLayout
-    android:id="@+id/placeholder_loading"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/margin_double_and_half"
-    android:paddingRight="@dimen/margin_double_and_half"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:visibility="gone"
-    tools:visibility="visible">
-    <ProgressBar
-      style="@style/Widget.AppCompat.ProgressBar"
-      android:background="@null"
-      android:layout_gravity="center"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"/>
-    <TextView
-      android:gravity="center"
-      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:paddingTop="@dimen/margin_half"
-      android:textAppearance="@style/MwmTextAppearance.Body3"
-      android:text="@string/load_kmz_title"/>
-  </LinearLayout>
-</FrameLayout>
+      android:orientation="vertical">
+      <com.mapswithme.maps.widget.BookmarkBackupView
+        android:id="@+id/backup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?cardBackground"/>
+      <include
+        layout="@layout/recycler_default"
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/bookmark_recycler_view_bottom_margin"/>
+    </LinearLayout>
+    <com.mapswithme.maps.widget.PlaceholderView
+      android:id="@+id/placeholder"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:paddingLeft="@dimen/margin_double_and_half"
+      android:paddingRight="@dimen/margin_double_and_half"
+      android:paddingTop="@dimen/placeholder_margin_top"
+      android:visibility="gone"
+      tools:visibility="visible"/>
+    <LinearLayout
+      android:id="@+id/placeholder_loading"
+      android:orientation="vertical"
+      android:paddingLeft="@dimen/margin_double_and_half"
+      android:paddingRight="@dimen/margin_double_and_half"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:gravity="center"
+      android:visibility="gone"
+      tools:visibility="visible">
+      <ProgressBar
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:background="@null"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+      <TextView
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/margin_half"
+        android:textAppearance="@style/MwmTextAppearance.Body3"
+        android:text="@string/load_kmz_title"/>
+    </LinearLayout>
+  </FrameLayout>
+</android.support.v4.widget.NestedScrollView>

android/res/layout/item_bookmark_backup.xml

@@ -27,7 +27,6 @@
       android:gravity="start|center_vertical"
       android:text="@string/settings_backup_bookmarks"/>
   </LinearLayout>
-  <include layout="@layout/divider_horizontal"/>
   <LinearLayout
     android:id="@+id/content"
     android:layout_width="match_parent"

android/res/layout/item_bookmark_create_group.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="horizontal"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?selectableItemBackground"
+  android:paddingStart="@dimen/margin_base"
+  android:paddingLeft="@dimen/margin_base"
+  android:paddingEnd="@dimen/margin_base"
+  android:paddingRight="@dimen/margin_base"
+  android:paddingBottom="@dimen/margin_half_plus"
+  android:paddingTop="@dimen/margin_half_plus">
+  <ImageView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:src="@drawable/ic_checkbox_add"
+    android:tint="?colorAccent"/>
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/margin_half"
+    android:layout_marginStart="@dimen/margin_half"
+    android:layout_gravity="center_vertical"
+    android:textAppearance="@style/MwmTextAppearance.Body3"
+    android:textAllCaps="true"
+    android:text="@string/bookmarks_create_new_group"
+    android:textColor="?colorAccent"/>
+</LinearLayout>

android/res/layout/item_bookmark_hide_all.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="horizontal"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?windowBackgroundForced">
+  <TextView
+    android:layout_width="0dp"
+    android:layout_weight="1"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_marginStart="@dimen/margin_base"
+    android:textAppearance="@style/MwmTextAppearance.Body3"
+    android:text="@string/bookmarks_groups"/>
+  <TextView
+    android:id="@+id/hide_btn"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="@style/MwmTextAppearance.Body3"
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingStart="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingRight="@dimen/margin_base"
+    android:paddingTop="@dimen/bookmark_hide_btn_padding_top"
+    android:paddingBottom="@dimen/margin_half_double_plus"
+    android:textColor="?colorAccent"
+    android:textAllCaps="true"
+    android:background="?selectableItemBackground"
+    android:text="@string/bookmarks_groups_hide_all"/>
+</LinearLayout>

android/res/layout/item_bookmark_hint.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    android:id="@+id/tv__bookmarks_usage"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:paddingBottom="@dimen/margin_base"
-    android:paddingLeft="@dimen/margin_double_plus"
-    android:paddingRight="@dimen/margin_double_plus"
-    android:paddingTop="@dimen/margin_base"
-    android:textAppearance="@style/MwmTextAppearance.Body2"/>

android/res/layout/recycler_default.xml

@@ -4,4 +4,5 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:scrollbars="vertical"/>
+  android:background="?cardBackground"
+  android:scrollbars="vertical"/>

android/res/values/dimens.xml

@@ -236,4 +236,8 @@
   <dimen name="discovery_button_min_height">40dp</dimen>
   <dimen name="discovery_search_item_min_height">166dp</dimen>
   <dimen name="discovery_expert_item_min_height">198dp</dimen>
+
+  <!-- Bookmarks-->
+  <dimen name="bookmark_hide_btn_padding_top">22dp</dimen>
+  <dimen name="bookmark_recycler_view_bottom_margin">80dp</dimen>
 </resources>

android/res/values/themes.xml

@@ -32,6 +32,14 @@
     <item name="android:windowBackground">@color/bg_cards_night</item>
   </style>
 
+  <style name="MwmTheme.WindowBg">
+    <item name="android:windowBackground">@color/bg_window</item>
+  </style>
+
+  <style name="MwmTheme.Night.WindowBg">
+    <item name="android:windowBackground">@color/bg_window_night</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment" parent="android:Theme.Holo.Light.Dialog.NoActionBar">
     <item name="android:windowIsFloating">true</item>
     <item name="clickableBackground">?attr/selectableItemBackground</item>

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

@@ -28,7 +28,7 @@ public abstract class BaseBookmarkCategoryAdapter<V extends RecyclerView.ViewHol
     return BookmarkManager.INSTANCE.getCategoriesCount();
   }
 
-  public long getItem(int position)
+  public long getCategoryIdByPosition(int position)
   {
     return BookmarkManager.INSTANCE.getCategoryIdByPosition(position);
   }

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

@@ -13,7 +13,7 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity
   @StyleRes
   public int getThemeResourceId(@NonNull String theme)
   {
-    return ThemeUtils.getCardBgThemeResourceId(theme);
+    return ThemeUtils.getWindowBgThemeResourceId(theme);
   }
 
   @Override
@@ -21,4 +21,4 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity
   {
     return BookmarkCategoriesFragment.class;
   }
-}
+}

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

@@ -1,31 +1,32 @@
 package com.mapswithme.maps.bookmarks;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.widget.Toast;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.widget.recycler.RecyclerClickListener;
 import com.mapswithme.maps.widget.recycler.RecyclerLongClickListener;
-import com.mapswithme.util.Graphics;
-import com.mapswithme.util.UiUtils;
 
-public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<BookmarkCategoriesAdapter.ViewHolder>
+import static com.mapswithme.maps.bookmarks.Holders.CategoryViewHolder;
+
+public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<RecyclerView.ViewHolder>
 {
   private final static int TYPE_ITEM = 0;
-  private final static int TYPE_HELP = 1;
+  private final static int TYPE_ACTION_CREATE_GROUP = 1;
+  private final static int TYPE_ACTION_HIDE_ALL = 2;
   @Nullable
   private RecyclerLongClickListener mLongClickListener;
   @Nullable
   private RecyclerClickListener mClickListener;
+  @Nullable
+  private OnAddCategoryListener mOnAddCategoryListener;
 
   BookmarkCategoriesAdapter(@NonNull Context context)
   {
@@ -42,34 +43,53 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Bookm
     mLongClickListener = listener;
   }
 
-  @Override
-  public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
+  void setOnAddCategoryListener(@Nullable OnAddCategoryListener listener)
   {
-    View view;
-    if (viewType == TYPE_HELP)
+    mOnAddCategoryListener = listener;
+  }
+
+  @Override
+  public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
+  {
+    LayoutInflater inflater = LayoutInflater.from(getContext());
+    if (viewType == TYPE_ACTION_HIDE_ALL)
     {
-      TextView hintView = (TextView) LayoutInflater.from(getContext()).inflate(R.layout.item_bookmark_hint, parent, false);
-      if (getItemCount() > 1)
-        hintView.setText(R.string.bookmarks_usage_hint_import_only);
-
-      view = hintView;
+      View hideAllView = inflater.inflate(R.layout.item_bookmark_hide_all, parent, false);
+      hideAllView.findViewById(R.id.hide_btn).setOnClickListener
+          (v ->
+           {
+             Toast.makeText(getContext(), "Coming soon", Toast.LENGTH_SHORT).show();
+           });
+      return new Holders.GeneralViewHolder(hideAllView);
     }
-    else
-      view = LayoutInflater.from(getContext()).inflate(R.layout.item_bookmark_category, parent, false);
 
-    final ViewHolder holder = new ViewHolder(view, viewType);
+    if (viewType == TYPE_ACTION_CREATE_GROUP)
+    {
+      View createListView = inflater.inflate(R.layout.item_bookmark_create_group, parent, false);
+      createListView.setOnClickListener
+          (v ->
+           {
+             if (mOnAddCategoryListener != null)
+               mOnAddCategoryListener.onAddCategory();
+           });
+      return new Holders.GeneralViewHolder(createListView);
+    }
+
+    View view = LayoutInflater.from(getContext()).inflate(R.layout.item_bookmark_category,
+                                                          parent, false);
+    final CategoryViewHolder holder = new CategoryViewHolder(view);
     view.setOnClickListener(
         v ->
         {
           if (mClickListener != null)
-            mClickListener.onItemClick(v, holder.getAdapterPosition());
+            mClickListener.onItemClick(v, holder.getAdapterPosition() - 1);
         });
     view.setOnLongClickListener(
         v ->
         {
           if (mLongClickListener != null)
             mLongClickListener.onLongItemClick(v, holder
-                .getAdapterPosition());
+                .getAdapterPosition() - 1);
           return true;
         });
 
@@ -77,75 +97,49 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Bookm
   }
 
   @Override
-  public void onBindViewHolder(final ViewHolder holder, final int position)
+  public void onBindViewHolder(final RecyclerView.ViewHolder holder, final int position)
   {
-    if (getItemViewType(position) == TYPE_HELP)
+    int type = getItemViewType(position);
+    if (type == TYPE_ACTION_CREATE_GROUP || type == TYPE_ACTION_HIDE_ALL)
       return;
 
+    CategoryViewHolder categoryHolder = (CategoryViewHolder) holder;
     final BookmarkManager bmManager = BookmarkManager.INSTANCE;
-    final long catId = getItem(position);
-    holder.name.setText(bmManager.getCategoryName(catId));
-    holder.size.setText(String.valueOf(bmManager.getCategorySize(catId)));
-    holder.setVisibilityState(bmManager.isVisible(catId));
-    holder.visibilityMarker.setOnClickListener(
+    final long catId = getCategoryIdByPosition(position - 1);
+    categoryHolder.setName(bmManager.getCategoryName(catId));
+    categoryHolder.setSize(bmManager.getCategorySize(catId));
+    categoryHolder.setVisibilityState(bmManager.isVisible(catId));
+    categoryHolder.setVisibilityListener(
         v ->
         {
           BookmarkManager.INSTANCE.toggleCategoryVisibility(catId);
-          holder.setVisibilityState(bmManager.isVisible(catId));
+          categoryHolder.setVisibilityState(bmManager.isVisible(catId));
         });
   }
 
   @Override
   public int getItemViewType(int position)
   {
-    return (position == getItemCount() - 1) ? TYPE_HELP : TYPE_ITEM;
+    if (position == 0)
+      return TYPE_ACTION_HIDE_ALL;
+    return (position == getItemCount() - 1) ? TYPE_ACTION_CREATE_GROUP : TYPE_ITEM;
+  }
+
+  @Override
+  public long getCategoryIdByPosition(int position)
+  {
+    return super.getCategoryIdByPosition(position);
   }
 
   @Override
   public int getItemCount()
   {
     int count = super.getItemCount();
-    return count > 0 ? count + 1 : 0;
+    return count > 0 ? count + 2 /* header + add category btn */ : 0;
   }
 
-  static class ViewHolder extends RecyclerView.ViewHolder
+  interface OnAddCategoryListener
   {
-    TextView name;
-    ImageView visibilityMarker;
-    TextView size;
-
-    public ViewHolder(View root, int viewType)
-    {
-      super(root);
-
-      if (viewType == TYPE_HELP)
-      {
-        root.setEnabled(false);
-        return;
-      }
-
-      name = root.findViewById(R.id.tv__set_name);
-      visibilityMarker = root.findViewById(R.id.iv__set_visible);
-      size = root.findViewById(R.id.tv__set_size);
-    }
-
-    void setVisibilityState(boolean visible)
-    {
-      Drawable drawable;
-      if (visible)
-      {
-        visibilityMarker.setBackgroundResource(UiUtils.getStyledResourceId(
-            visibilityMarker.getContext(), R.attr.activeIconBackground));
-        drawable = Graphics.tint(visibilityMarker.getContext(), R.drawable.ic_bookmark_show, R.attr.activeIconTint);
-      }
-      else
-      {
-        visibilityMarker.setBackgroundResource(UiUtils.getStyledResourceId(
-            visibilityMarker.getContext(), R.attr.steadyIconBackground));
-        drawable = Graphics.tint(visibilityMarker.getContext(), R.drawable.ic_bookmark_hide,
-                                 R.attr.steadyIconTint);
-      }
-      visibilityMarker.setImageDrawable(drawable);
-    }
+    void onAddCategory();
   }
 }

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

@@ -9,6 +9,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.auth.Authorizer;
@@ -28,7 +29,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
                MenuItem.OnMenuItemClickListener,
                RecyclerClickListener,
                RecyclerLongClickListener,
-               BookmarkManager.BookmarksLoadingListener
+               BookmarkManager.BookmarksLoadingListener,
+               BookmarkCategoriesAdapter.OnAddCategoryListener
 {
   private long mSelectedCatId;
   @Nullable
@@ -70,6 +72,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
     {
       getAdapter().setOnClickListener(this);
       getAdapter().setOnLongClickListener(this);
+      getAdapter().setOnAddCategoryListener(this);
       getAdapter().registerAdapterDataObserver(new RecyclerView.AdapterDataObserver()
       {
         @Override
@@ -79,6 +82,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
         }
       });
     }
+
+    getRecyclerView().setNestedScrollingEnabled(false);
   }
 
   private void updateResultsPlaceholder()
@@ -234,6 +239,12 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
     // Do nothing here.
   }
 
+  @Override
+  public void onAddCategory()
+  {
+    Toast.makeText(getContext(), "Coming soon", Toast.LENGTH_LONG).show();
+  }
+
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data)
   {

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

@@ -73,7 +73,7 @@ public class ChooseBookmarkCategoryAdapter extends BaseBookmarkCategoryAdapter<C
   {
     if (holder.getItemViewType() == VIEW_TYPE_CATEGORY)
     {
-      holder.name.setText(BookmarkManager.INSTANCE.getCategoryName(getItem(position)));
+      holder.name.setText(BookmarkManager.INSTANCE.getCategoryName(getCategoryIdByPosition(position)));
       holder.checked.setChecked(mCheckedPosition == position);
     }
   }

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

@@ -0,0 +1,77 @@
+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.TextView;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.util.Graphics;
+import com.mapswithme.util.UiUtils;
+
+public class Holders
+{
+  static class GeneralViewHolder extends RecyclerView.ViewHolder
+  {
+
+    GeneralViewHolder(@NonNull View itemView)
+    {
+      super(itemView);
+    }
+  }
+
+  static class CategoryViewHolder extends RecyclerView.ViewHolder
+  {
+    @NonNull
+    private final TextView mName;
+    @NonNull
+    ImageView mVisibilityMarker;
+    TextView mSize;
+
+    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);
+    }
+
+    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);
+    }
+
+    void setVisibilityListener(@Nullable View.OnClickListener listener)
+    {
+      mVisibilityMarker.setOnClickListener(listener);
+    }
+
+    void setName(@NonNull String name)
+    {
+      mName.setText(name);
+    }
+
+    void setSize(int size)
+    {
+      mSize.setText(String.valueOf(size));
+    }
+  }
+}

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

@@ -104,4 +104,16 @@ public final class ThemeUtils
 
     throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
   }
+
+  @StyleRes
+  public static int getWindowBgThemeResourceId(@NonNull String theme)
+  {
+    if (isDefaultTheme(theme))
+      return R.style.MwmTheme_WindowBg;
+
+    if (isNightTheme(theme))
+      return R.style.MwmTheme_Night_WindowBg;
+
+    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+  }
 }