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 @@
+
+
+
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 @@
- grey_dark
- amoled_dark
+
+
+ - post
+ - refresh
+ - back_to_top
+
+
+
+ - @string/btn_post
+ - @string/btn_refresh
+ - @string/btn_back_to_top
+
\ 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 @@
没有可签到的吧
关于本吧
列表背景颜色交错效果
+ 吧页面悬浮按钮功能
+ 发贴
+ 刷新
+ 回到顶部
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" />
+
+