From e12cf282668cf42260576849fde928265983a23e Mon Sep 17 00:00:00 2001
From: HuanChengFly <609486518@qq.com>
Date: Sat, 12 Jun 2021 22:24:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=B4=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=82=AC=E6=B5=AE=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/activities/ForumActivity.kt    | 38 +++++++++++++++----
 .../tieba/post/utils/AppPreferencesUtils.kt   |  2 +
 .../drawable/ic_round_vertical_align_top.xml  | 10 +++++
 app/src/main/res/values/arrays.xml            | 12 ++++++
 app/src/main/res/values/strings.xml           |  4 ++
 app/src/main/res/xml/preferences.xml          |  7 ++++
 6 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_round_vertical_align_top.xml

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumActivity.kt
index dadfe5e7..a1b06e80 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumActivity.kt
@@ -291,14 +291,24 @@ class ForumActivity : BaseActivity(), View.OnClickListener, OnRefreshedListener,
             }
         }
         refreshHeaderView()
-        fab.hide()
-        fab.supportImageTintList = ColorStateList.valueOf(resources.getColor(R.color.white))
         setSupportActionBar(toolbar)
         val actionBar = supportActionBar
         actionBar?.setDisplayHomeAsUpEnabled(true)
         button.setOnClickListener(this)
         toolbar.setOnClickListener(this)
         toolbarEndBtn.setOnClickListener(this)
+        fab.hide()
+        fab.supportImageTintList = ColorStateList.valueOf(resources.getColor(R.color.white))
+        fab.setImageResource(when (appPreferences.forumFabFunction) {
+            "refresh" -> R.drawable.ic_round_refresh
+            "back_to_top" -> R.drawable.ic_round_vertical_align_top
+            else -> R.drawable.ic_round_create
+        })
+        fab.contentDescription = getString(when (appPreferences.forumFabFunction) {
+            "refresh" -> R.string.btn_refresh
+            "back_to_top" -> R.string.btn_back_to_top
+            else -> R.string.btn_post
+        })
         fab.setOnClickListener(this)
     }
 
@@ -379,11 +389,25 @@ class ForumActivity : BaseActivity(), View.OnClickListener, OnRefreshedListener,
                 if (mDataBean == null) {
                     return
                 }
-                if ("0" != mDataBean!!.anti?.ifPost) {
-                    NavigationHelper.newInstance(this).navigationByData(NavigationHelper.ACTION_THREAD_POST, forumName)
-                } else {
-                    if (!TextUtils.isEmpty(mDataBean!!.anti?.forbidInfo)) {
-                        Toast.makeText(this, mDataBean!!.anti?.forbidInfo, Toast.LENGTH_SHORT).show()
+                when (appPreferences.forumFabFunction) {
+                    "refresh" -> {
+                        refresh()
+                    }
+                    "back_to_top" -> {
+                        mAdapter?.currentFragment?.apply {
+                            if (this is ScrollTopable) {
+                                scrollToTop()
+                            }
+                        }
+                    }
+                    else -> {
+                        if ("0" != mDataBean!!.anti?.ifPost) {
+                            NavigationHelper.newInstance(this).navigationByData(NavigationHelper.ACTION_THREAD_POST, forumName)
+                        } else {
+                            if (!TextUtils.isEmpty(mDataBean!!.anti?.forbidInfo)) {
+                                Toast.makeText(this, mDataBean!!.anti?.forbidInfo, Toast.LENGTH_SHORT).show()
+                            }
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt
index 0818b798..06aed6e7 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt
@@ -30,6 +30,8 @@ open class AppPreferencesUtils(context: Context) {
 
     var followSystemNight by SharedPreferenceDelegates.boolean(defaultValue = true, key = "follow_system_night")
 
+    var forumFabFunction by SharedPreferenceDelegates.string(defaultValue = "post")
+
     var hideExplore by SharedPreferenceDelegates.boolean(defaultValue = false)
 
     var hideHotMessageList by SharedPreferenceDelegates.boolean(defaultValue = false)
diff --git a/app/src/main/res/drawable/ic_round_vertical_align_top.xml b/app/src/main/res/drawable/ic_round_vertical_align_top.xml
new file mode 100644
index 00000000..a2cd9af1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_vertical_align_top.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.21,11H11v9c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-9h1.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.79c-0.31,0.31 -0.09,0.85 0.36,0.85zM4,4c0,0.55 0.45,1 1,1h14c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-0.55,0 -1,0.45 -1,1z" />
+</vector>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 918a6633..7a4b9fb7 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -63,4 +63,16 @@
         <item>grey_dark</item>
         <item>amoled_dark</item>
     </string-array>
+
+    <string-array name="forum_fab_function_values">
+        <item>post</item>
+        <item>refresh</item>
+        <item>back_to_top</item>
+    </string-array>
+
+    <string-array name="forum_fab_function_name_values">
+        <item>@string/btn_post</item>
+        <item>@string/btn_refresh</item>
+        <item>@string/btn_back_to_top</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 529e7601..80386da0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -447,4 +447,8 @@
     <string name="text_oksign_no_signable">没有可签到的吧</string>
     <string name="title_forum_info">关于本吧</string>
     <string name="settings_list_items_background_intermixed">列表背景颜色交错效果</string>
+    <string name="settings_forum_fab_function">吧页面悬浮按钮功能</string>
+    <string name="btn_post">发贴</string>
+    <string name="btn_refresh">刷新</string>
+    <string name="btn_back_to_top">回到顶部</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 8f41c8ef..eff9e73b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -113,6 +113,13 @@
             android:key="hideHotMessageList"
             android:title="@string/title_hide_hot_message_list" />
 
+        <ListPreference
+            android:entryValues="@array/forum_fab_function_values"
+            android:entries="@array/forum_fab_function_name_values"
+            android:defaultValue="post"
+            android:key="forumFabFunction"
+            android:title="@string/settings_forum_fab_function" />
+
         <Preference
             android:enabled="false"
             android:layout="@layout/layout_preference_bottom" />