From 5e9b6642a57ba5aafbe5ebd691c1b8822339c004 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 24 Aug 2021 11:13:53 +0200 Subject: [PATCH] Moved reply-to-all send option down --- .../faircode/email/FragmentOptionsSend.java | 25 +++++----- .../main/res/layout/fragment_options_send.xml | 48 +++++++++---------- app/src/main/res/values/strings.xml | 4 +- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index cf5f892be1..c1d23bf6b9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -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); diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml index 0bc8b8f539..131365dca9 100644 --- a/app/src/main/res/layout/fragment_options_send.xml +++ b/app/src/main/res/layout/fragment_options_send.xml @@ -264,28 +264,6 @@ android:textAppearance="@style/TextAppearance.AppCompat.Small" /> - - - - + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3eaa26b84..59b92d421c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -351,6 +351,7 @@ Alternative reply/forward prefix Show reminders Delay sending messages + Long press answer button to reply to all Show non-obtrusive send delayed icon Default font @@ -511,7 +512,6 @@ Automatically remove stars from messages on moving messages Automatically make starred messages important Reset importance on moving messages - Long press answer button to reply to all Default snooze time Manage notifications @@ -657,8 +657,8 @@ If disabled, only email addresses will be used when selecting contacts In addition to contacts provided by Android. Contact data will be stored for newly sent or received messages only when enabled. Insert \'-- \' between the text and the signature - If disabled, long pressing the answer button will answer the sender Show a warning when the message text or the subject is empty or when an attachment might be missing + If disabled, long pressing the answer button will answer the sender The email server could still add the messages to the sent message folder Metered connections are generally mobile connections or paid Wi-Fi hotspots