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 @@ 收藏贴自动开启只看楼主 开启后,从收藏进入的贴子将自动切换至只看楼主 从收藏进入的贴子将自动切换至只看楼主 + 收藏贴自动开启倒序浏览 + 开启后,从收藏进入的贴子将自动切换至倒序浏览 + 从收藏进入的贴子将自动切换至倒序浏览 更新了 %1$d 条动态 不感兴趣 不喜欢推荐用户的理由