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

Commit 26ad7a3a authored by shamim-emon's avatar shamim-emon
Browse files

refactor: replace all direct usage of K9.isChangeContactNameColor with... 

refactor: replace all direct usage of K9.isChangeContactNameColor with GeneralSettings's isChangeContactNameColor
parent ccda088c

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettings.kt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ data class GeneralSettings( 
    val isMessageListSenderAboveSubject: Boolean,

    val isShowContactName: Boolean,

    val isShowContactPicture: Boolean,

    val isChangeContactNameColor: Boolean,

)



enum class BackgroundSync {

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/GeneralSettingsManager.kt

+1 −0
Original line number Diff line number Diff line
@@ -25,4 +25,5 @@ interface GeneralSettingsManager { 
    fun setIsMessageListSenderAboveSubject(isMessageListSenderAboveSubject: Boolean)

    fun setIsShowContactName(isShowContactName: Boolean)

    fun setIsShowContactPicture(isShowContactPicture: Boolean)

    fun setIsChangeContactNameColor(isChangeContactNameColor: Boolean)

}

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListItemMapper.kt

+3 −2
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ internal class MessageListItemMapper( 
        val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()

        val displayName = if (showRecipients) {

            messageHelper.getRecipientDisplayNames(

                toAddresses.toTypedArray(),

                generalSettingsManager.getSettings().isShowCorrespondentNames,

                addresses = toAddresses.toTypedArray(),

                isShowCorrespondentNames = generalSettingsManager.getSettings().isShowCorrespondentNames,

                isChangeContactNameColor = generalSettingsManager.getSettings().isChangeContactNameColor,

            ).toString()

        } else {

            messageHelper.getSenderDisplayName(displayAddress).toString()

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt

+3 −2
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ internal class MessageListItemMapper( 
        val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()

        val displayName = if (showRecipients) {

            messageHelper.getRecipientDisplayNames(

                toAddresses.toTypedArray(),

                generalSettingsManager.getSettings().isShowCorrespondentNames,

                addresses = toAddresses.toTypedArray(),

                isShowCorrespondentNames = generalSettingsManager.getSettings().isShowCorrespondentNames,

                isChangeContactNameColor = generalSettingsManager.getSettings().isChangeContactNameColor,

            ).toString()

        } else {

            messageHelper.getSenderDisplayName(displayAddress).toString()

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

+0 −5
Original line number Diff line number Diff line
@@ -183,9 +183,6 @@ object K9 : KoinComponent { 
    @JvmStatic

    var isShowContactName = false



    @JvmStatic

    var isChangeContactNameColor = false



    @JvmStatic

    var contactNameColor = 0xFF1093F5.toInt()
@@ -338,7 +335,6 @@ object K9 : KoinComponent { 
        quietTimeEnds = storage.getStringOrDefault("quietTimeEnds", "7:00")



        messageListDensity = storage.getEnum("messageListDensity", UiDensity.Default)

        isChangeContactNameColor = storage.getBoolean("changeRegisteredNameColor", false)

        contactNameColor = storage.getInt("registeredNameColor", 0xFF1093F5.toInt())

        isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false)

        messageViewPostRemoveNavigation =
@@ -427,7 +423,6 @@ object K9 : KoinComponent { 
        editor.putEnum("messageListDensity", messageListDensity)

        editor.putBoolean("showAccountSelector", isShowAccountSelector)

        editor.putInt("messageListPreviewLines", messageListPreviewLines)

        editor.putBoolean("changeRegisteredNameColor", isChangeContactNameColor)

        editor.putInt("registeredNameColor", contactNameColor)

        editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont)

        editor.putEnum("messageViewPostDeleteAction", messageViewPostRemoveNavigation)