wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove "changeContactNameColor" methods from 'K9'

Browse source
This commit is contained in:
cketti 2019-05-22 00:25:38 +02:00
parent 9db23ba7de
commit bc76870004
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/core/src/main/java/com/fsck/k9/K9.kt
View file

@ -218,7 +218,8 @@ object K9 : KoinComponent {
@JvmStatic
var isShowContactName = false
private var changeContactNameColor = false
@JvmStatic
var isChangeContactNameColor = false
@JvmStatic
var contactNameColor = 0xff00008f.toInt()
@ -322,15 +323,6 @@ object K9 : KoinComponent {
updateLoggingStatus()
}
@JvmStatic
fun changeContactNameColor(): Boolean {
return changeContactNameColor
}
fun setChangeContactNameColor(changeContactNameColor: Boolean) {
K9.changeContactNameColor = changeContactNameColor
}
@JvmStatic
fun messageViewFixedWidthFont(): Boolean {
return messageViewFixedWidthFont
@ -542,7 +534,7 @@ object K9 : KoinComponent {
isShowCorrespondentNames = storage.getBoolean("showCorrespondentNames", true)
isShowContactName = storage.getBoolean("showContactName", false)
showContactPicture = storage.getBoolean("showContactPicture", true)
changeContactNameColor = storage.getBoolean("changeRegisteredNameColor", false)
isChangeContactNameColor = storage.getBoolean("changeRegisteredNameColor", false)
contactNameColor = storage.getInt("registeredNameColor", -0xffff71)
messageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false)
messageViewReturnToList = storage.getBoolean("messageViewReturnToList", false)
@ -662,7 +654,7 @@ object K9 : KoinComponent {
editor.putBoolean("showCorrespondentNames", isShowCorrespondentNames)
editor.putBoolean("showContactName", isShowContactName)
editor.putBoolean("showContactPicture", showContactPicture)
editor.putBoolean("changeRegisteredNameColor", changeContactNameColor)
editor.putBoolean("changeRegisteredNameColor", isChangeContactNameColor)
editor.putInt("registeredNameColor", contactNameColor)
editor.putBoolean("messageViewFixedWidthFont", messageViewFixedWidthFont)
editor.putBoolean("messageViewReturnToList", messageViewReturnToList)

2
app/core/src/main/java/com/fsck/k9/helper/MessageHelper.java
View file

@ -84,7 +84,7 @@ public class MessageHelper {
public static CharSequence toFriendly(Address address, Contacts contacts) {
return toFriendly(address,contacts,
K9.isShowCorrespondentNames(),
K9.changeContactNameColor(),
K9.isChangeContactNameColor(),
K9.getContactNameColor());
}

4
app/ui/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
View file

@ -28,7 +28,7 @@ class GeneralSettingsDataStore(
"messagelist_show_correspondent_names" -> K9.isShowCorrespondentNames
"messagelist_sender_above_subject" -> K9.isMessageListSenderAboveSubject
"messagelist_show_contact_name" -> K9.isShowContactName
"messagelist_change_contact_name_color" -> K9.changeContactNameColor()
"messagelist_change_contact_name_color" -> K9.isChangeContactNameColor
"messagelist_show_contact_picture" -> K9.showContactPicture()
"messagelist_colorize_missing_contact_pictures" -> K9.isColorizeMissingContactPictures
"messagelist_background_as_unread_indicator" -> K9.useBackgroundAsUnreadIndicator()
@ -62,7 +62,7 @@ class GeneralSettingsDataStore(
"messagelist_show_correspondent_names" -> K9.isShowCorrespondentNames = value
"messagelist_sender_above_subject" -> K9.isMessageListSenderAboveSubject = value
"messagelist_show_contact_name" -> K9.isShowContactName = value
"messagelist_change_contact_name_color" -> K9.setChangeContactNameColor(value)
"messagelist_change_contact_name_color" -> K9.isChangeContactNameColor = value
"messagelist_show_contact_picture" -> K9.setShowContactPicture(value)
"messagelist_colorize_missing_contact_pictures" -> K9.isColorizeMissingContactPictures = value
"messagelist_background_as_unread_indicator" -> K9.setUseBackgroundAsUnreadIndicator(value)