msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Revert "Added option to disable priority indicator"

Browse Source 
This reverts commit c687019c8c.
pull/213/head
M66B 11 months ago
parent c687019c8c
commit e3619e3b24
5 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File

17
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -291,7 +291,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private String subject_ellipsize;
private boolean show_filtered;
private boolean priority_indicator;
private boolean keywords_header;
private boolean labels_header;
private boolean flags;
@ -1383,15 +1382,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} else
ibAuth.setVisibility(View.GONE);
if (priority_indicator || outgoing) {
if (EntityMessage.PRIORITIY_HIGH.equals(message.ui_priority)) {
ibPriority.setImageLevel(message.ui_priority);
ibPriority.setVisibility(View.VISIBLE);
} else if (EntityMessage.PRIORITIY_LOW.equals(message.ui_priority)) {
ibPriority.setImageLevel(message.ui_priority);
ibPriority.setVisibility(View.VISIBLE);
} else
ibPriority.setVisibility(View.GONE);
if (EntityMessage.PRIORITIY_HIGH.equals(message.ui_priority)) {
ibPriority.setImageLevel(message.ui_priority);
ibPriority.setVisibility(View.VISIBLE);
} else if (EntityMessage.PRIORITIY_LOW.equals(message.ui_priority)) {
ibPriority.setImageLevel(message.ui_priority);
ibPriority.setVisibility(View.VISIBLE);
} else
ibPriority.setVisibility(View.GONE);
@ -7889,7 +7885,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
this.sender_ellipsize = prefs.getString("sender_ellipsize", "end");
this.subject_ellipsize = prefs.getString("subject_ellipsize", "full");
this.show_filtered = prefs.getBoolean("show_filtered", false);
this.priority_indicator = prefs.getBoolean("priority_indicator", true);
this.keywords_header = prefs.getBoolean("keywords_header", false);
this.labels_header = prefs.getBoolean("labels_header", true);
this.flags = prefs.getBoolean("flags", true);

2
app/src/main/java/eu/faircode/email/FragmentOptions.java
Unescape View File

@ -145,7 +145,7 @@ public class FragmentOptions extends FragmentBase {
"email_format", "prefer_contact", "only_contact", "distinguish_contacts", "show_recipients",
"font_size_sender", "sender_ellipsize",
"subject_top", "subject_italic", "highlight_subject", "font_size_subject", "subject_ellipsize",
"priority_indicator", "keywords_header", "labels_header", "flags", "flags_background", "preview", "preview_italic", "preview_lines", "align_header",
"keywords_header", "labels_header", "flags", "flags_background", "preview", "preview_italic", "preview_lines", "align_header",
"message_zoom", "overview_mode", "addresses", "button_extra", "attachments_alt", "thumbnails",
"contrast", "hyphenation", "display_font", "monospaced_pre",
"list_count", "bundled_fonts", "parse_classes",

12
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
Unescape View File

@ -150,7 +150,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
private Spinner spFontSizeSubject;
private Spinner spSubjectEllipsize;
private SwitchCompat swPriorityIndicator;
private SwitchCompat swKeywords;
private SwitchCompat swLabels;
private SwitchCompat swFlags;
@ -213,7 +212,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
"email_format", "prefer_contact", "only_contact", "distinguish_contacts", "show_recipients",
"font_size_sender", "sender_ellipsize",
"subject_top", "subject_italic", "highlight_subject", "font_size_subject", "subject_ellipsize",
"priority_indicator", "keywords_header", "labels_header", "flags", "flags_background",
"keywords_header", "labels_header", "flags", "flags_background",
"preview", "preview_italic", "preview_lines", "align_header",
"addresses", "hide_attachments",
"message_zoom", "editor_zoom", "overview_mode",
@ -322,7 +321,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
spFontSizeSubject = view.findViewById(R.id.spFontSizeSubject);
spSubjectEllipsize = view.findViewById(R.id.spSubjectEllipsize);
swPriorityIndicator = view.findViewById(R.id.swPriorityIndicator);
swKeywords = view.findViewById(R.id.swKeywords);
swLabels = view.findViewById(R.id.swLabels);
swFlags = view.findViewById(R.id.swFlags);
@ -1090,13 +1088,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
}
});
swPriorityIndicator.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("priority_indicator", checked).apply();
}
});
swKeywords.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -1591,7 +1582,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
break;
}
swPriorityIndicator.setChecked(prefs.getBoolean("priority_indicator", true));
swKeywords.setChecked(prefs.getBoolean("keywords_header", false));
swLabels.setChecked(prefs.getBoolean("labels_header", true));
swFlags.setChecked(prefs.getBoolean("flags", true));

13
app/src/main/res/layout/fragment_options_display.xml
Unescape View File

@ -1519,17 +1519,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSubjectEllipsizeRemark" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swPriorityIndicator"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_priority_indicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorOther"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swKeywords"
android:layout_width="0dp"
@ -1538,7 +1527,7 @@
android:text="@string/title_advanced_keywords"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swPriorityIndicator"
app:layout_constraintTop_toBottomOf="@id/vSeparatorOther"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat

1
app/src/main/res/values/strings.xml
Unescape View File

@ -600,7 +600,6 @@
<string name="title_advanced_compact_mode_remark">Compact mode only</string>
<string name="title_advanced_highlight_color">Highlight color</string>
<string name="title_advanced_priority_indicator">Show priority indicator</string>
<string name="title_advanced_keywords">Show keywords in message header</string>
<string name="title_advanced_labels">Show Gmail labels in message header</string>
<string name="title_advanced_flags">Show stars</string>

Write Preview
Loading…
Cancel
Save