diff --git a/app/core/src/main/java/com/fsck/k9/FontSizes.java b/app/core/src/main/java/com/fsck/k9/FontSizes.java index f6c7ce7689..bc23ef2366 100644 --- a/app/core/src/main/java/com/fsck/k9/FontSizes.java +++ b/app/core/src/main/java/com/fsck/k9/FontSizes.java @@ -15,6 +15,7 @@ public class FontSizes { private static final String MESSAGE_LIST_SENDER = "fontSizeMessageListSender"; private static final String MESSAGE_LIST_DATE = "fontSizeMessageListDate"; private static final String MESSAGE_LIST_PREVIEW = "fontSizeMessageListPreview"; + private static final String MESSAGE_VIEW_ACCOUNT_NAME = "fontSizeMessageViewAccountName"; private static final String MESSAGE_VIEW_SENDER = "fontSizeMessageViewSender"; private static final String MESSAGE_VIEW_RECIPIENTS = "fontSizeMessageViewTo"; private static final String MESSAGE_VIEW_SUBJECT = "fontSizeMessageViewSubject"; @@ -36,6 +37,7 @@ public class FontSizes { private int messageListSender; private int messageListDate; private int messageListPreview; + private int messageViewAccountName; private int messageViewSender; private int messageViewRecipients; private int messageViewSubject; @@ -50,6 +52,7 @@ public class FontSizes { messageListDate = FONT_DEFAULT; messageListPreview = FONT_DEFAULT; + messageViewAccountName = FONT_DEFAULT; messageViewSender = FONT_DEFAULT; messageViewRecipients = FONT_DEFAULT; messageViewSubject = FONT_DEFAULT; @@ -65,6 +68,7 @@ public class FontSizes { editor.putInt(MESSAGE_LIST_DATE, messageListDate); editor.putInt(MESSAGE_LIST_PREVIEW, messageListPreview); + editor.putInt(MESSAGE_VIEW_ACCOUNT_NAME, messageViewAccountName); editor.putInt(MESSAGE_VIEW_SENDER, messageViewSender); editor.putInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients); editor.putInt(MESSAGE_VIEW_SUBJECT, messageViewSubject); @@ -80,6 +84,7 @@ public class FontSizes { messageListDate = storage.getInt(MESSAGE_LIST_DATE, messageListDate); messageListPreview = storage.getInt(MESSAGE_LIST_PREVIEW, messageListPreview); + messageViewAccountName = storage.getInt(MESSAGE_VIEW_ACCOUNT_NAME, messageViewAccountName); messageViewSender = storage.getInt(MESSAGE_VIEW_SENDER, messageViewSender); messageViewRecipients = storage.getInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients); messageViewSubject = storage.getInt(MESSAGE_VIEW_SUBJECT, messageViewSubject); @@ -126,6 +131,14 @@ public class FontSizes { this.messageListPreview = messageListPreview; } + public int getMessageViewAccountName() { + return messageViewAccountName; + } + + public void setMessageViewAccountName(int messageViewAccountName) { + this.messageViewAccountName = messageViewAccountName; + } + public int getMessageViewSender() { return messageViewSender; } diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java index 0c947ad9d6..14819d4044 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java +++ b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java @@ -278,6 +278,9 @@ public class GeneralSettingsDescriptions { s.put("messageListDensity", Settings.versions( new V(86, new EnumSetting(UiDensity.class, UiDensity.Default)) )); + s.put("fontSizeMessageViewAccountName", Settings.versions( + new V(87, new FontSizeSetting(FontSizes.FONT_DEFAULT)) + )); SETTINGS = Collections.unmodifiableMap(s); diff --git a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java index 2176427ce4..ea45b4d983 100644 --- a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java +++ b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java @@ -36,7 +36,7 @@ public class Settings { * * @see SettingsExporter */ - public static final int VERSION = 86; + public static final int VERSION = 87; static Map validate(int version, Map> settings, Map importedSettings, boolean useDefaultValues) { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt index 33e67787a7..31be0d19d2 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt @@ -117,6 +117,7 @@ class GeneralSettingsDataStore( "message_list_sender_font" -> K9.fontSizes.messageListSender.toString() "message_list_date_font" -> K9.fontSizes.messageListDate.toString() "message_list_preview_font" -> K9.fontSizes.messageListPreview.toString() + "message_view_account_name_font" -> K9.fontSizes.messageViewAccountName.toString() "message_view_sender_font" -> K9.fontSizes.messageViewSender.toString() "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients.toString() "message_view_subject_font" -> K9.fontSizes.messageViewSubject.toString() @@ -152,6 +153,7 @@ class GeneralSettingsDataStore( "message_list_sender_font" -> K9.fontSizes.messageListSender = value.toInt() "message_list_date_font" -> K9.fontSizes.messageListDate = value.toInt() "message_list_preview_font" -> K9.fontSizes.messageListPreview = value.toInt() + "message_view_account_name_font" -> K9.fontSizes.messageViewAccountName = value.toInt() "message_view_sender_font" -> K9.fontSizes.messageViewSender = value.toInt() "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients = value.toInt() "message_view_subject_font" -> K9.fontSizes.messageViewSubject = value.toInt() diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java index fba965ee54..f4feabb688 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java @@ -50,7 +50,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo private final MessageHelper messageHelper = DI.get(MessageHelper.class); private final FontSizes fontSizes = K9.getFontSizes(); - private Chip accountChip; + private Chip accountNameView; private TextView subjectView; private ImageView starView; private ImageView contactPictureView; @@ -78,7 +78,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo protected void onFinishInflate() { super.onFinishInflate(); - accountChip = findViewById(R.id.chip); + accountNameView = findViewById(R.id.account_name); subjectView = findViewById(R.id.subject); starView = findViewById(R.id.flagged); contactPictureView = findViewById(R.id.contact_picture); @@ -87,6 +87,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo recipientNamesView = findViewById(R.id.recipients); dateView = findViewById(R.id.date); + fontSizes.setViewTextSize(accountNameView, fontSizes.getMessageViewAccountName()); fontSizes.setViewTextSize(subjectView, fontSizes.getMessageViewSubject()); fontSizes.setViewTextSize(dateView, fontSizes.getMessageViewDate()); fontSizes.setViewTextSize(fromView, fontSizes.getMessageViewSender()); @@ -193,11 +194,11 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo public void populate(final Message message, final Account account, boolean showStar, boolean showAccountChip) { if (showAccountChip) { - accountChip.setVisibility(View.VISIBLE); - accountChip.setText(account.getDisplayName()); - accountChip.setChipBackgroundColor(ColorStateList.valueOf(account.getChipColor())); + accountNameView.setVisibility(View.VISIBLE); + accountNameView.setText(account.getDisplayName()); + accountNameView.setChipBackgroundColor(ColorStateList.valueOf(account.getChipColor())); } else { - accountChip.setVisibility(View.GONE); + accountNameView.setVisibility(View.GONE); } Address fromAddress = null; diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml index 52f59d1a62..821f4aedab 100644 --- a/app/ui/legacy/src/main/res/layout/message_view_header.xml +++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml @@ -18,7 +18,7 @@ app:layout_constraintTop_toTopOf="parent" /> + app:constraint_referenced_ids="account_name,margin_top" /> Preview Messages + + Account name Sender Recipients Subject diff --git a/app/ui/legacy/src/main/res/xml/general_settings.xml b/app/ui/legacy/src/main/res/xml/general_settings.xml index f0b7a39945..a6cb64b219 100644 --- a/app/ui/legacy/src/main/res/xml/general_settings.xml +++ b/app/ui/legacy/src/main/res/xml/general_settings.xml @@ -104,6 +104,14 @@ android:title="@string/font_size_message_view" android:key="message_view_fonts"> + +