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

Remove "messageListStars" methods from 'K9'

Browse source
This commit is contained in:
cketti 2019-05-22 00:17:07 +02:00
parent ad4831e354
commit ed0683d064
4 changed files with 8 additions and 16 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

@ -203,7 +203,8 @@ object K9 : KoinComponent {
@JvmStatic
var isShowMessageListCheckboxes = true
private var messageListStars = true
@JvmStatic
var isShowMessageListStars = true
@JvmStatic
var messageListPreviewLines = 2
@ -315,15 +316,6 @@ object K9 : KoinComponent {
updateLoggingStatus()
}
@JvmStatic
fun messageListStars(): Boolean {
return messageListStars
}
fun setMessageListStars(stars: Boolean) {
messageListStars = stars
}
@JvmStatic
fun showCorrespondentNames(): Boolean {
return showCorrespondentNames
@ -558,7 +550,7 @@ object K9 : KoinComponent {
isHideSpecialAccounts = storage.getBoolean("hideSpecialAccounts", false)
messageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", false)
isShowMessageListCheckboxes = storage.getBoolean("messageListCheckboxes", false)
messageListStars = storage.getBoolean("messageListStars", true)
isShowMessageListStars = storage.getBoolean("messageListStars", true)
messageListPreviewLines = storage.getInt("messageListPreviewLines", 2)
isAutoFitWidth = storage.getBoolean("autofitWidth", true)
@ -685,7 +677,7 @@ object K9 : KoinComponent {
editor.putBoolean("countSearchMessages", countSearchMessages)
editor.putBoolean("messageListSenderAboveSubject", messageListSenderAboveSubject)
editor.putBoolean("hideSpecialAccounts", isHideSpecialAccounts)
editor.putBoolean("messageListStars", messageListStars)
editor.putBoolean("messageListStars", isShowMessageListStars)
editor.putInt("messageListPreviewLines", messageListPreviewLines)
editor.putBoolean("messageListCheckboxes", isShowMessageListCheckboxes)
editor.putBoolean("showCorrespondentNames", showCorrespondentNames)

2
app/ui/src/main/java/com/fsck/k9/activity/Accounts.java
View file

@ -1615,7 +1615,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
holder.newMessageCountWrapper.setVisibility(unreadMessageCount > 0 ? View.VISIBLE : View.GONE);
holder.flaggedMessageCount.setText(String.format("%d", stats.flaggedMessageCount));
holder.flaggedMessageCountWrapper.setVisibility(K9.messageListStars() && stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
holder.flaggedMessageCountWrapper.setVisibility(K9.isShowMessageListStars() && stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
holder.flaggedMessageCountWrapper.setOnClickListener(createFlaggedSearchListener(account));
holder.newMessageCountWrapper.setOnClickListener(createUnreadSearchListener(account));

2
app/ui/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
View file

@ -415,7 +415,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
previewLines = K9.getMessageListPreviewLines();
checkboxes = K9.isShowMessageListCheckboxes();
stars = K9.messageListStars();
stars = K9.isShowMessageListStars();
if (K9.showContactPicture()) {
contactsPictureLoader = ContactPicture.getContactPictureLoader();

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

@ -23,7 +23,7 @@ class GeneralSettingsDataStore(
"count_search" -> K9.countSearchMessages()
"hide_special_accounts" -> K9.isHideSpecialAccounts
"folderlist_wrap_folder_name" -> K9.wrapFolderNames()
"messagelist_stars" -> K9.messageListStars()
"messagelist_stars" -> K9.isShowMessageListStars
"messagelist_checkboxes" -> K9.isShowMessageListCheckboxes
"messagelist_show_correspondent_names" -> K9.showCorrespondentNames()
"messagelist_sender_above_subject" -> K9.messageListSenderAboveSubject()
@ -57,7 +57,7 @@ class GeneralSettingsDataStore(
"count_search" -> K9.setCountSearchMessages(value)
"hide_special_accounts" -> K9.isHideSpecialAccounts = value
"folderlist_wrap_folder_name" -> K9.setWrapFolderNames(value)
"messagelist_stars" -> K9.setMessageListStars(value)
"messagelist_stars" -> K9.isShowMessageListStars = value
"messagelist_checkboxes" -> K9.isShowMessageListCheckboxes = value
"messagelist_show_correspondent_names" -> K9.setShowCorrespondentNames(value)
"messagelist_sender_above_subject" -> K9.setMessageListSenderAboveSubject(value)