Moving to a new preferences library. (#1451)

* Moving to a new preferences library. * Removing more = remember * Fix. * Small change --------- Co-authored-by: maarten.vercruysse <maarten.vercruysse@outlook.be>
LemmyNet · Mar 25, 2024 · f9d37c4 · f9d37c4
1 parent 82eb240
commit f9d37c4
Show file tree

Hide file tree

Showing 13 changed files with 714 additions and 661 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -109,7 +109,7 @@ android {
 
 dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.github.alorma:compose-settings-ui-m3:1.0.3")
+    implementation("me.zhanghai.compose.preference:library:1.0.0")
 
     implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.12")
 

diff --git a/app/src/main/java/com/jerboa/Utils.kt b/app/src/main/java/com/jerboa/Utils.kt
@@ -26,6 +26,7 @@ import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.annotation.RequiresApi
+import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.compose.foundation.lazy.LazyListState
@@ -734,15 +735,19 @@ fun Context.findActivity(): Activity? =
         else -> null
     }
 
-enum class ThemeMode(val mode: Int) {
+enum class ThemeMode(
+    @StringRes val resId: Int,
+) {
     System(R.string.look_and_feel_theme_system),
     SystemBlack(R.string.look_and_feel_theme_system_black),
     Light(R.string.look_and_feel_theme_light),
     Dark(R.string.look_and_feel_theme_dark),
     Black(R.string.look_and_feel_theme_black),
 }
 
-enum class ThemeColor(val mode: Int) {
+enum class ThemeColor(
+    @StringRes val resId: Int,
+) {
     Dynamic(R.string.look_and_feel_theme_color_dynamic),
     Beach(R.string.look_and_feel_theme_color_beach),
     Blue(R.string.look_and_feel_theme_color_blue),
@@ -755,7 +760,9 @@ enum class ThemeColor(val mode: Int) {
     Dracula(R.string.look_and_feel_theme_color_dracula),
 }
 
-enum class PostViewMode(val mode: Int) {
+enum class PostViewMode(
+    @StringRes val resId: Int,
+) {
     /**
      * The full size post view card. For image posts, this expands them to their full height. For
      * link posts, the thumbnail is shown to the right of the title.

diff --git a/app/src/main/java/com/jerboa/datatypes/Others.kt b/app/src/main/java/com/jerboa/datatypes/Others.kt
@@ -64,13 +64,13 @@ val SortType.data: SortData
         SortType.TopAll -> SortData(R.string.sorttype_topall, R.string.dialogs_top_all, Icons.Outlined.BarChart)
         SortType.MostComments -> SortData(
             R.string.sorttype_mostcomments,
-            R.string.sorttype_mostcomments,
+            R.string.sorttype_mostcomments_long,
             Icons.Outlined.FormatListNumbered,
         )
 
         SortType.NewComments -> SortData(
             R.string.sorttype_newcomments,
-            R.string.sorttype_newcomments,
+            R.string.sorttype_newcomments_long,
             Icons.Outlined.NewReleases,
         )
 

diff --git a/app/src/main/java/com/jerboa/feat/PostNavigationGestureMode.kt b/app/src/main/java/com/jerboa/feat/PostNavigationGestureMode.kt
@@ -1,8 +1,11 @@
 package com.jerboa.feat
 
+import androidx.annotation.StringRes
 import com.jerboa.R
 
-enum class PostNavigationGestureMode(val mode: Int) {
+enum class PostNavigationGestureMode(
+    @StringRes val resId: Int,
+) {
     /**
      * Disable all navigation gestures within posts.
      */

diff --git a/app/src/main/java/com/jerboa/feat/SwipeToAction.kt b/app/src/main/java/com/jerboa/feat/SwipeToAction.kt
@@ -1,5 +1,6 @@
 package com.jerboa.feat
 
+import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.Comment
 import androidx.compose.material.icons.outlined.Bookmark
@@ -71,7 +72,7 @@ data class ActionColor(
 enum class SwipeToActionPreset(
     val leftActions: List<SwipeToActionType>,
     val rightActions: List<SwipeToActionType>,
-    val resId: Int,
+    @StringRes val resId: Int,
 ) {
     Disabled(emptyList(), emptyList(), R.string.swipe_action_preset_disabled),
     TwoSides(

diff --git a/app/src/main/java/com/jerboa/ui/components/community/Community.kt b/app/src/main/java/com/jerboa/ui/components/community/Community.kt
@@ -297,7 +297,7 @@ fun CommunityMoreDropdown(
             children = {
                 PostViewMode.entries.map {
                     DropdownMenuItem(
-                        text = { Text(text = stringResource(it.mode)) },
+                        text = { Text(text = stringResource(it.resId)) },
                         onClick = {
                             onDismissRequest()
                             onClickPostViewMode(it)

diff --git a/app/src/main/java/com/jerboa/ui/components/home/Home.kt b/app/src/main/java/com/jerboa/ui/components/home/Home.kt
@@ -217,7 +217,7 @@ fun HomeMoreDropdown(
             children = {
                 PostViewMode.entries.map {
                     DropdownMenuItem(
-                        text = { Text(text = stringResource(it.mode)) },
+                        text = { Text(text = stringResource(it.resId)) },
                         onClick = {
                             onDismissRequest()
                             onClickPostViewMode(it)

diff --git a/app/src/main/java/com/jerboa/ui/components/settings/SettingsActivity.kt b/app/src/main/java/com/jerboa/ui/components/settings/SettingsActivity.kt
@@ -4,7 +4,6 @@ package com.jerboa.ui.components.settings
 
 import android.util.Log
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Info
@@ -19,14 +18,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.alorma.compose.settings.ui.SettingsMenuLink
 import com.jerboa.R
 import com.jerboa.db.entity.isAnon
 import com.jerboa.model.AccountViewModel
 import com.jerboa.ui.components.common.JerboaSnackbarHost
 import com.jerboa.ui.components.common.SimpleTopAppBar
 import com.jerboa.ui.components.common.getCurrentAccount
-import com.jerboa.ui.theme.SETTINGS_MENU_LINK_HEIGHT
+import me.zhanghai.compose.preference.Preference
+import me.zhanghai.compose.preference.ProvidePreferenceTheme
 
 @Composable
 fun SettingsActivity(
@@ -48,48 +47,48 @@ fun SettingsActivity(
         },
         content = { padding ->
             Column(modifier = Modifier.padding(padding)) {
-                SettingsMenuLink(
-                    modifier = Modifier.height(SETTINGS_MENU_LINK_HEIGHT),
-                    title = { Text(stringResource(R.string.settings_activity_look_and_feel)) },
-                    icon = {
-                        Icon(
-                            imageVector = Icons.Outlined.Palette,
-                            contentDescription = null,
-                        )
-                    },
-                    onClick = onClickLookAndFeel,
-                )
-                if (!account.isAnon()) {
-                    SettingsMenuLink(
-                        modifier = Modifier.height(SETTINGS_MENU_LINK_HEIGHT),
-                        title = {
-                            Text(
-                                stringResource(
-                                    R.string.settings_activity_account_settings,
-                                    account.name,
-                                ),
+                ProvidePreferenceTheme {
+                    Preference(
+                        title = { Text(stringResource(R.string.settings_activity_look_and_feel)) },
+                        icon = {
+                            Icon(
+                                imageVector = Icons.Outlined.Palette,
+                                contentDescription = null,
                             )
                         },
+                        onClick = onClickLookAndFeel,
+                    )
+
+                    if (!account.isAnon()) {
+                        Preference(
+                            title = {
+                                Text(
+                                    stringResource(
+                                        R.string.settings_activity_account_settings,
+                                        account.name,
+                                    ),
+                                )
+                            },
+                            icon = {
+                                Icon(
+                                    imageVector = Icons.Outlined.ManageAccounts,
+                                    contentDescription = null,
+                                )
+                            },
+                            onClick = onClickAccountSettings,
+                        )
+                    }
+                    Preference(
+                        title = { Text(stringResource(R.string.settings_activity_about)) },
                         icon = {
                             Icon(
-                                imageVector = Icons.Outlined.ManageAccounts,
+                                imageVector = Icons.Outlined.Info,
                                 contentDescription = null,
                             )
                         },
-                        onClick = onClickAccountSettings,
+                        onClick = onClickAbout,
                     )
                 }
-                SettingsMenuLink(
-                    modifier = Modifier.height(SETTINGS_MENU_LINK_HEIGHT),
-                    title = { Text(stringResource(R.string.settings_activity_about)) },
-                    icon = {
-                        Icon(
-                            imageVector = Icons.Outlined.Info,
-                            contentDescription = null,
-                        )
-                    },
-                    onClick = onClickAbout,
-                )
             }
         },
     )