From 83566a310995faae7df945a710a4d10355f1d920 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sat, 7 Jan 2023 20:12:19 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E8=B4=B4=E5=AD=90=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/huanchengfly/tieba/post/App.kt   |   5 +
 .../threadmenu/ThreadMenuFragment.kt          |  68 ++-------
 .../main/res/drawable/ic_outline_delete.xml   |  10 ++
 app/src/main/res/drawable/ic_outline_face.xml |  10 ++
 .../main/res/drawable/ic_outline_report.xml   |  16 ++
 .../res/drawable/ic_outline_rocket_launch.xml |  10 ++
 .../main/res/drawable/ic_outline_share.xml    |  10 ++
 .../res/drawable/ic_round_arrow_circle_up.xml |  10 ++
 .../fragment_thread_menu_miui_style.xml       | 144 +++++++-----------
 app/src/main/res/values/colors.xml            |   9 +-
 10 files changed, 144 insertions(+), 148 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_outline_delete.xml
 create mode 100644 app/src/main/res/drawable/ic_outline_face.xml
 create mode 100644 app/src/main/res/drawable/ic_outline_report.xml
 create mode 100644 app/src/main/res/drawable/ic_outline_rocket_launch.xml
 create mode 100644 app/src/main/res/drawable/ic_outline_share.xml
 create mode 100644 app/src/main/res/drawable/ic_round_arrow_circle_up.xml

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/App.kt b/app/src/main/java/com/huanchengfly/tieba/post/App.kt
index 2605c2df..8367f742 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/App.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/App.kt
@@ -577,6 +577,11 @@ class App : Application(), IApp, IGetter, SketchFactory {
                     R.attr.colorOnAccent
                 )
 
+                R.color.default_color_chip -> return return getColorByAttr(
+                    context,
+                    R.attr.colorChip
+                )
+
                 R.color.default_color_background -> return getColorByAttr(
                     context,
                     R.attr.colorBg
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt
index 926140d4..06f40e76 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt
@@ -31,9 +31,6 @@ class ThreadMenuFragment(
     @BindView(R.id.thread_menu_see_lz_text)
     lateinit var seeLzText: TintTextView
 
-    @BindView(R.id.thread_menu_see_lz_status)
-    lateinit var seeLzStatus: TintTextView
-
     @BindView(R.id.thread_menu_collect)
     lateinit var collectItem: TintLinearLayout
 
@@ -43,9 +40,6 @@ class ThreadMenuFragment(
     @BindView(R.id.thread_menu_collect_text)
     lateinit var collectText: TintTextView
 
-    @BindView(R.id.thread_menu_collect_status)
-    lateinit var collectStatus: TintTextView
-
     @BindView(R.id.thread_menu_pure_read)
     lateinit var pureReadItem: TintLinearLayout
 
@@ -55,9 +49,6 @@ class ThreadMenuFragment(
     @BindView(R.id.thread_menu_pure_read_text)
     lateinit var pureReadText: TintTextView
 
-    @BindView(R.id.thread_menu_pure_read_status)
-    lateinit var pureReadStatus: TintTextView
-
     @BindView(R.id.thread_menu_sort)
     lateinit var sortItem: TintLinearLayout
 
@@ -67,9 +58,6 @@ class ThreadMenuFragment(
     @BindView(R.id.thread_menu_sort_text)
     lateinit var sortText: TintTextView
 
-    @BindView(R.id.thread_menu_sort_status)
-    lateinit var sortStatus: TintTextView
-
     @BindView(R.id.thread_menu_delete)
     lateinit var deleteMenuItem: View
 
@@ -85,63 +73,39 @@ class ThreadMenuFragment(
     override fun initView() {
         if (seeLz) {
             seeLzItem.setBackgroundTintResId(R.color.default_color_accent)
-            seeLzIcon.setTintListResId(R.color.default_color_card)
-            seeLzText.tintResId = R.color.default_color_card
-            seeLzStatus.tintResId = R.color.default_color_card
-            seeLzStatus.setText(R.string.title_on)
-            seeLzStatus.alpha = .75f
+            seeLzIcon.setTintListResId(R.color.default_color_background)
+            seeLzText.tintResId = R.color.default_color_background
         } else {
-            seeLzItem.setBackgroundTintResId(R.color.default_color_card)
-            seeLzIcon.setTintListResId(R.color.default_color_accent)
+            seeLzItem.setBackgroundTintResId(R.color.default_color_chip)
+            seeLzIcon.setTintListResId(R.color.default_color_text)
             seeLzText.tintResId = R.color.default_color_text
-            seeLzStatus.tintResId = R.color.default_color_text_secondary
-            seeLzStatus.setText(R.string.title_off)
-            seeLzStatus.alpha = 1f
         }
         if (collect) {
             collectItem.setBackgroundTintResId(R.color.default_color_accent)
-            collectIcon.setTintListResId(R.color.default_color_card)
-            collectText.tintResId = R.color.default_color_card
-            collectStatus.tintResId = R.color.default_color_card
-            collectStatus.setText(R.string.title_collected)
-            collectStatus.alpha = .75f
+            collectIcon.setTintListResId(R.color.default_color_background)
+            collectText.tintResId = R.color.default_color_background
         } else {
-            collectItem.setBackgroundTintResId(R.color.default_color_card)
-            collectIcon.setTintListResId(R.color.default_color_accent)
+            collectItem.setBackgroundTintResId(R.color.default_color_chip)
+            collectIcon.setTintListResId(R.color.default_color_text)
             collectText.tintResId = R.color.default_color_text
-            collectStatus.tintResId = R.color.default_color_text_secondary
-            collectStatus.setText(R.string.title_uncollected)
-            collectStatus.alpha = 1f
         }
         if (pureRead) {
             pureReadItem.setBackgroundTintResId(R.color.default_color_accent)
-            pureReadIcon.setTintListResId(R.color.default_color_card)
-            pureReadText.tintResId = R.color.default_color_card
-            pureReadStatus.tintResId = R.color.default_color_card
-            pureReadStatus.setText(R.string.title_on)
-            pureReadStatus.alpha = .75f
+            pureReadIcon.setTintListResId(R.color.default_color_background)
+            pureReadText.tintResId = R.color.default_color_background
         } else {
-            pureReadItem.setBackgroundTintResId(R.color.default_color_card)
-            pureReadIcon.setTintListResId(R.color.default_color_accent)
+            pureReadItem.setBackgroundTintResId(R.color.default_color_chip)
+            pureReadIcon.setTintListResId(R.color.default_color_text)
             pureReadText.tintResId = R.color.default_color_text
-            pureReadStatus.tintResId = R.color.default_color_text_secondary
-            pureReadStatus.setText(R.string.title_off)
-            pureReadStatus.alpha = 1f
         }
         if (sort) {
             sortItem.setBackgroundTintResId(R.color.default_color_accent)
-            sortIcon.setTintListResId(R.color.default_color_card)
-            sortText.tintResId = R.color.default_color_card
-            sortStatus.tintResId = R.color.default_color_card
-            sortStatus.setText(R.string.title_on)
-            sortStatus.alpha = .75f
+            sortIcon.setTintListResId(R.color.default_color_background)
+            sortText.tintResId = R.color.default_color_background
         } else {
-            sortItem.setBackgroundTintResId(R.color.default_color_card)
-            sortIcon.setTintListResId(R.color.default_color_accent)
+            sortItem.setBackgroundTintResId(R.color.default_color_chip)
+            sortIcon.setTintListResId(R.color.default_color_text)
             sortText.tintResId = R.color.default_color_text
-            sortStatus.tintResId = R.color.default_color_text_secondary
-            sortStatus.setText(R.string.title_off)
-            sortStatus.alpha = 1f
         }
         listOf(
             seeLzItem,
diff --git a/app/src/main/res/drawable/ic_outline_delete.xml b/app/src/main/res/drawable/ic_outline_delete.xml
new file mode 100644
index 00000000..3fd5ac0c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_delete.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_face.xml b/app/src/main/res/drawable/ic_outline_face.xml
new file mode 100644
index 00000000..379eff72
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_face.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10.25,13c0,0.69 -0.56,1.25 -1.25,1.25S7.75,13.69 7.75,13s0.56,-1.25 1.25,-1.25 1.25,0.56 1.25,1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM22,12c0,5.52 -4.48,10 -10,10S2,17.52 2,12 6.48,2 12,2s10,4.48 10,10zM10.66,4.12C12.06,6.44 14.6,8 17.5,8c0.46,0 0.91,-0.05 1.34,-0.12C17.44,5.56 14.9,4 12,4c-0.46,0 -0.91,0.05 -1.34,0.12zM4.42,9.47c1.71,-0.97 3.03,-2.55 3.66,-4.44C6.37,6 5.05,7.58 4.42,9.47zM20,12c0,-0.78 -0.12,-1.53 -0.33,-2.24 -0.7,0.15 -1.42,0.24 -2.17,0.24 -3.13,0 -5.92,-1.44 -7.76,-3.69C8.69,8.87 6.6,10.88 4,11.86c0.01,0.04 0,0.09 0,0.14 0,4.41 3.59,8 8,8s8,-3.59 8,-8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_report.xml b/app/src/main/res/drawable/ic_outline_report.xml
new file mode 100644
index 00000000..2c4ef16d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_report.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.73,3H8.27L3,8.27v7.46L8.27,21h7.46L21,15.73V8.27L15.73,3zM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5h5.8L19,9.1v5.8z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,7h2v7h-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_rocket_launch.xml b/app/src/main/res/drawable/ic_outline_rocket_launch.xml
new file mode 100644
index 00000000..7b43a0bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_rocket_launch.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,15c-0.83,0 -1.58,0.34 -2.12,0.88C2.7,17.06 2,22 2,22s4.94,-0.7 6.12,-1.88C8.66,19.58 9,18.83 9,18C9,16.34 7.66,15 6,15zM6.71,18.71c-0.28,0.28 -2.17,0.76 -2.17,0.76s0.47,-1.88 0.76,-2.17C5.47,17.11 5.72,17 6,17c0.55,0 1,0.45 1,1C7,18.28 6.89,18.53 6.71,18.71zM17.42,13.65L17.42,13.65c6.36,-6.36 4.24,-11.31 4.24,-11.31s-4.95,-2.12 -11.31,4.24l-2.49,-0.5C7.21,5.95 6.53,6.16 6.05,6.63L2,10.69l5,2.14L11.17,17l2.14,5l4.05,-4.05c0.47,-0.47 0.68,-1.15 0.55,-1.81L17.42,13.65zM7.41,10.83L5.5,10.01l1.97,-1.97l1.44,0.29C8.34,9.16 7.83,10.03 7.41,10.83zM13.99,18.5l-0.82,-1.91c0.8,-0.42 1.67,-0.93 2.49,-1.5l0.29,1.44L13.99,18.5zM16,12.24c-1.32,1.32 -3.38,2.4 -4.04,2.73l-2.93,-2.93c0.32,-0.65 1.4,-2.71 2.73,-4.04c4.68,-4.68 8.23,-3.99 8.23,-3.99S20.68,7.56 16,12.24zM15,11c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S13.9,11 15,11z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_share.xml b/app/src/main/res/drawable/ic_outline_share.xml
new file mode 100644
index 00000000..55b23b62
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_share.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_round_arrow_circle_up.xml b/app/src/main/res/drawable/ic_round_arrow_circle_up.xml
new file mode 100644
index 00000000..c246d553
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_arrow_circle_up.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20M12,22c5.52,0 10,-4.48 10,-10c0,-5.52 -4.48,-10 -10,-10C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22L12,22zM11,12l0,3c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1l0,-3h1.79c0.45,0 0.67,-0.54 0.35,-0.85l-2.79,-2.79c-0.2,-0.2 -0.51,-0.2 -0.71,0l-2.79,2.79C8.54,11.46 8.76,12 9.21,12H11z" />
+</vector>
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 1ac46f30..c06c49f3 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
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_top_radius_8dp"
-    app:backgroundTint="@color/default_color_window_background"
-    tools:backgroundTint="@color/default_color_window_background">
+    app:backgroundTint="@color/default_color_background"
+    tools:backgroundTint="@color/default_color_background">
 
     <LinearLayout
         android:id="@+id/thread_menu"
@@ -16,12 +16,12 @@
         android:orientation="vertical">
 
         <com.huanchengfly.tieba.post.ui.widgets.theme.TintView
-            android:layout_width="64dp"
+            android:layout_width="90dp"
             android:layout_height="4dp"
             android:layout_gravity="center_horizontal"
             android:layout_margin="8dp"
             android:background="@drawable/bg_radius_50dp"
-            app:backgroundTint="@color/default_color_on_toolbar_bar" />
+            app:backgroundTint="@color/default_color_divider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -30,61 +30,52 @@
             android:padding="16dp">
 
             <com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout
+                android:gravity="center"
                 android:id="@+id/thread_menu_see_lz"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_weight="1"
                 android:background="@drawable/bg_radius_10dp"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:padding="16dp"
-                app:backgroundTint="@color/default_color_card">
+                app:backgroundTint="@color/default_color_chip">
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintImageView
                     android:id="@+id/thread_menu_see_lz_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:layout_gravity="start|center_vertical"
-                    android:paddingLeft="-4dp"
-                    app:srcCompat="@drawable/ic_outline_account_circle"
+                    app:srcCompat="@drawable/ic_outline_face"
                     app:tint="@color/default_color_accent" />
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
                     android:id="@+id/thread_menu_see_lz_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="8dp"
                     android:text="@string/title_see_lz"
-                    android:textSize="17sp"
+                    android:textSize="15sp"
                     android:textStyle="bold"
                     app:tint="@color/default_color_text" />
-
-                <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
-                    android:id="@+id/thread_menu_see_lz_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/title_off"
-                    android:textSize="14sp"
-                    app:tint="@color/default_color_text_secondary" />
             </com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout>
 
             <com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout
+                android:gravity="center"
                 android:id="@+id/thread_menu_collect"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_weight="1"
                 android:background="@drawable/bg_radius_10dp"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:padding="16dp"
-                app:backgroundTint="@color/default_color_card">
+                app:backgroundTint="@color/default_color_chip">
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintImageView
                     android:id="@+id/thread_menu_collect_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:paddingStart="-8dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     app:srcCompat="@drawable/ic_round_star_outline"
                     app:tint="@color/default_color_accent" />
 
@@ -92,20 +83,11 @@
                     android:id="@+id/thread_menu_collect_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="8dp"
                     android:text="@string/title_collect"
-                    android:textSize="17sp"
+                    android:textSize="15sp"
                     android:textStyle="bold"
                     app:tint="@color/default_color_text" />
-
-                <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
-                    android:id="@+id/thread_menu_collect_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/title_uncollected"
-                    android:textSize="14sp"
-                    app:tint="@color/default_color_text_secondary" />
             </com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout>
         </LinearLayout>
 
@@ -118,20 +100,21 @@
             android:paddingBottom="16dp">
 
             <com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout
+                android:gravity="center"
                 android:id="@+id/thread_menu_pure_read"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_weight="1"
                 android:background="@drawable/bg_radius_10dp"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:padding="16dp"
-                app:backgroundTint="@color/default_color_card">
+                app:backgroundTint="@color/default_color_chip">
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintImageView
                     android:id="@+id/thread_menu_pure_read_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     app:srcCompat="@drawable/ic_outline_chrome_reader_mode"
                     app:tint="@color/default_color_accent" />
 
@@ -139,72 +122,49 @@
                     android:id="@+id/thread_menu_pure_read_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="8dp"
                     android:text="@string/title_pure_read"
-                    android:textSize="17sp"
+                    android:textSize="15sp"
                     android:textStyle="bold"
                     app:tint="@color/default_color_text" />
-
-                <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
-                    android:id="@+id/thread_menu_pure_read_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/title_off"
-                    android:textSize="14sp"
-                    app:tint="@color/default_color_text_secondary" />
             </com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout>
 
             <com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout
+                android:gravity="center"
                 android:id="@+id/thread_menu_sort"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_weight="1"
                 android:background="@drawable/bg_radius_10dp"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:padding="16dp"
-                app:backgroundTint="@color/default_color_card">
+                app:backgroundTint="@color/default_color_chip">
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintImageView
                     android:id="@+id/thread_menu_sort_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    app:srcCompat="@drawable/ic_round_airplay"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    app:srcCompat="@drawable/ic_round_arrow_circle_up"
                     app:tint="@color/default_color_accent" />
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
                     android:id="@+id/thread_menu_sort_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="8dp"
                     android:text="@string/title_sort"
-                    android:textSize="17sp"
+                    android:textSize="15sp"
                     android:textStyle="bold"
                     app:tint="@color/default_color_text" />
-
-                <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
-                    android:id="@+id/thread_menu_sort_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/title_off"
-                    android:textSize="14sp"
-                    app:tint="@color/default_color_text_secondary" />
             </com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout>
         </LinearLayout>
 
-        <com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:background="@drawable/bg_radius_8dp"
-            android:orientation="vertical"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            app:backgroundTint="@color/default_color_card">
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/thread_menu_jump_page"
@@ -222,8 +182,8 @@
                     android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="16dp"
-                    app:srcCompat="@drawable/ic_round_live_tv"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:srcCompat="@drawable/ic_outline_rocket_launch"
+                    app:tint="@color/default_color_text" />
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
                     android:layout_width="wrap_content"
@@ -232,7 +192,7 @@
                     android:text="@string/title_jump_page"
                     android:textSize="16sp"
                     android:textStyle="bold"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:tint="@color/default_color_text" />
             </LinearLayout>
 
             <LinearLayout
@@ -251,8 +211,8 @@
                     android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="16dp"
-                    app:srcCompat="@drawable/ic_round_share_white"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:srcCompat="@drawable/ic_outline_share"
+                    app:tint="@color/default_color_text" />
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
                     android:layout_width="wrap_content"
@@ -261,7 +221,7 @@
                     android:text="@string/title_share"
                     android:textSize="16sp"
                     android:textStyle="bold"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:tint="@color/default_color_text" />
             </LinearLayout>
 
 
@@ -272,8 +232,8 @@
                 android:background="?selectableItemBackground"
                 android:orientation="horizontal"
                 android:paddingStart="16dp"
-                android:paddingTop="12dp"
                 android:paddingEnd="16dp"
+                android:paddingTop="12dp"
                 android:paddingBottom="12dp">
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintImageView
@@ -282,7 +242,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="16dp"
                     app:srcCompat="@drawable/ic_link"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:tint="@color/default_color_text" />
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
                     android:layout_width="wrap_content"
@@ -291,7 +251,7 @@
                     android:text="@string/title_copy_link"
                     android:textSize="16sp"
                     android:textStyle="bold"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:tint="@color/default_color_text" />
             </LinearLayout>
 
             <LinearLayout
@@ -310,8 +270,8 @@
                     android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="16dp"
-                    app:srcCompat="@drawable/ic_round_verified_user"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:srcCompat="@drawable/ic_outline_report"
+                    app:tint="@color/default_color_text" />
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
                     android:layout_width="wrap_content"
@@ -320,7 +280,7 @@
                     android:text="@string/title_report"
                     android:textSize="16sp"
                     android:textStyle="bold"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:tint="@color/default_color_text" />
             </LinearLayout>
 
             <LinearLayout
@@ -339,8 +299,8 @@
                     android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="16dp"
-                    app:srcCompat="@drawable/ic_round_delete"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:srcCompat="@drawable/ic_outline_delete"
+                    app:tint="@color/default_color_text" />
 
                 <com.huanchengfly.tieba.post.ui.widgets.theme.TintTextView
                     android:layout_width="wrap_content"
@@ -349,9 +309,9 @@
                     android:text="@string/title_delete"
                     android:textSize="16sp"
                     android:textStyle="bold"
-                    app:tint="@color/default_color_text_secondary" />
+                    app:tint="@color/default_color_text" />
             </LinearLayout>
-        </com.huanchengfly.tieba.post.ui.widgets.theme.TintLinearLayout>
+        </LinearLayout>
     </LinearLayout>
 
     <com.huanchengfly.tieba.post.ui.widgets.theme.TintMaterialButton
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 77a6f4dc..5fd330d3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -64,11 +64,12 @@
     <color name="default_color_window_background">#FFF3F7F9</color>
     <color name="default_color_nav">#FFFFFFFF</color>
     <color name="default_color_unselected">#FF6E7486</color>
-    <color name="default_color_floor_card">#FFF3F7F9</color>
+    <color name="default_color_floor_card">#FFF8F8F8</color>
     <color name="default_color_card">#FFFFFFFF</color>
     <color name="default_color_divider">#FFF7FBFE</color>
     <color name="default_color_shadow">#FEE9E9E9</color>
     <color name="default_color_swipe_refresh_view_background">#FFFFFFFF</color>
+    <color name="default_color_chip">#FFF8F8F8</color>
 
     <color name="theme_color_primary_white">@color/tieba</color>
     <color name="theme_color_primary_tieba">@color/tieba</color>
@@ -173,12 +174,12 @@
     <color name="theme_color_unselected_grey_dark">#FF808080</color>
     <color name="theme_color_unselected_amoled_dark">#FF808080</color>
 
-    <color name="theme_color_floor_card_light">#FFF3F7F9</color>
+    <color name="theme_color_floor_card_light">#FFF8F8F8</color>
     <color name="theme_color_floor_card_translucent_light">#15FFFFFF</color>
     <color name="theme_color_floor_card_translucent_dark">#2A000000</color>
     <color name="theme_color_floor_card_dark">#FF1A2A39</color>
-    <color name="theme_color_floor_card_grey_dark">#FF2A2A2A</color>
-    <color name="theme_color_floor_card_amoled_dark">#FF151515</color>
+    <color name="theme_color_floor_card_grey_dark">#FF1E1E1E</color>
+    <color name="theme_color_floor_card_amoled_dark">#FF1E1E1E</color>
 
     <color name="theme_color_card_light">#FFFFFFFF</color>
     <color name="theme_color_card_translucent_light">#10FFFFFF</color>