From 42632befefd3f0b8e3901725a51c9a552add9c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Fri, 1 May 2020 20:10:14 +0300
Subject: [PATCH] [android] Extracted guides gallery snapping under the setting
 flag to disable it for wide screen

---
 android/res/layout/guides_discovery_item.xml  |   1 +
 android/res/values-w400dp/values.xml          |   4 +
 android/res/values/values.xml                 |   4 +
 .../placepage/GuidesGalleryViewRenderer.java  | 119 ++++++++++++------
 4 files changed, 88 insertions(+), 40 deletions(-)
 create mode 100644 android/res/values-w400dp/values.xml
 create mode 100644 android/res/values/values.xml

diff --git a/android/res/layout/guides_discovery_item.xml b/android/res/layout/guides_discovery_item.xml
index 7b0539e417..405c535d60 100644
--- a/android/res/layout/guides_discovery_item.xml
+++ b/android/res/layout/guides_discovery_item.xml
@@ -6,6 +6,7 @@
   android:layout_height="wrap_content"
   android:layout_width="wrap_content"
   android:stateListAnimator="@animator/pull_up_on_touch"
+  android:foreground="?selectableItemBackground"
   android:padding="@dimen/margin_eighth"
   android:clipToPadding="false">
   <RelativeLayout
diff --git a/android/res/values-w400dp/values.xml b/android/res/values-w400dp/values.xml
new file mode 100644
index 0000000000..c4b3724288
--- /dev/null
+++ b/android/res/values-w400dp/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="guides_gallery_enable_snapping">false</bool>
+</resources>
diff --git a/android/res/values/values.xml b/android/res/values/values.xml
new file mode 100644
index 0000000000..a5963811b3
--- /dev/null
+++ b/android/res/values/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="guides_gallery_enable_snapping">true</bool>
+</resources>
diff --git a/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java b/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java
index 4f92db29ba..013cc72ce3 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java
@@ -1,5 +1,6 @@
 package com.mapswithme.maps.widget.placepage;
 
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
@@ -25,17 +26,13 @@ import java.util.Objects;
 public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePageData>,
                                                   PlacePageStateObserver
 {
-  private static final String EXTRA_SNAP_VIEW_POSITION = "extra_snap_view_position";
+  private static final String EXTRA_ACTIVE_POSITION = "extra_active_position";
   @SuppressWarnings("NullableProblems")
   @NonNull
   private GuidesGallery mGallery;
   @SuppressWarnings("NullableProblems")
   @NonNull
   private RecyclerView mRecyclerView;
-  @SuppressWarnings("NullableProblems")
-  @NonNull
-  private SnapHelper mSnapHelper;
-  private int mSnapViewPosition;
   @Nullable
   private GuidesGallery.Item mActiveItem;
   @SuppressWarnings("NullableProblems")
@@ -43,7 +40,7 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
   private RecyclerView.SmoothScroller mSmoothScroller;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private RecyclerView.LayoutManager mLayoutManager;
+  private LinearLayoutManager mLayoutManager;
   @NonNull
   private final ItemSelectedListener<GuidesGallery.Item> mItemSelectedListener
       = new ItemSelectedListener<GuidesGallery.Item>()
@@ -51,13 +48,20 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
     @Override
     public void onItemSelected(@NonNull GuidesGallery.Item item, int position)
     {
-      if (position != mSnapViewPosition)
+      if (item == mActiveItem)
       {
-        smoothScrollToPosition(position);
+        Toast.makeText(mRecyclerView.getContext(), "Open catalog coming soon",
+                       Toast.LENGTH_SHORT).show();
         return;
       }
 
-      // if item is activated then open web catalog, otherwise - activate it.
+      if (isItemAtPositionCompletelyVisible(position))
+      {
+        setActiveGuide(position);
+        return;
+      }
+
+      smoothScrollToPosition(position);
     }
 
     @Override
@@ -75,12 +79,6 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
   @Nullable
   private GalleryAdapter mAdapter;
 
-  private void smoothScrollToPosition(int position)
-  {
-    mSmoothScroller.setTargetPosition(position);
-    mLayoutManager.startSmoothScroll(mSmoothScroller);
-  }
-
   @NonNull
   private final OnScrollListener mOnScrollListener = new OnScrollListener()
   {
@@ -89,31 +87,67 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
     {
       super.onScrollStateChanged(recyclerView, newState);
       if (newState == RecyclerView.SCROLL_STATE_IDLE)
-        setActiveGuide();
+      {
+        int activePosition;
+        int firstVisiblePosition = mLayoutManager.findFirstCompletelyVisibleItemPosition();
+        int lastVisiblePosition = mLayoutManager.findLastCompletelyVisibleItemPosition();
+        if (mTargetPosition != RecyclerView.NO_POSITION)
+        {
+          if (mTargetPosition == firstVisiblePosition)
+            activePosition = mTargetPosition;
+          else if (mTargetPosition == lastVisiblePosition)
+            activePosition = mTargetPosition;
+          else
+            activePosition = firstVisiblePosition;
+          mTargetPosition = RecyclerView.NO_POSITION;
+        }
+        else
+        {
+          activePosition = firstVisiblePosition != RecyclerView.NO_POSITION ? firstVisiblePosition
+                                                                            : lastVisiblePosition;
+        }
+
+        if (activePosition == RecyclerView.NO_POSITION)
+          return;
+
+        setActiveGuide(activePosition);
+      }
     }
   };
 
-  private void setActiveGuide()
+  private int mActivePosition = RecyclerView.NO_POSITION;
+  private int mTargetPosition = RecyclerView.NO_POSITION;
+
+  private void smoothScrollToPosition(int position)
   {
-    final int oldSnapViewPosition = mSnapViewPosition;
-    View snapView = mSnapHelper.findSnapView(mLayoutManager);
-    mSnapViewPosition = snapView == null ? 0 : mLayoutManager.getPosition(snapView);
-    GuidesGallery.Item item = mGallery.getItems().get(mSnapViewPosition);
-    if (oldSnapViewPosition == mSnapViewPosition)
-    {
-      if (mActiveItem == null)
-      {
-        mActiveItem = item;
-        mActiveItem.setActivated(true);
-        if (mAdapter != null)
-          mAdapter.notifyDataSetChanged();
-        return;
-      }
+    mSmoothScroller.setTargetPosition(position);
+    mTargetPosition = position;
+    mLayoutManager.startSmoothScroll(mSmoothScroller);
+  }
+
+  private boolean isItemAtPositionCompletelyVisible(int position)
+  {
+    int firstVisiblePosition = mLayoutManager.findFirstCompletelyVisibleItemPosition();
+    if (firstVisiblePosition == RecyclerView.NO_POSITION)
+      return false;
+
+    int lastVisiblePosition = mLayoutManager.findLastCompletelyVisibleItemPosition();
+    if (lastVisiblePosition == RecyclerView.NO_POSITION)
+      return false;
+
+    return position >= firstVisiblePosition && position <= lastVisiblePosition;
+  }
+
+  private void setActiveGuide(int position)
+  {
+    mActivePosition = position;
+    GuidesGallery.Item item = mGallery.getItems().get(position);
+    if (mActiveItem == item)
       return;
-    }
 
     if (mActiveItem != null)
       mActiveItem.setActivated(false);
+
     mActiveItem = item;
     mActiveItem.setActivated(true);
     if (mAdapter != null)
@@ -128,14 +162,14 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
                                                          GalleryPlacement.MAP);
     mRecyclerView.setAdapter(mAdapter);
     mActiveItem = null;
-    setActiveGuide();
+    setActiveGuide(0);
   }
 
   @Override
   public void onHide()
   {
     mActiveItem = null;
-    mSnapViewPosition = 0;
+    mActivePosition = 0;
     smoothScrollToPosition(0);
   }
 
@@ -150,8 +184,6 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
     mRecyclerView.addItemDecoration(
         ItemDecoratorFactory.createSponsoredGalleryDecorator(view.getContext(),
                                                              LinearLayoutManager.HORIZONTAL));
-    mSnapHelper = new LinearSnapHelper();
-    mSnapHelper.attachToRecyclerView(mRecyclerView);
     mRecyclerView.addOnScrollListener(mOnScrollListener);
     mSmoothScroller = new LinearSmoothScroller(mRecyclerView.getContext())
     {
@@ -161,6 +193,13 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
         return LinearSmoothScroller.SNAP_TO_ANY;
       }
     };
+
+    Resources res = mRecyclerView.getContext().getResources();
+    if (res.getBoolean(R.bool.guides_gallery_enable_snapping))
+    {
+      SnapHelper mSnapHelper = new LinearSnapHelper();
+      mSnapHelper.attachToRecyclerView(mRecyclerView);
+    }
   }
 
   @Override
@@ -173,7 +212,7 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
   public void onSave(@NonNull Bundle outState)
   {
     outState.putParcelable(PlacePageUtils.EXTRA_PLACE_PAGE_DATA, mGallery);
-    outState.putInt(EXTRA_SNAP_VIEW_POSITION, mSnapViewPosition);
+    outState.putInt(EXTRA_ACTIVE_POSITION, mActivePosition);
   }
 
   @Override
@@ -187,10 +226,10 @@ public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePag
     mAdapter = Factory.createGuidesAdapter(mGallery.getItems(), mItemSelectedListener,
                                            GalleryPlacement.MAP);
     mRecyclerView.setAdapter(mAdapter);
-    mSnapViewPosition = inState.getInt(EXTRA_SNAP_VIEW_POSITION);
+    mActivePosition = inState.getInt(EXTRA_ACTIVE_POSITION);
     mRecyclerView.post(() -> {
-      smoothScrollToPosition(mSnapViewPosition);
-      setActiveGuide();
+      smoothScrollToPosition(mActivePosition);
+      setActiveGuide(mActivePosition);
     });
   }