refactor(preferences): migrate K9.messageListDensity to new preference manager

Author: rafaeltonholo

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/message/list/DisplayMessageListSettings.kt

@@ -7,6 +7,7 @@ const val MESSAGE_LIST_SETTINGS_DEFAULT_IS_CHANGE_CONTACT_NAME_COLOR = true
 const val MESSAGE_LIST_SETTINGS_DEFAULT_IS_COLORIZE_MISSING_CONTACT_PICTURE = true
 const val MESSAGE_LIST_SETTINGS_DEFAULT_IS_USE_BACKGROUND_AS_INDICATOR = false
 const val MESSAGE_LIST_SETTINGS_DEFAULT_PREVIEW_LINES = 2
+val MESSAGE_LIST_SETTINGS_DEFAULT_UI_DENSITY = UiDensity.Default
 
 data class DisplayMessageListSettings(
     val isShowCorrespondentNames: Boolean = MESSAGE_LIST_SETTINGS_DEFAULT_IS_SHOW_CORRESPONDENT_NAMES,
@@ -16,4 +17,5 @@ data class DisplayMessageListSettings(
     val isColorizeMissingContactPictures: Boolean = MESSAGE_LIST_SETTINGS_DEFAULT_IS_COLORIZE_MISSING_CONTACT_PICTURE,
     val isUseBackgroundAsUnreadIndicator: Boolean = MESSAGE_LIST_SETTINGS_DEFAULT_IS_USE_BACKGROUND_AS_INDICATOR,
     val previewLines: Int = MESSAGE_LIST_SETTINGS_DEFAULT_PREVIEW_LINES,
+    val uiDensity: UiDensity = MESSAGE_LIST_SETTINGS_DEFAULT_UI_DENSITY,
 )

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/message/list/DefaultMessageListPreferencesManager.kt

@@ -6,6 +6,8 @@ import kotlinx.coroutines.flow.update
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.getEnumOrDefault
+import net.thunderbird.core.preference.storage.putEnum
 
 private const val TAG = "DefaultMessageListPreferencesManager"
 
@@ -50,6 +52,10 @@ class DefaultMessageListPreferencesManager(
             KEY_MESSAGE_LIST_VIEW_PREVIEW_LINES,
             MESSAGE_LIST_SETTINGS_DEFAULT_PREVIEW_LINES,
         ),
+        uiDensity = storage.getEnumOrDefault(
+            KEY_MESSAGE_LIST_VIEW_DENSITY,
+            MESSAGE_LIST_SETTINGS_DEFAULT_UI_DENSITY,
+        ),
     )
 
     private fun write(preferences: DisplayMessageListSettings) {
@@ -60,6 +66,7 @@ class DefaultMessageListPreferencesManager(
         storageEditor.putBoolean(KEY_SHOW_CONTACT_NAME, preferences.isShowContactName)
         storageEditor.putBoolean(KEY_SHOW_CORRESPONDENT_NAMES, preferences.isShowCorrespondentNames)
         storageEditor.putInt(KEY_MESSAGE_LIST_VIEW_PREVIEW_LINES, preferences.previewLines)
+        storageEditor.putEnum(KEY_MESSAGE_LIST_VIEW_DENSITY, preferences.uiDensity)
     }
 
     override fun getConfig(): DisplayMessageListSettings = preferences.value

legacy/core/src/main/java/com/fsck/k9/K9.kt

@@ -14,7 +14,6 @@ import net.thunderbird.core.android.account.AccountDefaultsProvider
 import net.thunderbird.core.android.account.SortType
 import net.thunderbird.core.featureflag.FeatureFlagProvider
 import net.thunderbird.core.featureflag.toFeatureFlagKey
-import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
 import net.thunderbird.core.preference.storage.getEnumOrDefault
@@ -121,9 +120,6 @@ object K9 : KoinComponent {
     @JvmStatic
     var lockScreenNotificationVisibility = LockScreenNotificationVisibility.MESSAGE_COUNT
 
-    @JvmStatic
-    var messageListDensity: UiDensity = UiDensity.Default
-
     @JvmStatic
     var contactNameColor = 0xFF1093F5.toInt()
 
@@ -206,7 +202,6 @@ object K9 : KoinComponent {
     fun loadPrefs(storage: Storage) {
         isShowAccountSelector = storage.getBoolean("showAccountSelector", true)
 
-        messageListDensity = storage.getEnum("messageListDensity", UiDensity.Default)
         contactNameColor = storage.getInt("registeredNameColor", 0xFF1093F5.toInt())
         messageViewPostMarkAsUnreadNavigation =
             storage.getEnum("messageViewPostMarkAsUnreadAction", PostMarkAsUnreadNavigation.ReturnToMessageList)
@@ -247,7 +242,6 @@ object K9 : KoinComponent {
 
     @Suppress("LongMethod")
     internal fun save(editor: StorageEditor) {
-        editor.putEnum("messageListDensity", messageListDensity)
         editor.putBoolean("showAccountSelector", isShowAccountSelector)
         editor.putInt("registeredNameColor", contactNameColor)
         editor.putEnum("messageViewPostMarkAsUnreadAction", messageViewPostMarkAsUnreadNavigation)

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt

@@ -61,7 +61,7 @@ data class MessageListActivityConfig(
                 contactNameColor = K9.contactNameColor,
                 messageViewTheme = settings.display.coreSettings.messageViewTheme,
                 messageListPreviewLines = messageListPreferences.previewLines,
-                messageListDensity = K9.messageListDensity,
+                messageListDensity = messageListPreferences.uiDensity,
                 splitViewMode = settings.display.coreSettings.splitViewMode,
                 fontSizeMessageListSubject = K9.fontSizes.messageListSubject,
                 fontSizeMessageListSender = K9.fontSizes.messageListSender,

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt

@@ -812,7 +812,7 @@ class MessageListFragment :
             showingThreadedList = showingThreadedList,
             backGroundAsReadIndicator = messageListSettings.isUseBackgroundAsUnreadIndicator,
             showAccountIndicator = isShowAccountIndicator,
-            density = K9.messageListDensity,
+            density = messageListSettings.uiDensity,
         )
 
     private fun getFolderInfoHolder(account: LegacyAccount, folderId: Long): FolderInfoHolder {

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt

@@ -163,7 +163,7 @@ class GeneralSettingsDataStore(
             "message_compose_input_font" -> K9.fontSizes.messageComposeInput.toString()
             "swipe_action_right" -> swipeActionToString(interactionSettings.swipeActions.rightAction)
             "swipe_action_left" -> swipeActionToString(interactionSettings.swipeActions.leftAction)
-            "message_list_density" -> K9.messageListDensity.toString()
+            "message_list_density" -> messageListSettings.uiDensity.toString()
             "post_remove_navigation" -> interactionSettings.messageViewPostRemoveNavigation
             "post_mark_as_unread_navigation" -> K9.messageViewPostMarkAsUnreadNavigation.name
             else -> defValue
@@ -208,7 +208,7 @@ class GeneralSettingsDataStore(
             "message_compose_input_font" -> K9.fontSizes.messageComposeInput = value.toInt()
             "swipe_action_right" -> updateSwipeAction(value) { swipeAction -> copy(rightAction = swipeAction) }
             "swipe_action_left" -> updateSwipeAction(value) { swipeAction -> copy(leftAction = swipeAction) }
-            "message_list_density" -> K9.messageListDensity = UiDensity.valueOf(value)
+            "message_list_density" -> updateMessageListDensity(value)
             "post_remove_navigation" -> setMessageViewPostRemoveNavigation(value)
             "post_mark_as_unread_navigation" -> {
                 K9.messageViewPostMarkAsUnreadNavigation = PostMarkAsUnreadNavigation.valueOf(value)
@@ -810,4 +810,19 @@ class GeneralSettingsDataStore(
             )
         }
     }
+
+    private fun updateMessageListDensity(value: String) {
+        skipSaveSettings = true
+        generalSettingsManager.update { settings ->
+            settings.copy(
+                display = settings.display.copy(
+                    visualSettings = settings.display.visualSettings.copy(
+                        messageListSettings = settings.display.visualSettings.messageListSettings.copy(
+                            uiDensity = UiDensity.valueOf(value),
+                        ),
+                    ),
+                ),
+            )
+        }
+    }
 }