From cac11a7831714ddc8b49dc3fdfae14f8b402ec36 Mon Sep 17 00:00:00 2001
From: HuanChengFly <609486518@qq.com>
Date: Thu, 18 Feb 2021 19:42:37 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96=E8=B4=B4=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=BB=98=E8=AE=A4=E5=BC=B9=E5=87=BA=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../threadmenu/MIUIThreadMenuFragment.kt      |  6 +-
 .../fragment_thread_menu_miui_style.xml       | 65 ++++++++++---------
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/MIUIThreadMenuFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/MIUIThreadMenuFragment.kt
index 55e31b7f..542373b0 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/MIUIThreadMenuFragment.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/MIUIThreadMenuFragment.kt
@@ -6,6 +6,7 @@ import butterknife.BindView
 import butterknife.OnClick
 import com.google.android.material.button.MaterialButton
 import com.huanchengfly.tieba.post.R
+import com.huanchengfly.tieba.post.dpToPx
 import com.huanchengfly.tieba.post.dpToPxFloat
 import com.huanchengfly.tieba.post.ui.animation.addMaskAnimation
 import com.huanchengfly.tieba.post.ui.animation.addZoomAnimation
@@ -75,6 +76,9 @@ class MIUIThreadMenuFragment(
     @BindView(R.id.thread_menu)
     lateinit var menuView: View
 
+    @BindView(R.id.thread_menu_jump_page)
+    lateinit var jumpPageItem: View
+
     @BindView(R.id.thread_menu_close)
     lateinit var closeBtn: MaterialButton
 
@@ -158,7 +162,7 @@ class MIUIThreadMenuFragment(
             View.GONE
         }
         menuView.post {
-            mBehavior.setPeekHeight(menuView.height + closeBtn.height, false)
+            mBehavior.setPeekHeight(((4 + 8 * 2 + 16 * 3 + 8).dpToPx() + seeLzItem.height * 2 + jumpPageItem.height * 2.5f).toInt(), false)
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_thread_menu_miui_style.xml b/app/src/main/res/layout/fragment_thread_menu_miui_style.xml
index a3f75172..61d1b0a7 100644
--- a/app/src/main/res/layout/fragment_thread_menu_miui_style.xml
+++ b/app/src/main/res/layout/fragment_thread_menu_miui_style.xml
@@ -206,35 +206,6 @@
             android:paddingBottom="8dp"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/thread_menu_report"
-                android:background="?selectableItemBackground"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:paddingTop="12dp"
-                android:paddingBottom="12dp"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.huanchengfly.tieba.post.widgets.theme.TintImageView
-                    android:layout_gravity="center_vertical"
-                    app:srcCompat="@drawable/ic_round_verified_user"
-                    app:tint="@color/default_color_text_secondary"
-                    android:layout_marginEnd="16dp"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp" />
-
-                <com.huanchengfly.tieba.post.widgets.theme.TintTextView
-                    android:text="@string/title_report"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    app:tint="@color/default_color_text_secondary"
-                    android:layout_gravity="center_vertical"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
             <LinearLayout
                 android:id="@+id/thread_menu_jump_page"
                 android:background="?selectableItemBackground"
@@ -264,6 +235,36 @@
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/thread_menu_share"
+                android:background="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.huanchengfly.tieba.post.widgets.theme.TintImageView
+                    android:layout_gravity="center_vertical"
+                    app:srcCompat="@drawable/ic_round_share_white"
+                    app:tint="@color/default_color_text_secondary"
+                    android:layout_marginEnd="16dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp" />
+
+                <com.huanchengfly.tieba.post.widgets.theme.TintTextView
+                    android:text="@string/title_share"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:tint="@color/default_color_text_secondary"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+
             <LinearLayout
                 android:id="@+id/thread_menu_copy_link"
                 android:background="?selectableItemBackground"
@@ -294,7 +295,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/thread_menu_share"
+                android:id="@+id/thread_menu_report"
                 android:background="?selectableItemBackground"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
@@ -306,14 +307,14 @@
 
                 <com.huanchengfly.tieba.post.widgets.theme.TintImageView
                     android:layout_gravity="center_vertical"
-                    app:srcCompat="@drawable/ic_round_share_white"
+                    app:srcCompat="@drawable/ic_round_verified_user"
                     app:tint="@color/default_color_text_secondary"
                     android:layout_marginEnd="16dp"
                     android:layout_width="24dp"
                     android:layout_height="24dp" />
 
                 <com.huanchengfly.tieba.post.widgets.theme.TintTextView
-                    android:text="@string/title_share"
+                    android:text="@string/title_report"
                     android:textSize="16sp"
                     android:textStyle="bold"
                     app:tint="@color/default_color_text_secondary"