mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 12:12:15 +02:00
Code

Merge pull request #6752 from thundernest/message_view_account_chip

Browse Source 
Add font size setting for account name in message view
This commit is contained in:
cketti 2023-03-14 11:57:10 +01:00 committed by GitHub
commit 5ca15aeb47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/core/src/main/java/com/fsck/k9/FontSizes.java
View File

@ -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;
}

3
app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
View File

@ -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);

2
app/core/src/main/java/com/fsck/k9/preferences/Settings.java
View File

@ -36,7 +36,7 @@ public class Settings {
*
* @see SettingsExporter
*/
public static final int VERSION = 86;
public static final int VERSION = 87;
static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription>> settings,
Map<String, String> importedSettings, boolean useDefaultValues) {

2
app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
View File

@ -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()

13
app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
View File

@ -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;

6
app/ui/legacy/src/main/res/layout/message_view_header.xml
View File

@ -18,7 +18,7 @@
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.chip.Chip
android:id="@+id/chip"
android:id="@+id/account_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -37,13 +37,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="chip,margin_top" />
app:constraint_referenced_ids="account_name,margin_top" />
<com.fsck.k9.ui.helper.BottomBaselineTextView
android:id="@+id/subject"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_below="@id/chip"
android:layout_below="@id/account_name"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"

2
app/ui/legacy/src/main/res/values/strings.xml
View File

@ -880,6 +880,8 @@ Please submit bug reports, contribute new features and ask questions at
<string name="font_size_message_list_preview">Preview</string>
<string name="font_size_message_view">Messages</string>
<!-- Displayed in the font size settings screen to configure the font size of the account name in the message view. -->
<string name="font_size_message_view_account">Account name</string>
<string name="font_size_message_view_sender">Sender</string>
<string name="font_size_message_view_recipients">Recipients</string>
<string name="font_size_message_view_subject">Subject</string>

8
app/ui/legacy/src/main/res/xml/general_settings.xml
View File

@ -104,6 +104,14 @@
android:title="@string/font_size_message_view"
android:key="message_view_fonts">
<ListPreference
android:key="message_view_account_name_font"
android:title="@string/font_size_message_view_account"
app:useSimpleSummaryProvider="true"
android:entries="@array/font_entries"
android:entryValues="@array/font_values"
android:dialogTitle="@string/font_size_message_view_account" />
<ListPreference
android:key="message_view_subject_font"
android:title="@string/font_size_message_view_subject"