mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 07:01:05 +00:00
Code Issues Releases Wiki Activity

Moved reply-to-all send option down

Browse source
This commit is contained in:
M66B 2021-08-24 11:13:53 +02:00
parent dc6e19946d
commit 5e9b6642a5
3 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
View file

@ -61,9 +61,9 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
private SwitchCompat swPrefixOnce;
private RadioGroup rgRe;
private RadioGroup rgFwd;
private SwitchCompat swReplyAll;
private SwitchCompat swSendReminders;
private Spinner spSendDelayed;
private SwitchCompat swReplyAll;
private SwitchCompat swSendPending;
private Spinner spComposeFont;
@ -93,8 +93,9 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
private final static String[] RESET_OPTIONS = new String[]{
"keyboard", "keyboard_no_fullscreen",
"suggest_names", "suggest_sent", "suggested_received", "suggest_frequently",
"alt_re", "alt_fwd", "reply_all",
"send_reminders", "send_delayed", "send_pending",
"alt_re", "alt_fwd",
"send_reminders", "send_delayed",
"reply_all", "send_pending",
"compose_font", "prefix_once", "separate_reply", "extended_reply", "write_below", "quote_reply", "quote_limit", "resize_reply",
"signature_location", "signature_new", "signature_reply", "signature_forward",
"discard_delete", "reply_move",
@ -122,9 +123,9 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
swPrefixOnce = view.findViewById(R.id.swPrefixOnce);
rgRe = view.findViewById(R.id.rgRe);
rgFwd = view.findViewById(R.id.rgFwd);
swReplyAll = view.findViewById(R.id.swReplyAll);
swSendReminders = view.findViewById(R.id.swSendReminders);
spSendDelayed = view.findViewById(R.id.spSendDelayed);
swReplyAll = view.findViewById(R.id.swReplyAll);
swSendPending = view.findViewById(R.id.swSendPending);
spComposeFont = view.findViewById(R.id.spComposeFont);
@ -244,13 +245,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
}
});
swReplyAll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("reply_all", checked).apply();
}
});
swSendReminders.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -271,6 +265,13 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
}
});
swReplyAll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("reply_all", checked).apply();
}
});
swSendPending.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -526,7 +527,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
rgRe.check(prefs.getBoolean("alt_re", false) ? R.id.rbRe2 : R.id.rbRe1);
rgFwd.check(prefs.getBoolean("alt_fwd", false) ? R.id.rbFwd2 : R.id.rbFwd1);
swReplyAll.setChecked(prefs.getBoolean("reply_all", false));
swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
int send_delayed = prefs.getInt("send_delayed", 0);
@ -537,6 +537,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
break;
}
swReplyAll.setChecked(prefs.getBoolean("reply_all", false));
swSendPending.setChecked(prefs.getBoolean("send_pending", true));
boolean monospaced = prefs.getBoolean("monospaced", false);

48
app/src/main/res/layout/fragment_options_send.xml
View file

@ -264,28 +264,6 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
</RadioGroup>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swReplyAll"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_reply_all"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rgFwd"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvReplyAll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_reply_all_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swReplyAll" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swSendReminders"
android:layout_width="0dp"
@ -295,7 +273,7 @@
android:text="@string/title_advanced_send_reminders"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvReplyAll"
app:layout_constraintTop_toBottomOf="@id/rgFwd"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
@ -331,6 +309,28 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSendDelayed" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swReplyAll"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_reply_all"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spSendDelayed"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvReplyAll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_reply_all_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swReplyAll" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swSendPending"
android:layout_width="0dp"
@ -340,7 +340,7 @@
android:text="@string/title_advanced_send_pending"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spSendDelayed"
app:layout_constraintTop_toBottomOf="@id/tvReplyAll"
app:switchPadding="12dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

4
app/src/main/res/values/strings.xml
View file

@ -351,6 +351,7 @@
<string name="title_advanced_alt_re_fwd">Alternative reply/forward prefix</string>
<string name="title_advanced_send_reminders">Show reminders</string>
<string name="title_advanced_send_delayed">Delay sending messages</string>
<string name="title_advanced_reply_all">Long press answer button to reply to all</string>
<string name="title_advanced_send_pending">Show non-obtrusive send delayed icon</string>
<string name="title_advanced_compose_font">Default font</string>
@ -511,7 +512,6 @@
<string name="title_advanced_autounstar">Automatically remove stars from messages on moving messages</string>
<string name="title_advanced_auto_important">Automatically make starred messages important</string>
<string name="title_advanced_reset_importance">Reset importance on moving messages</string>
<string name="title_advanced_reply_all">Long press answer button to reply to all</string>
<string name="title_advanced_default_snooze">Default snooze time</string>
<string name="title_advanced_notifications">Manage notifications</string>
@ -657,8 +657,8 @@
<string name="title_advanced_suggest_names_hint">If disabled, only email addresses will be used when selecting contacts</string>
<string name="title_advanced_suggest_local_hint">In addition to contacts provided by Android. Contact data will be stored for newly sent or received messages only when enabled.</string>
<string name="title_advanced_usenet_hint">Insert \'-- \' between the text and the signature</string>
<string name="title_advanced_reply_all_hint">If disabled, long pressing the answer button will answer the sender</string>
<string name="title_advanced_send_reminders_hint">Show a warning when the message text or the subject is empty or when an attachment might be missing</string>
<string name="title_advanced_reply_all_hint">If disabled, long pressing the answer button will answer the sender</string>
<string name="title_advanced_reply_move_hint">The email server could still add the messages to the sent message folder</string>
<string name="title_advanced_metered_hint">Metered connections are generally mobile connections or paid Wi-Fi hotspots</string>