From 884218b50c117ffe09d2c5c090d7fcd2dac042b9 Mon Sep 17 00:00:00 2001
From: JiunnTarn <45126705+JiunnTarn@users.noreply.github.com>
Date: Wed, 4 Oct 2023 23:23:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=8E=E6=94=B6=E8=97=8F=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E5=B8=96=E5=AD=90=E8=87=AA=E5=8A=A8=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F=E9=98=85=E8=AF=BB=20[#73]=20(#217)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/settings/habit/HabitSettingsPage.kt  | 19 +++++++++++++++++++
 .../ui/page/threadstore/ThreadStorePage.kt    |  2 ++
 .../tieba/post/utils/AppPreferencesUtils.kt   |  5 +++++
 app/src/main/res/values/strings.xml           |  3 +++
 4 files changed, 29 insertions(+)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/habit/HabitSettingsPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/habit/HabitSettingsPage.kt
index e3d92abb..bcb71724 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/habit/HabitSettingsPage.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/habit/HabitSettingsPage.kt
@@ -15,6 +15,7 @@ import androidx.compose.material.icons.outlined.SecurityUpdateWarning
 import androidx.compose.material.icons.outlined.SpeakerNotesOff
 import androidx.compose.material.icons.outlined.StarOutline
 import androidx.compose.material.icons.outlined.Verified
+import androidx.compose.material.icons.rounded.Sort
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -225,6 +226,24 @@ fun HabitSettingsPage(
                     summaryOff = stringResource(id = R.string.tip_collect_thread_see_lz)
                 )
             }
+            prefsItem {
+                SwitchPref(
+                    key = "collect_thread_desc_sort",
+                    title = stringResource(id = R.string.settings_collect_thread_desc_sort),
+                    defaultChecked = false,
+                    leadingIcon = {
+                        LeadingIcon {
+                            AvatarIcon(
+                                icon = Icons.Rounded.Sort,
+                                size = Sizes.Small,
+                                contentDescription = null,
+                            )
+                        }
+                    },
+                    summaryOn = stringResource(id = R.string.tip_collect_thread_desc_sort_on),
+                    summaryOff = stringResource(id = R.string.tip_collect_thread_desc_sort)
+                )
+            }
             prefsItem {
                 SwitchPref(
                     key = "show_both_username_and_nickname",
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt
index 9b3f3ccb..efcf527f 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt
@@ -52,6 +52,7 @@ import com.huanchengfly.tieba.post.ui.common.theme.compose.pullRefreshIndicator
 import com.huanchengfly.tieba.post.ui.page.destinations.ThreadPageDestination
 import com.huanchengfly.tieba.post.ui.page.thread.ThreadPageFrom
 import com.huanchengfly.tieba.post.ui.page.thread.ThreadPageFromStoreExtra
+import com.huanchengfly.tieba.post.ui.page.thread.ThreadSortType
 import com.huanchengfly.tieba.post.ui.widgets.compose.Avatar
 import com.huanchengfly.tieba.post.ui.widgets.compose.BackNavigationIcon
 import com.huanchengfly.tieba.post.ui.widgets.compose.ErrorScreen
@@ -195,6 +196,7 @@ fun ThreadStorePage(
                                             threadId = info.threadId.toLong(),
                                             postId = info.markPid.toLong(),
                                             seeLz = context.appPreferences.collectThreadSeeLz,
+                                            sortType = if(context.appPreferences.collectThreadDescSort) ThreadSortType.SORT_TYPE_DESC else ThreadSortType.SORT_TYPE_DEFAULT,
                                             from = ThreadPageFrom.FROM_STORE,
                                             extra = ThreadPageFromStoreExtra(
                                                 maxPid = info.maxPid.toLong(),
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 05e65871..6b9531cf 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
@@ -77,6 +77,11 @@ open class AppPreferencesUtils private constructor(ctx: Context) {
         key = "collect_thread_see_lz"
     )
 
+    var collectThreadDescSort by DataStoreDelegates.boolean(
+        defaultValue = false,
+        key = "collect_thread_desc_sort"
+    )
+
     var customPrimaryColor by DataStoreDelegates.string(key = "custom_primary_color")
 
     var customStatusBarFontDark by DataStoreDelegates.boolean(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 165e5ffc..3f6a6abc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -259,6 +259,9 @@
     <string name="settings_collect_thread_see_lz">收藏贴自动开启只看楼主</string>
     <string name="tip_collect_thread_see_lz">开启后，从收藏进入的贴子将自动切换至只看楼主</string>
     <string name="tip_collect_thread_see_lz_on">从收藏进入的贴子将自动切换至只看楼主</string>
+    <string name="settings_collect_thread_desc_sort">收藏贴自动开启倒序浏览</string>
+    <string name="tip_collect_thread_desc_sort">开启后，从收藏进入的贴子将自动切换至倒序浏览</string>
+    <string name="tip_collect_thread_desc_sort_on">从收藏进入的贴子将自动切换至倒序浏览</string>
     <string name="toast_feed_refresh">更新了 %1$d 条动态</string>
     <string name="button_submit_dislike">不感兴趣</string>
     <string name="title_dislike">不喜欢推荐用户的理由</string>