From 2c23f03cc4121bc06c0f5c4e4d5ee35feb092098 Mon Sep 17 00:00:00 2001
From: leafwai <yeziwei@ghzhushou.com>
Date: Mon, 13 Dec 2021 19:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F=E5=8D=95?=
 =?UTF-8?q?=E5=B9=BF=E5=9C=BA=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/common/view/StackRecyclerView.kt   | 11 +------
 .../square/GameCollectionSquareFragment.kt    | 22 ++------------
 .../fragment_game_collection_square.xml       | 29 +++++++++----------
 3 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/gh/common/view/StackRecyclerView.kt b/app/src/main/java/com/gh/common/view/StackRecyclerView.kt
index d15b5aa20a..e4dfd41826 100644
--- a/app/src/main/java/com/gh/common/view/StackRecyclerView.kt
+++ b/app/src/main/java/com/gh/common/view/StackRecyclerView.kt
@@ -22,16 +22,7 @@ class StackRecyclerView : RecyclerView {
     )
 
     override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-        if (ev.action == MotionEvent.ACTION_DOWN) {
-            posX = ev.x
-            posY = ev.y
-        } else if (ev.action == MotionEvent.ACTION_MOVE) {
-            if (posY - ev.y > abs(posX - ev.x) || ev.y - posY > abs(posX - ev.x)) {
-                parent.requestDisallowInterceptTouchEvent(false)
-            } else {
-                parent.requestDisallowInterceptTouchEvent(true)
-            }
-        }
+        parent.requestDisallowInterceptTouchEvent(true)
         return super.dispatchTouchEvent(ev)
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
index 794faac6a2..7a652d6874 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
@@ -50,7 +50,6 @@ class GameCollectionSquareFragment : LazyListFragment<GamesCollectionEntity, Gam
     private var mForumName = ""
     private var mGameCollectionTitle = ""
     private var mGameCollectionId = ""
-    private var mIsOffset = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         mUseAlternativeLayout = arguments?.getBoolean(EntranceUtils.KEY_IS_HOME, false) ?: false
@@ -166,20 +165,18 @@ class GameCollectionSquareFragment : LazyListFragment<GamesCollectionEntity, Gam
         mDefaultBinding.collapsingToolbar.scrimShownAction = {
             DisplayUtils.setLightStatusBar(requireActivity(), it)
             if (it) {
-                setContainerOffset(false)
                 mDefaultBinding.titleTv.alpha = 1F
                 mDefaultBinding.titleTv.visibility = View.VISIBLE
                 mDefaultBinding.titleTv.setTextColor(R.color.black.toColor())
                 mDefaultBinding.toolbar.navigationIcon = R.drawable.ic_bar_back.toDrawable()
+                mDefaultBinding.tagFilterContainer.background = null
             } else {
-                setContainerOffset(true)
                 mDefaultBinding.titleTv.visibility = View.GONE
                 mDefaultBinding.toolbar.navigationIcon = R.drawable.ic_bar_back_light.toDrawable()
+                mDefaultBinding.tagFilterContainer.background = R.drawable.bg_game_collection_square.toDrawable()
             }
         }
 
-        setContainerOffset(true, 0)
-
         mDefaultBinding.titleTv.setOnClickListener {
             if (ClickUtils.isFastDoubleClick(mDefaultBinding.titleTv.id, 300)) {
                 scrollToTop()
@@ -237,21 +234,6 @@ class GameCollectionSquareFragment : LazyListFragment<GamesCollectionEntity, Gam
         mListRefresh?.setProgressViewOffset(false, 0, 118F.dip2px() + DisplayUtils.getStatusBarHeight(requireContext().resources))
     }
 
-    private fun setContainerOffset(offset: Boolean, dur: Long = 100) {
-        if (mIsOffset == offset) return
-        mDefaultBinding.container.startAnimation(
-            TranslateAnimation(
-                0F,
-                0F,
-                if (offset) 0F else -16F.dip2px().toFloat(),
-                if (offset) -16F.dip2px().toFloat() else 0F
-            ).apply {
-                duration = dur
-                fillAfter = true
-            })
-        mIsOffset = offset
-    }
-
     private fun initAlternativeLayout() {
         if (parentFragment is HomeSearchToolWrapperFragment) {
             val rootView = (parentFragment as HomeSearchToolWrapperFragment).view
diff --git a/app/src/main/res/layout/fragment_game_collection_square.xml b/app/src/main/res/layout/fragment_game_collection_square.xml
index f00500f96b..b9aea4011b 100644
--- a/app/src/main/res/layout/fragment_game_collection_square.xml
+++ b/app/src/main/res/layout/fragment_game_collection_square.xml
@@ -27,7 +27,7 @@
                 android:fitsSystemWindows="true"
                 app:contentScrim="@color/white"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                app:scrimAnimationDuration="200">
+                app:scrimAnimationDuration="0">
 
                 <ImageView
                     android:id="@+id/headIv"
@@ -71,22 +71,14 @@
 
             </com.gh.common.view.ScrimAwareCollapsingToolbarLayout>
 
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/bg_game_collection_square"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/tagFilterContainer"
-                android:layout_width="0dp"
-                android:layout_height="28dp"
-                android:layout_marginTop="18dp"
+                android:layout_width="match_parent"
+                android:layout_height="64dp"
+                android:background="@drawable/bg_game_collection_square"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
+                android:layout_marginTop="-16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -164,16 +156,23 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list_rv"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginTop="18dp"
                 android:overScrollMode="never"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tagFilterContainer" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <FrameLayout
                 android:id="@+id/skeletonPlaceholder"