Save listing and sort type-preferences in app DB #407

oscarnylander · 2023-06-04T18:15:49Z

Mostly fixes #399

These settings will still be incorrect if they change in the backend. It might be wise to simply fetch them from the backend and use that value, but this atleast partially solves the problem.

Some automatic formatting fixes also made it in.

app/src/main/java/com/jerboa/MainActivity.kt

oscarnylander · 2023-06-04T18:17:05Z

app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt

-    var bio by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue(luv?.person?.bio.orEmpty())) }
+    var bio by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(TextFieldValue(luv?.person?.bio.orEmpty()))
+    }
    var email by rememberSaveable { mutableStateOf(luv?.local_user?.email.orEmpty()) }
    var matrixUserId by rememberSaveable { mutableStateOf(luv?.person?.matrix_user_id.orEmpty()) }
    val theme by rememberSaveable { mutableStateOf(luv?.local_user?.theme.orEmpty()) }
-    val interfaceLang by rememberSaveable { mutableStateOf(luv?.local_user?.interface_language.orEmpty()) }
+    val interfaceLang by rememberSaveable {
+        mutableStateOf(luv?.local_user?.interface_language.orEmpty())
+    }
    var avatar by rememberSaveable { mutableStateOf(luv?.person?.avatar.orEmpty()) }
    var banner by rememberSaveable { mutableStateOf(luv?.person?.banner.orEmpty()) }
    var defaultSortType by rememberSaveable { mutableStateOf(luv?.local_user?.default_sort_type) }
-    var defaultListingType by rememberSaveable { mutableStateOf(luv?.local_user?.default_listing_type) }
+    var defaultListingType by rememberSaveable {
+        mutableStateOf(luv?.local_user?.default_listing_type)
+    }
    var showAvatars by rememberSaveable { mutableStateOf(luv?.local_user?.show_avatars) }
    var showNsfw by rememberSaveable { mutableStateOf(luv?.local_user?.show_nsfw ?: false) }
    var showScores by rememberSaveable { mutableStateOf(luv?.local_user?.show_scores) }
    var showBotAccount by rememberSaveable { mutableStateOf(luv?.local_user?.show_bot_accounts) }
    var botAccount by rememberSaveable { mutableStateOf(luv?.person?.bot_account) }
    var showReadPosts by rememberSaveable { mutableStateOf(luv?.local_user?.show_read_posts) }
-    var showNewPostNotifs by rememberSaveable { mutableStateOf(luv?.local_user?.show_new_post_notifs) }
-    var sendNotificationsToEmail by rememberSaveable { mutableStateOf(luv?.local_user?.send_notifications_to_email) }
+    var showNewPostNotifs by rememberSaveable {
+        mutableStateOf(luv?.local_user?.show_new_post_notifs)
+    }
+    var sendNotificationsToEmail by rememberSaveable {
+        mutableStateOf(luv?.local_user?.send_notifications_to_email)
+    }


These are auto-generated formatting fixes, but they can easily be omitted if desirable.

That's fine.

oscarnylander · 2023-06-04T18:17:26Z

app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettingsViewModel.kt

+class AccountSettingsViewModelFactory(
+    private val repository: AccountRepository
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(AccountSettingsViewModel::class.java)) {
+            @Suppress("UNCHECKED_CAST")
+            return AccountSettingsViewModel(repository) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }


This could be auto-generated by Hilt (#388)

dessalines

Looks good, thx!

dessalines · 2023-06-04T19:36:23Z

app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt

-    var bio by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue(luv?.person?.bio.orEmpty())) }
+    var bio by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(TextFieldValue(luv?.person?.bio.orEmpty()))
+    }
    var email by rememberSaveable { mutableStateOf(luv?.local_user?.email.orEmpty()) }
    var matrixUserId by rememberSaveable { mutableStateOf(luv?.person?.matrix_user_id.orEmpty()) }
    val theme by rememberSaveable { mutableStateOf(luv?.local_user?.theme.orEmpty()) }
-    val interfaceLang by rememberSaveable { mutableStateOf(luv?.local_user?.interface_language.orEmpty()) }
+    val interfaceLang by rememberSaveable {
+        mutableStateOf(luv?.local_user?.interface_language.orEmpty())
+    }
    var avatar by rememberSaveable { mutableStateOf(luv?.person?.avatar.orEmpty()) }
    var banner by rememberSaveable { mutableStateOf(luv?.person?.banner.orEmpty()) }
    var defaultSortType by rememberSaveable { mutableStateOf(luv?.local_user?.default_sort_type) }
-    var defaultListingType by rememberSaveable { mutableStateOf(luv?.local_user?.default_listing_type) }
+    var defaultListingType by rememberSaveable {
+        mutableStateOf(luv?.local_user?.default_listing_type)
+    }
    var showAvatars by rememberSaveable { mutableStateOf(luv?.local_user?.show_avatars) }
    var showNsfw by rememberSaveable { mutableStateOf(luv?.local_user?.show_nsfw ?: false) }
    var showScores by rememberSaveable { mutableStateOf(luv?.local_user?.show_scores) }
    var showBotAccount by rememberSaveable { mutableStateOf(luv?.local_user?.show_bot_accounts) }
    var botAccount by rememberSaveable { mutableStateOf(luv?.person?.bot_account) }
    var showReadPosts by rememberSaveable { mutableStateOf(luv?.local_user?.show_read_posts) }
-    var showNewPostNotifs by rememberSaveable { mutableStateOf(luv?.local_user?.show_new_post_notifs) }
-    var sendNotificationsToEmail by rememberSaveable { mutableStateOf(luv?.local_user?.send_notifications_to_email) }
+    var showNewPostNotifs by rememberSaveable {
+        mutableStateOf(luv?.local_user?.show_new_post_notifs)
+    }
+    var sendNotificationsToEmail by rememberSaveable {
+        mutableStateOf(luv?.local_user?.send_notifications_to_email)
+    }


That's fine.

dessalines · 2023-06-04T19:42:42Z

I'll handle the post ktlint merge, don't worry about that.

dessalines · 2023-06-04T19:45:23Z

As a later PR, those settings do come back withGetSite, so it could be updated from the back-end after that initial fetch when you start the app.

Save listing and sort type-preferences in app DB

6225fb9

Some automatic formatting fixes also made it in.

oscarnylander requested a review from dessalines as a code owner June 4, 2023 18:15

oscarnylander commented Jun 4, 2023

View reviewed changes

app/src/main/java/com/jerboa/MainActivity.kt Show resolved Hide resolved

oscarnylander commented Jun 4, 2023

View reviewed changes

dessalines approved these changes Jun 4, 2023

View reviewed changes

Merge branch 'main' into save-listing-and-sort-type-in-app-db

62da2b8

dessalines merged commit 3e1e968 into LemmyNet:main Jun 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Save listing and sort type-preferences in app DB #407

Save listing and sort type-preferences in app DB #407

oscarnylander commented Jun 4, 2023

oscarnylander Jun 4, 2023

dessalines Jun 4, 2023

oscarnylander Jun 4, 2023 •

edited

Loading

dessalines left a comment

dessalines Jun 4, 2023

dessalines commented Jun 4, 2023

dessalines commented Jun 4, 2023

Save listing and sort type-preferences in app DB #407

Save listing and sort type-preferences in app DB #407

Conversation

oscarnylander commented Jun 4, 2023

oscarnylander Jun 4, 2023

Choose a reason for hiding this comment

dessalines Jun 4, 2023

Choose a reason for hiding this comment

oscarnylander Jun 4, 2023 • edited Loading

Choose a reason for hiding this comment

dessalines left a comment

Choose a reason for hiding this comment

dessalines Jun 4, 2023

Choose a reason for hiding this comment

dessalines commented Jun 4, 2023

dessalines commented Jun 4, 2023

oscarnylander Jun 4, 2023 •

edited

Loading