Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcff8c45 authored by shamim-emon's avatar shamim-emon
Browse files

refactor: refactor DisplaySettings to introduce... 

refactor: refactor DisplaySettings to introduce DefaultDisplayCoreSettingsPreferenceManager for core display preferences
parent 39a6a6d5

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/DisplaySettings.kt

+3 −12
Original line number Diff line number Diff line
@@ -3,17 +3,14 @@ package net.thunderbird.core.preference.display 
import net.thunderbird.core.preference.AppTheme

import net.thunderbird.core.preference.SplitViewMode

import net.thunderbird.core.preference.SubTheme

import net.thunderbird.core.preference.display.coreSettings.DisplayCoreSetting



const val DISPLAY_SETTINGS_DEFAULT_FIXED_MESSAGE_VIEW_THEME = true

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_UNIFIED_INBOX = false

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_STAR_COUNT = false

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_MESSAGE_LIST_STAR = true

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_ANIMATION = true

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CORRESPONDENT_NAMES = true

val DISPLAY_SETTINGS_DEFAULT_APP_THEME = AppTheme.FOLLOW_SYSTEM

const val DISPLAY_SETTINGS_DEFAULT_SHOW_RECENT_CHANGES = true

val DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_THEME = SubTheme.USE_GLOBAL

val DISPLAY_SETTINGS_DEFAULT_MESSAGE_COMPOSE_THEME = SubTheme.USE_GLOBAL

const val DISPLAY_SETTINGS_DEFAULT_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG = true

const val DISPLAY_SETTINGS_DEFAULT_IS_MESSAGE_LIST_SENDER_ABOVE_SUBJECT = false

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_NAME = false
@@ -25,21 +22,17 @@ const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST = true 
const val DISPLAY_SETTINGS_DEFAULT_IS_THREAD_VIEW_ENABLED = true

const val DISPLAY_SETTINGS_DEFAULT_IS_USE_MESSAGE_VIEW_FIXED_WIDTH_FONT = false

const val DISPLAY_SETTINGS_DEFAULT_IS_AUTO_FIT_WIDTH = true

const val DISPLAY_SETTINGS_DEFAULT_APP_LANGUAGE = ""



val DISPLAY_SETTINGS_DEFAULT_SPLIT_VIEW_MODE = SplitViewMode.NEVER





data class DisplaySettings(

    val fixedMessageViewTheme: Boolean = DISPLAY_SETTINGS_DEFAULT_FIXED_MESSAGE_VIEW_THEME,

    val coreSetting: DisplayCoreSetting = DisplayCoreSetting(),

    val isShowUnifiedInbox: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_UNIFIED_INBOX,

    val isShowStarredCount: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_STAR_COUNT,

    val isShowMessageListStars: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_MESSAGE_LIST_STAR,

    val isShowAnimations: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_ANIMATION,

    val isShowCorrespondentNames: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CORRESPONDENT_NAMES,

    val appTheme: AppTheme = DISPLAY_SETTINGS_DEFAULT_APP_THEME,

    val showRecentChanges: Boolean = DISPLAY_SETTINGS_DEFAULT_SHOW_RECENT_CHANGES,

    val messageViewTheme: SubTheme = DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_THEME,

    val messageComposeTheme: SubTheme = DISPLAY_SETTINGS_DEFAULT_MESSAGE_COMPOSE_THEME,

    val shouldShowSetupArchiveFolderDialog: Boolean = DISPLAY_SETTINGS_DEFAULT_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG,

    val isMessageListSenderAboveSubject: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_MESSAGE_LIST_SENDER_ABOVE_SUBJECT,

    val isShowContactName: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_NAME,
@@ -51,6 +44,4 @@ data class DisplaySettings( 
    val isThreadedViewEnabled: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_THREAD_VIEW_ENABLED,

    val isUseMessageViewFixedWidthFont: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_USE_MESSAGE_VIEW_FIXED_WIDTH_FONT,

    val isAutoFitWidth: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_AUTO_FIT_WIDTH,

    val appLanguage: String = DISPLAY_SETTINGS_DEFAULT_APP_LANGUAGE,

    val splitViewMode: SplitViewMode = DISPLAY_SETTINGS_DEFAULT_SPLIT_VIEW_MODE,

)

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/DisplaySettingsPreferenceManager.kt

+0 −5
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ package net.thunderbird.core.preference.display 


import net.thunderbird.core.preference.PreferenceManager



const val KEY_FIXED_MESSAGE_VIEW_THEME = "fixedMessageViewTheme"

const val KEY_SHOW_UNIFIED_INBOX = "showUnifiedInbox"

const val KEY_SHOW_STAR_COUNT = "showStarredCount"

const val KEY_SHOW_CONTACT_NAME = "showContactName"
@@ -11,8 +10,6 @@ const val KEY_SHOW_MESSAGE_LIST_STARS = "messageListStars" 
const val KEY_SHOW_RECENT_CHANGES = "showRecentChanges"

const val KEY_THEME = "theme"

const val KEY_ANIMATION = "animations"

const val KEY_MESSAGE_VIEW_THEME = "messageViewTheme"

const val KEY_MESSAGE_COMPOSE_THEME = "messageComposeTheme"

const val KEY_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG = "shouldShowSetupArchiveFolderDialog"

const val KEY_CHANGE_REGISTERED_NAME_COLOR = "changeRegisteredNameColor"

const val KEY_COLORIZE_MISSING_CONTACT_PICTURE = "colorizeMissingContactPictures"
@@ -23,7 +20,5 @@ const val KEY_MESSAGE_VIEW_FIXED_WIDTH_FONT = "messageViewFixedWidthFont" 
const val KEY_AUTO_FIT_WIDTH = "autofitWidth"

const val KEY_MESSAGE_LIST_SENDER_ABOVE_SUBJECT = "messageListSenderAboveSubject"

const val KEY_SHOW_CONTACT_PICTURE = "showContactPicture"

const val KEY_APP_LANGUAGE = "language"

const val KEY_SPLIT_VIEW_MODE = "splitViewMode"



interface DisplaySettingsPreferenceManager : PreferenceManager<DisplaySettings>

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/coreSettings/DisplayCoreSettings.kt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
package net.thunderbird.core.preference.display.coreSettings



import net.thunderbird.core.preference.AppTheme

import net.thunderbird.core.preference.SplitViewMode

import net.thunderbird.core.preference.SubTheme



const val DISPLAY_SETTINGS_DEFAULT_APP_LANGUAGE = ""

const val DISPLAY_SETTINGS_DEFAULT_FIXED_MESSAGE_VIEW_THEME = true

val DISPLAY_SETTINGS_DEFAULT_APP_THEME = AppTheme.FOLLOW_SYSTEM

val DISPLAY_SETTINGS_DEFAULT_MESSAGE_COMPOSE_THEME = SubTheme.USE_GLOBAL

val DISPLAY_SETTINGS_DEFAULT_SPLIT_VIEW_MODE = SplitViewMode.NEVER

val DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_THEME = SubTheme.USE_GLOBAL

data class DisplayCoreSettings(

    val fixedMessageViewTheme: Boolean = DISPLAY_SETTINGS_DEFAULT_FIXED_MESSAGE_VIEW_THEME,

    val appTheme: AppTheme = DISPLAY_SETTINGS_DEFAULT_APP_THEME,

    val messageViewTheme: SubTheme = DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_THEME,

    val messageComposeTheme: SubTheme = DISPLAY_SETTINGS_DEFAULT_MESSAGE_COMPOSE_THEME,

    val appLanguage: String = DISPLAY_SETTINGS_DEFAULT_APP_LANGUAGE,

    val splitViewMode: SplitViewMode = DISPLAY_SETTINGS_DEFAULT_SPLIT_VIEW_MODE,

)

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/coreSettings/DisplayCoreSettingsPreferenceManager.kt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
package net.thunderbird.core.preference.display.coreSettings



import net.thunderbird.core.preference.PreferenceManager



const val KEY_FIXED_MESSAGE_VIEW_THEME = "fixedMessageViewTheme"

const val KEY_MESSAGE_VIEW_THEME = "messageViewTheme"

const val KEY_MESSAGE_COMPOSE_THEME = "messageComposeTheme"

const val KEY_APP_LANGUAGE = "language"

const val KEY_SPLIT_VIEW_MODE = "splitViewMode"



interface DisplayCoreSettingsPreferenceManager : PreferenceManager<DisplayCoreSettings>

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/DefaultDisplaySettingsPreferenceManager.kt

+5 −33
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ import kotlinx.coroutines.launch 
import kotlinx.coroutines.sync.Mutex

import kotlinx.coroutines.sync.withLock

import net.thunderbird.core.logging.Logger

import net.thunderbird.core.preference.display.coreSettings.DefaultDisplayCoreSettingsPreferenceManager

import net.thunderbird.core.preference.display.coreSettings.DisplayCoreSettingsPreferenceManager

import net.thunderbird.core.preference.storage.Storage

import net.thunderbird.core.preference.storage.StorageEditor

import net.thunderbird.core.preference.storage.getEnumOrDefault
@@ -24,6 +26,7 @@ class DefaultDisplaySettingsPreferenceManager( 
    private val storageEditor: StorageEditor,

    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,

    private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),

    private val coreSettingsPreferenceManager: DisplayCoreSettingsPreferenceManager

) : DisplaySettingsPreferenceManager {

    private val configState: MutableStateFlow<DisplaySettings> = MutableStateFlow(value = loadConfig())

    private val mutex = Mutex()
@@ -33,15 +36,13 @@ class DefaultDisplaySettingsPreferenceManager( 


    override fun save(config: DisplaySettings) {

        logger.debug(TAG) { "save() called with: config = $config" }

        coreSettingsPreferenceManager.save(config.coreSetting)

        writeConfig(config)

        configState.update { config }

    }



    private fun loadConfig(): DisplaySettings = DisplaySettings(

        fixedMessageViewTheme = storage.getBoolean(

            KEY_FIXED_MESSAGE_VIEW_THEME,

            DISPLAY_SETTINGS_DEFAULT_FIXED_MESSAGE_VIEW_THEME,

        ),

        coreSetting = coreSettingsPreferenceManager.getConfig(),

        isShowUnifiedInbox = storage.getBoolean(

            KEY_SHOW_UNIFIED_INBOX,

            DISPLAY_SETTINGS_DEFAULT_IS_SHOW_UNIFIED_INBOX,
@@ -50,15 +51,6 @@ class DefaultDisplaySettingsPreferenceManager( 
            KEY_SHOW_RECENT_CHANGES,

            DISPLAY_SETTINGS_DEFAULT_SHOW_RECENT_CHANGES,

        ),

        appTheme = storage.getEnumOrDefault(KEY_THEME, DISPLAY_SETTINGS_DEFAULT_APP_THEME),

        messageViewTheme = storage.getEnumOrDefault(

            KEY_MESSAGE_VIEW_THEME,

            DISPLAY_SETTINGS_DEFAULT_MESSAGE_VIEW_THEME,

        ),

        messageComposeTheme = storage.getEnumOrDefault(

            KEY_MESSAGE_COMPOSE_THEME,

            DISPLAY_SETTINGS_DEFAULT_MESSAGE_COMPOSE_THEME,

        ),

        shouldShowSetupArchiveFolderDialog = storage.getBoolean(

            KEY_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG,

            DISPLAY_SETTINGS_DEFAULT_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG,
@@ -119,30 +111,12 @@ class DefaultDisplaySettingsPreferenceManager( 
            KEY_SHOW_CONTACT_PICTURE,

            DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_PICTURE,

        ),

        appLanguage = storage.getStringOrDefault(

            KEY_APP_LANGUAGE,

            DISPLAY_SETTINGS_DEFAULT_APP_LANGUAGE,

        ),

        splitViewMode = storage.getEnumOrDefault(

            KEY_SPLIT_VIEW_MODE,

            DISPLAY_SETTINGS_DEFAULT_SPLIT_VIEW_MODE,

        ),

    )



    private fun writeConfig(config: DisplaySettings) {

        logger.debug(TAG) { "writeConfig() called with: config = $config" }

        scope.launch(ioDispatcher) {

            mutex.withLock {

                storageEditor.putEnum(KEY_THEME, config.appTheme)

                storageEditor.putEnum(KEY_MESSAGE_VIEW_THEME, config.messageViewTheme)

                storageEditor.putEnum(

                    KEY_MESSAGE_COMPOSE_THEME,

                    config.messageComposeTheme,

                )

                storageEditor.putBoolean(

                    KEY_FIXED_MESSAGE_VIEW_THEME,

                    config.fixedMessageViewTheme,

                )

                storageEditor.putBoolean(KEY_SHOW_UNIFIED_INBOX, config.isShowUnifiedInbox)

                storageEditor.putBoolean(

                    KEY_CHANGE_REGISTERED_NAME_COLOR,
@@ -193,8 +167,6 @@ class DefaultDisplaySettingsPreferenceManager( 
                    config.isUseMessageViewFixedWidthFont,

                )

                storageEditor.putBoolean(KEY_AUTO_FIT_WIDTH, config.isAutoFitWidth)

                storageEditor.putString(KEY_APP_LANGUAGE, config.appLanguage)

                storageEditor.putEnum(KEY_SPLIT_VIEW_MODE, config.splitViewMode)

                storageEditor.commit().also { commited ->

                    logger.verbose(TAG) { "writeConfig: storageEditor.commit() resulted in: $commited" }

                }