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

Commit 017fc8e5 authored by cketti's avatar cketti
Browse files

Respect font size settings in message view 

- Remove now unnecessary settings.
- Rearrange items in the settings screen to match the display order in the message view screen.
- Change setting name from "To" to "Recipients".
parent a2867e1b

app/core/src/main/java/com/fsck/k9/FontSizes.java

+9 −48
Original line number Diff line number Diff line
@@ -21,10 +21,7 @@ public class FontSizes { 
    private static final String MESSAGE_LIST_DATE = "fontSizeMessageListDate";

    private static final String MESSAGE_LIST_PREVIEW = "fontSizeMessageListPreview";

    private static final String MESSAGE_VIEW_SENDER = "fontSizeMessageViewSender";

    private static final String MESSAGE_VIEW_TO = "fontSizeMessageViewTo";

    private static final String MESSAGE_VIEW_CC = "fontSizeMessageViewCC";

    private static final String MESSAGE_VIEW_BCC = "fontSizeMessageViewBCC";

    private static final String MESSAGE_VIEW_ADDITIONAL_HEADERS = "fontSizeMessageViewAdditionalHeaders";

    private static final String MESSAGE_VIEW_RECIPIENTS = "fontSizeMessageViewTo";

    private static final String MESSAGE_VIEW_SUBJECT = "fontSizeMessageViewSubject";

    private static final String MESSAGE_VIEW_DATE = "fontSizeMessageViewDate";

    private static final String MESSAGE_VIEW_CONTENT_PERCENT = "fontSizeMessageViewContentPercent";
@@ -50,10 +47,7 @@ public class FontSizes { 
    private int messageListDate;

    private int messageListPreview;

    private int messageViewSender;

    private int messageViewTo;

    private int messageViewCC;

    private int messageViewBCC;

    private int messageViewAdditionalHeaders;

    private int messageViewRecipients;

    private int messageViewSubject;

    private int messageViewDate;

    private int messageViewContentPercent;
@@ -73,10 +67,7 @@ public class FontSizes { 
        messageListPreview = FONT_DEFAULT;



        messageViewSender = FONT_DEFAULT;

        messageViewTo = FONT_DEFAULT;

        messageViewCC = FONT_DEFAULT;

        messageViewBCC = FONT_DEFAULT;

        messageViewAdditionalHeaders = FONT_DEFAULT;

        messageViewRecipients = FONT_DEFAULT;

        messageViewSubject = FONT_DEFAULT;

        messageViewDate = FONT_DEFAULT;

        messageViewContentPercent = 100;
@@ -97,10 +88,7 @@ public class FontSizes { 
        editor.putInt(MESSAGE_LIST_PREVIEW, messageListPreview);



        editor.putInt(MESSAGE_VIEW_SENDER, messageViewSender);

        editor.putInt(MESSAGE_VIEW_TO, messageViewTo);

        editor.putInt(MESSAGE_VIEW_CC, messageViewCC);

        editor.putInt(MESSAGE_VIEW_BCC, messageViewBCC);

        editor.putInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders);

        editor.putInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients);

        editor.putInt(MESSAGE_VIEW_SUBJECT, messageViewSubject);

        editor.putInt(MESSAGE_VIEW_DATE, messageViewDate);

        editor.putInt(MESSAGE_VIEW_CONTENT_PERCENT, getMessageViewContentAsPercent());
@@ -121,10 +109,7 @@ public class FontSizes { 
        messageListPreview = storage.getInt(MESSAGE_LIST_PREVIEW, messageListPreview);



        messageViewSender = storage.getInt(MESSAGE_VIEW_SENDER, messageViewSender);

        messageViewTo = storage.getInt(MESSAGE_VIEW_TO, messageViewTo);

        messageViewCC = storage.getInt(MESSAGE_VIEW_CC, messageViewCC);

        messageViewBCC = storage.getInt(MESSAGE_VIEW_BCC, messageViewBCC);

        messageViewAdditionalHeaders = storage.getInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders);

        messageViewRecipients = storage.getInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients);

        messageViewSubject = storage.getInt(MESSAGE_VIEW_SUBJECT, messageViewSubject);

        messageViewDate = storage.getInt(MESSAGE_VIEW_DATE, messageViewDate);
@@ -209,36 +194,12 @@ public class FontSizes { 
        this.messageViewSender = messageViewSender;

    }



    public int getMessageViewTo() {

        return messageViewTo;

    public int getMessageViewRecipients() {

        return messageViewRecipients;

    }



    public void setMessageViewTo(int messageViewTo) {

        this.messageViewTo = messageViewTo;

    }



    public int getMessageViewCC() {

        return messageViewCC;

    }



    public void setMessageViewCC(int messageViewCC) {

        this.messageViewCC = messageViewCC;

    }



    public int getMessageViewBCC() {

        return messageViewBCC;

    }



    public void setMessageViewBCC(int messageViewBCC) {

        this.messageViewBCC = messageViewBCC;

    }



    public int getMessageViewAdditionalHeaders() {

        return messageViewAdditionalHeaders;

    }



    public void setMessageViewAdditionalHeaders(int messageViewAdditionalHeaders) {

        this.messageViewAdditionalHeaders = messageViewAdditionalHeaders;

    public void setMessageViewRecipients(int messageViewRecipients) {

        this.messageViewRecipients = messageViewRecipients;

    }



    public int getMessageViewSubject() {

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt

+2 −8
Original line number Diff line number Diff line
@@ -26,10 +26,7 @@ data class MessageListActivityConfig( 
    val fontSizeMessageListDate: Int,

    val fontSizeMessageListPreview: Int,

    val fontSizeMessageViewSender: Int,

    val fontSizeMessageViewTo: Int,

    val fontSizeMessageViewCC: Int,

    val fontSizeMessageViewBCC: Int,

    val fontSizeMessageViewAdditionalHeaders: Int,

    val fontSizeMessageViewRecipients: Int,

    val fontSizeMessageViewSubject: Int,

    val fontSizeMessageViewDate: Int,

    val fontSizeMessageViewContentAsPercent: Int,
@@ -60,10 +57,7 @@ data class MessageListActivityConfig( 
                fontSizeMessageListDate = K9.fontSizes.messageListDate,

                fontSizeMessageListPreview = K9.fontSizes.messageListPreview,

                fontSizeMessageViewSender = K9.fontSizes.messageViewSender,

                fontSizeMessageViewTo = K9.fontSizes.messageViewTo,

                fontSizeMessageViewCC = K9.fontSizes.messageViewCC,

                fontSizeMessageViewBCC = K9.fontSizes.messageViewBCC,

                fontSizeMessageViewAdditionalHeaders = K9.fontSizes.messageViewAdditionalHeaders,

                fontSizeMessageViewRecipients = K9.fontSizes.messageViewRecipients,

                fontSizeMessageViewSubject = K9.fontSizes.messageViewSubject,

                fontSizeMessageViewDate = K9.fontSizes.messageViewDate,

                fontSizeMessageViewContentAsPercent = K9.fontSizes.messageViewContentAsPercent,

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

+2 −8
Original line number Diff line number Diff line
@@ -119,12 +119,9 @@ class GeneralSettingsDataStore( 
            "message_list_date_font" -> K9.fontSizes.messageListDate.toString()

            "message_list_preview_font" -> K9.fontSizes.messageListPreview.toString()

            "message_view_sender_font" -> K9.fontSizes.messageViewSender.toString()

            "message_view_to_font" -> K9.fontSizes.messageViewTo.toString()

            "message_view_cc_font" -> K9.fontSizes.messageViewCC.toString()

            "message_view_bcc_font" -> K9.fontSizes.messageViewBCC.toString()

            "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients.toString()

            "message_view_subject_font" -> K9.fontSizes.messageViewSubject.toString()

            "message_view_date_font" -> K9.fontSizes.messageViewDate.toString()

            "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders.toString()

            "message_compose_input_font" -> K9.fontSizes.messageComposeInput.toString()

            "swipe_action_right" -> swipeActionToString(K9.swipeRightAction)

            "swipe_action_left" -> swipeActionToString(K9.swipeLeftAction)
@@ -160,12 +157,9 @@ class GeneralSettingsDataStore( 
            "message_list_date_font" -> K9.fontSizes.messageListDate = value.toInt()

            "message_list_preview_font" -> K9.fontSizes.messageListPreview = value.toInt()

            "message_view_sender_font" -> K9.fontSizes.messageViewSender = value.toInt()

            "message_view_to_font" -> K9.fontSizes.messageViewTo = value.toInt()

            "message_view_cc_font" -> K9.fontSizes.messageViewCC = value.toInt()

            "message_view_bcc_font" -> K9.fontSizes.messageViewBCC = value.toInt()

            "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients = value.toInt()

            "message_view_subject_font" -> K9.fontSizes.messageViewSubject = value.toInt()

            "message_view_date_font" -> K9.fontSizes.messageViewDate = value.toInt()

            "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders = value.toInt()

            "message_compose_input_font" -> K9.fontSizes.messageComposeInput = value.toInt()

            "swipe_action_right" -> K9.swipeRightAction = stringToSwipeAction(value)

            "swipe_action_left" -> K9.swipeLeftAction = stringToSwipeAction(value)

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

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import androidx.appcompat.widget.PopupMenu; 
import androidx.appcompat.widget.PopupMenu.OnMenuItemClickListener;

import com.fsck.k9.Account;

import com.fsck.k9.DI;

import com.fsck.k9.FontSizes;

import com.fsck.k9.K9;

import com.fsck.k9.activity.misc.ContactPicture;

import com.fsck.k9.contacts.ContactPictureLoader;
@@ -34,12 +35,16 @@ import com.google.android.material.snackbar.Snackbar; 
public class MessageHeader extends LinearLayout implements OnClickListener, OnLongClickListener {

    private static final int DEFAULT_SUBJECT_LINES = 3;



    private final FontSizes fontSizes = K9.getFontSizes();



    private Chip accountChip;

    private TextView subjectView;

    private ImageView starView;

    private ImageView contactPictureView;

    private TextView fromView;

    private ImageView cryptoStatusIcon;

    private TextView toView;

    private TextView toCountView;

    private TextView dateView;



    private MessageHelper messageHelper;
@@ -67,8 +72,16 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo 
        contactPictureView = findViewById(R.id.contact_picture);

        fromView = findViewById(R.id.from);

        cryptoStatusIcon = findViewById(R.id.crypto_status_icon);

        toView = findViewById(R.id.to);

        toCountView = findViewById(R.id.to_count);

        dateView = findViewById(R.id.date);



        fontSizes.setViewTextSize(subjectView, fontSizes.getMessageViewSubject());

        fontSizes.setViewTextSize(dateView, fontSizes.getMessageViewDate());

        fontSizes.setViewTextSize(fromView, fontSizes.getMessageViewSender());

        fontSizes.setViewTextSize(toView, fontSizes.getMessageViewRecipients());

        fontSizes.setViewTextSize(toCountView, fontSizes.getMessageViewRecipients());



        subjectView.setOnClickListener(this);

        subjectView.setOnLongClickListener(this);

app/ui/legacy/src/main/res/values-ar/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -605,9 +605,6 @@ 
  <string name="font_size_message_list_preview">معاينة</string>

  <string name="font_size_message_view">رسائل</string>

  <string name="font_size_message_view_sender">مُرسِل</string>

  <string name="font_size_message_view_to">إلى</string>

  <string name="font_size_message_view_cc">نسخة</string>

  <string name="font_size_message_view_additional_headers">ترويسات إضافية</string>

  <string name="font_size_message_view_subject">العنوان</string>

  <string name="font_size_message_view_date">الوقت والتاريخ</string>

  <string name="font_size_message_view_content">نصّ الرسالة</string>