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

Unverified Commit 040a5e08 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #9642 from shamim-emon/fix-issue-9641 

Extract DisplayCoreSettings and DisplayInboxSettings from DisplaySettings
parents b71249d5 6eebece9

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

+4 −28
Original line number Diff line number Diff line 
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.DisplayCoreSettings

import net.thunderbird.core.preference.display.inboxSettings.DisplayInboxSettings



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

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_PICTURE = true

const val DISPLAY_SETTINGS_DEFAULT_IS_CHANGE_CONTACT_NAME_COLOR = true

const val DISPLAY_SETTINGS_DEFAULT_IS_COLORIZE_MISSING_CONTACT_PICTURE = false

const val DISPLAY_SETTINGS_DEFAULT_IS_USE_BACKGROUND_AS_INDICATOR = false

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 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 coreSettings: DisplayCoreSettings = DisplayCoreSettings(),

    val inboxSettings: DisplayInboxSettings = DisplayInboxSettings(),

    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,

    val isShowContactPicture: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_PICTURE,

    val isChangeContactNameColor: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_CHANGE_CONTACT_NAME_COLOR,

    val isColorizeMissingContactPictures: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_COLORIZE_MISSING_CONTACT_PICTURE,

    val isUseBackgroundAsUnreadIndicator: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_USE_BACKGROUND_AS_INDICATOR,

    val isShowComposeButtonOnMessageList: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST,

    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 −11
Original line number Diff line number Diff line
@@ -2,28 +2,17 @@ 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"

const val KEY_SHOW_CORRESPONDENT_NAMES = "showCorrespondentNames"

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"

const val KEY_USE_BACKGROUND_AS_UNREAD_INDICATOR = "isUseBackgroundAsUnreadIndicator"

const val KEY_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST = "showComposeButtonOnMessageList"

const val KEY_THREAD_VIEW_ENABLED = "isThreadedViewEnabled"

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/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/inboxSettings/DisplayInboxSettings.kt

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



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_MESSAGE_LIST_SENDER_ABOVE_SUBJECT = false

const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST = true

const val DISPLAY_SETTINGS_DEFAULT_IS_THREAD_VIEW_ENABLED = true



data class DisplayInboxSettings(

    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 isMessageListSenderAboveSubject: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_MESSAGE_LIST_SENDER_ABOVE_SUBJECT,

    val isShowComposeButtonOnMessageList: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_COMPOSE_BUTTON_ON_MESSAGE_LIST,

    val isThreadedViewEnabled: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_THREAD_VIEW_ENABLED,

)