mirror of https://github.com/M66B/FairEmail.git
Reorganized send settings
This commit is contained in:
parent
36241f5d5b
commit
4fee7ecfdc
|
@ -65,19 +65,21 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
private Button btnLocalContacts;
|
private Button btnLocalContacts;
|
||||||
private Button btnBlockedSenders;
|
private Button btnBlockedSenders;
|
||||||
private SwitchCompat swAutoIdentity;
|
private SwitchCompat swAutoIdentity;
|
||||||
private SwitchCompat swPrefixOnce;
|
|
||||||
private SwitchCompat swPrefixCount;
|
|
||||||
private RadioGroup rgRe;
|
|
||||||
private RadioGroup rgFwd;
|
|
||||||
private SwitchCompat swSendChips;
|
private SwitchCompat swSendChips;
|
||||||
private SwitchCompat swSendReminders;
|
private SwitchCompat swSendReminders;
|
||||||
|
private SwitchCompat swSendPending;
|
||||||
|
private SwitchCompat swAutoSaveParagraph;
|
||||||
|
private SwitchCompat swAutoSaveDot;
|
||||||
|
private SwitchCompat swDiscardDelete;
|
||||||
private Spinner spSendDelayed;
|
private Spinner spSendDelayed;
|
||||||
private Spinner spAnswerAction;
|
private Spinner spAnswerAction;
|
||||||
private Button btnSound;
|
private Button btnSound;
|
||||||
|
|
||||||
private SwitchCompat swAutoSaveParagraph;
|
|
||||||
private SwitchCompat swAutoSaveDot;
|
|
||||||
private Spinner spComposeFont;
|
private Spinner spComposeFont;
|
||||||
|
private SwitchCompat swPrefixOnce;
|
||||||
|
private SwitchCompat swPrefixCount;
|
||||||
|
private RadioGroup rgRe;
|
||||||
|
private RadioGroup rgFwd;
|
||||||
private SwitchCompat swSeparateReply;
|
private SwitchCompat swSeparateReply;
|
||||||
private SwitchCompat swExtendedReply;
|
private SwitchCompat swExtendedReply;
|
||||||
private SwitchCompat swWriteBelow;
|
private SwitchCompat swWriteBelow;
|
||||||
|
@ -90,8 +92,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
private SwitchCompat swSignatureReplyOnce;
|
private SwitchCompat swSignatureReplyOnce;
|
||||||
private SwitchCompat swSignatureForward;
|
private SwitchCompat swSignatureForward;
|
||||||
private Button btnEditSignature;
|
private Button btnEditSignature;
|
||||||
private SwitchCompat swDiscardDelete;
|
|
||||||
private SwitchCompat swReplyMove;
|
|
||||||
|
|
||||||
private SwitchCompat swAttachNew;
|
private SwitchCompat swAttachNew;
|
||||||
private SwitchCompat swAutoLink;
|
private SwitchCompat swAutoLink;
|
||||||
|
@ -103,20 +103,22 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
private Spinner spReceiptType;
|
private Spinner spReceiptType;
|
||||||
private SwitchCompat swReceiptLegacy;
|
private SwitchCompat swReceiptLegacy;
|
||||||
private SwitchCompat swLookupMx;
|
private SwitchCompat swLookupMx;
|
||||||
private SwitchCompat swSendPending;
|
private SwitchCompat swReplyMove;
|
||||||
|
|
||||||
private final static String[] RESET_OPTIONS = new String[]{
|
private final static String[] RESET_OPTIONS = new String[]{
|
||||||
"keyboard", "keyboard_no_fullscreen",
|
"keyboard", "keyboard_no_fullscreen",
|
||||||
"suggest_names", "suggest_sent", "suggested_received", "suggest_frequently", "auto_identity",
|
"suggest_names", "suggest_sent", "suggested_received", "suggest_frequently", "auto_identity",
|
||||||
"alt_re", "alt_fwd",
|
"send_reminders", "send_chips", "send_pending",
|
||||||
"send_reminders", "send_chips", "send_delayed",
|
"auto_save_paragraph", "auto_save_dot", "discard_delete",
|
||||||
"answer_action", "sound_sent",
|
"send_delayed",
|
||||||
"auto_save_paragraph", "auto_save_dot",
|
"answer_action",
|
||||||
"compose_font", "prefix_once", "prefix_count", "separate_reply", "extended_reply", "write_below", "quote_reply", "quote_limit", "resize_reply",
|
"sound_sent",
|
||||||
|
"compose_font",
|
||||||
|
"prefix_once", "prefix_count", "alt_re", "alt_fwd",
|
||||||
|
"separate_reply", "extended_reply", "write_below", "quote_reply", "quote_limit", "resize_reply",
|
||||||
"signature_location", "signature_new", "signature_reply", "signature_reply_once", "signature_forward",
|
"signature_location", "signature_new", "signature_reply", "signature_reply_once", "signature_forward",
|
||||||
"discard_delete", "reply_move",
|
|
||||||
"attach_new", "auto_link", "plain_only", "format_flowed", "usenet_signature", "remove_signatures",
|
"attach_new", "auto_link", "plain_only", "format_flowed", "usenet_signature", "remove_signatures",
|
||||||
"receipt_default", "receipt_type", "receipt_legacy", "lookup_mx", "send_pending"
|
"receipt_default", "receipt_type", "receipt_legacy", "lookup_mx", "reply_move"
|
||||||
};
|
};
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -139,19 +141,21 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
btnLocalContacts = view.findViewById(R.id.btnLocalContacts);
|
btnLocalContacts = view.findViewById(R.id.btnLocalContacts);
|
||||||
btnBlockedSenders = view.findViewById(R.id.btnBlockedSenders);
|
btnBlockedSenders = view.findViewById(R.id.btnBlockedSenders);
|
||||||
swAutoIdentity = view.findViewById(R.id.swAutoIdentity);
|
swAutoIdentity = view.findViewById(R.id.swAutoIdentity);
|
||||||
swPrefixOnce = view.findViewById(R.id.swPrefixOnce);
|
|
||||||
swPrefixCount = view.findViewById(R.id.swPrefixCount);
|
|
||||||
rgRe = view.findViewById(R.id.rgRe);
|
|
||||||
rgFwd = view.findViewById(R.id.rgFwd);
|
|
||||||
swSendChips = view.findViewById(R.id.swSendChips);
|
swSendChips = view.findViewById(R.id.swSendChips);
|
||||||
swSendReminders = view.findViewById(R.id.swSendReminders);
|
swSendReminders = view.findViewById(R.id.swSendReminders);
|
||||||
|
swSendPending = view.findViewById(R.id.swSendPending);
|
||||||
|
swAutoSaveParagraph = view.findViewById(R.id.swAutoSaveParagraph);
|
||||||
|
swAutoSaveDot = view.findViewById(R.id.swAutoSaveDot);
|
||||||
|
swDiscardDelete = view.findViewById(R.id.swDiscardDelete);
|
||||||
spSendDelayed = view.findViewById(R.id.spSendDelayed);
|
spSendDelayed = view.findViewById(R.id.spSendDelayed);
|
||||||
spAnswerAction = view.findViewById(R.id.spAnswerAction);
|
spAnswerAction = view.findViewById(R.id.spAnswerAction);
|
||||||
btnSound = view.findViewById(R.id.btnSound);
|
btnSound = view.findViewById(R.id.btnSound);
|
||||||
|
|
||||||
swAutoSaveParagraph = view.findViewById(R.id.swAutoSaveParagraph);
|
|
||||||
swAutoSaveDot = view.findViewById(R.id.swAutoSaveDot);
|
|
||||||
spComposeFont = view.findViewById(R.id.spComposeFont);
|
spComposeFont = view.findViewById(R.id.spComposeFont);
|
||||||
|
swPrefixOnce = view.findViewById(R.id.swPrefixOnce);
|
||||||
|
swPrefixCount = view.findViewById(R.id.swPrefixCount);
|
||||||
|
rgRe = view.findViewById(R.id.rgRe);
|
||||||
|
rgFwd = view.findViewById(R.id.rgFwd);
|
||||||
swSeparateReply = view.findViewById(R.id.swSeparateReply);
|
swSeparateReply = view.findViewById(R.id.swSeparateReply);
|
||||||
swExtendedReply = view.findViewById(R.id.swExtendedReply);
|
swExtendedReply = view.findViewById(R.id.swExtendedReply);
|
||||||
swWriteBelow = view.findViewById(R.id.swWriteBelow);
|
swWriteBelow = view.findViewById(R.id.swWriteBelow);
|
||||||
|
@ -164,8 +168,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
swSignatureReplyOnce = view.findViewById(R.id.swSignatureReplyOnce);
|
swSignatureReplyOnce = view.findViewById(R.id.swSignatureReplyOnce);
|
||||||
swSignatureForward = view.findViewById(R.id.swSignatureForward);
|
swSignatureForward = view.findViewById(R.id.swSignatureForward);
|
||||||
btnEditSignature = view.findViewById(R.id.btnEditSignature);
|
btnEditSignature = view.findViewById(R.id.btnEditSignature);
|
||||||
swDiscardDelete = view.findViewById(R.id.swDiscardDelete);
|
|
||||||
swReplyMove = view.findViewById(R.id.swReplyMove);
|
|
||||||
|
|
||||||
swAttachNew = view.findViewById(R.id.swAttachNew);
|
swAttachNew = view.findViewById(R.id.swAttachNew);
|
||||||
swAutoLink = view.findViewById(R.id.swAutoLink);
|
swAutoLink = view.findViewById(R.id.swAutoLink);
|
||||||
|
@ -177,7 +179,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
spReceiptType = view.findViewById(R.id.spReceiptType);
|
spReceiptType = view.findViewById(R.id.spReceiptType);
|
||||||
swReceiptLegacy = view.findViewById(R.id.swReceiptLegacy);
|
swReceiptLegacy = view.findViewById(R.id.swReceiptLegacy);
|
||||||
swLookupMx = view.findViewById(R.id.swLookupMx);
|
swLookupMx = view.findViewById(R.id.swLookupMx);
|
||||||
swSendPending = view.findViewById(R.id.swSendPending);
|
swReplyMove = view.findViewById(R.id.swReplyMove);
|
||||||
|
|
||||||
List<StyleHelper.FontDescriptor> fonts = StyleHelper.getFonts(getContext());
|
List<StyleHelper.FontDescriptor> fonts = StyleHelper.getFonts(getContext());
|
||||||
|
|
||||||
|
@ -277,35 +279,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
swPrefixOnce.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
|
||||||
prefs.edit().putBoolean("prefix_once", checked).apply();
|
|
||||||
swPrefixCount.setEnabled(checked);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
swPrefixCount.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
|
||||||
prefs.edit().putBoolean("prefix_count", checked).apply();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
rgRe.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(RadioGroup group, int checkedId) {
|
|
||||||
prefs.edit().putBoolean("alt_re", checkedId == R.id.rbRe2).apply();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
rgFwd.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(RadioGroup group, int checkedId) {
|
|
||||||
prefs.edit().putBoolean("alt_fwd", checkedId == R.id.rbFwd2).apply();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
swSendChips.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
swSendChips.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
@ -320,6 +293,34 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
swSendPending.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
prefs.edit().putBoolean("send_pending", checked).apply();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
swAutoSaveParagraph.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
prefs.edit().putBoolean("auto_save_paragraph", checked).apply();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
swAutoSaveDot.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
prefs.edit().putBoolean("auto_save_dot", checked).apply();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
swDiscardDelete.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
prefs.edit().putBoolean("discard_delete", checked).apply();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
spSendDelayed.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
spSendDelayed.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
|
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
|
||||||
|
@ -360,20 +361,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
swAutoSaveParagraph.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
|
||||||
prefs.edit().putBoolean("auto_save_paragraph", checked).apply();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
swAutoSaveDot.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
|
||||||
prefs.edit().putBoolean("auto_save_dot", checked).apply();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
spComposeFont.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
spComposeFont.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
|
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
|
||||||
|
@ -389,6 +376,35 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
swPrefixOnce.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
prefs.edit().putBoolean("prefix_once", checked).apply();
|
||||||
|
swPrefixCount.setEnabled(checked);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
swPrefixCount.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
prefs.edit().putBoolean("prefix_count", checked).apply();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
rgRe.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(RadioGroup group, int checkedId) {
|
||||||
|
prefs.edit().putBoolean("alt_re", checkedId == R.id.rbRe2).apply();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
rgFwd.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(RadioGroup group, int checkedId) {
|
||||||
|
prefs.edit().putBoolean("alt_fwd", checkedId == R.id.rbFwd2).apply();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
swSeparateReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
swSeparateReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
@ -480,20 +496,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
swDiscardDelete.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
|
||||||
prefs.edit().putBoolean("discard_delete", checked).apply();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
swReplyMove.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
|
||||||
prefs.edit().putBoolean("reply_move", checked).apply();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
swAttachNew.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
swAttachNew.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
@ -571,10 +573,10 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
swSendPending.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
swReplyMove.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
prefs.edit().putBoolean("send_pending", checked).apply();
|
prefs.edit().putBoolean("reply_move", checked).apply();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -640,15 +642,12 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
swSuggestFrequently.setChecked(prefs.getBoolean("suggest_frequently", false));
|
swSuggestFrequently.setChecked(prefs.getBoolean("suggest_frequently", false));
|
||||||
swSuggestFrequently.setEnabled(swSuggestSent.isChecked() || swSuggestReceived.isChecked());
|
swSuggestFrequently.setEnabled(swSuggestSent.isChecked() || swSuggestReceived.isChecked());
|
||||||
swAutoIdentity.setChecked(prefs.getBoolean("auto_identity", true));
|
swAutoIdentity.setChecked(prefs.getBoolean("auto_identity", true));
|
||||||
|
|
||||||
swPrefixOnce.setChecked(prefs.getBoolean("prefix_once", true));
|
|
||||||
swPrefixCount.setChecked(prefs.getBoolean("prefix_count", false));
|
|
||||||
swPrefixCount.setEnabled(swPrefixOnce.isChecked());
|
|
||||||
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);
|
|
||||||
|
|
||||||
swSendChips.setChecked(prefs.getBoolean("send_chips", true));
|
swSendChips.setChecked(prefs.getBoolean("send_chips", true));
|
||||||
swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
|
swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
|
||||||
|
swSendPending.setChecked(prefs.getBoolean("send_pending", true));
|
||||||
|
swAutoSaveParagraph.setChecked(prefs.getBoolean("auto_save_paragraph", true));
|
||||||
|
swAutoSaveDot.setChecked(prefs.getBoolean("auto_save_dot", false));
|
||||||
|
swDiscardDelete.setChecked(prefs.getBoolean("discard_delete", true));
|
||||||
|
|
||||||
int send_delayed = prefs.getInt("send_delayed", 0);
|
int send_delayed = prefs.getInt("send_delayed", 0);
|
||||||
int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues);
|
int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues);
|
||||||
|
@ -667,9 +666,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
swAutoSaveParagraph.setChecked(prefs.getBoolean("auto_save_paragraph", true));
|
|
||||||
swAutoSaveDot.setChecked(prefs.getBoolean("auto_save_dot", false));
|
|
||||||
|
|
||||||
String compose_font = prefs.getString("compose_font", "");
|
String compose_font = prefs.getString("compose_font", "");
|
||||||
List<StyleHelper.FontDescriptor> fonts = StyleHelper.getFonts(getContext());
|
List<StyleHelper.FontDescriptor> fonts = StyleHelper.getFonts(getContext());
|
||||||
for (int pos = 0; pos < fonts.size(); pos++) {
|
for (int pos = 0; pos < fonts.size(); pos++) {
|
||||||
|
@ -680,6 +676,12 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
swPrefixOnce.setChecked(prefs.getBoolean("prefix_once", true));
|
||||||
|
swPrefixCount.setChecked(prefs.getBoolean("prefix_count", false));
|
||||||
|
swPrefixCount.setEnabled(swPrefixOnce.isChecked());
|
||||||
|
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);
|
||||||
|
|
||||||
swSeparateReply.setChecked(prefs.getBoolean("separate_reply", false));
|
swSeparateReply.setChecked(prefs.getBoolean("separate_reply", false));
|
||||||
swExtendedReply.setChecked(prefs.getBoolean("extended_reply", false));
|
swExtendedReply.setChecked(prefs.getBoolean("extended_reply", false));
|
||||||
swWriteBelow.setChecked(prefs.getBoolean("write_below", false));
|
swWriteBelow.setChecked(prefs.getBoolean("write_below", false));
|
||||||
|
@ -695,8 +697,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
swSignatureReplyOnce.setChecked(prefs.getBoolean("signature_reply_once", false));
|
swSignatureReplyOnce.setChecked(prefs.getBoolean("signature_reply_once", false));
|
||||||
swSignatureReplyOnce.setEnabled(swSignatureReply.isChecked());
|
swSignatureReplyOnce.setEnabled(swSignatureReply.isChecked());
|
||||||
swSignatureForward.setChecked(prefs.getBoolean("signature_forward", true));
|
swSignatureForward.setChecked(prefs.getBoolean("signature_forward", true));
|
||||||
swDiscardDelete.setChecked(prefs.getBoolean("discard_delete", true));
|
|
||||||
swReplyMove.setChecked(prefs.getBoolean("reply_move", false));
|
|
||||||
|
|
||||||
swAttachNew.setChecked(prefs.getBoolean("attach_new", true));
|
swAttachNew.setChecked(prefs.getBoolean("attach_new", true));
|
||||||
swAutoLink.setChecked(prefs.getBoolean("auto_link", false));
|
swAutoLink.setChecked(prefs.getBoolean("auto_link", false));
|
||||||
|
@ -712,7 +712,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
|
||||||
swReceiptLegacy.setChecked(prefs.getBoolean("receipt_legacy", false));
|
swReceiptLegacy.setChecked(prefs.getBoolean("receipt_legacy", false));
|
||||||
|
|
||||||
swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
|
swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
|
||||||
swSendPending.setChecked(prefs.getBoolean("send_pending", true));
|
swReplyMove.setChecked(prefs.getBoolean("reply_move", false));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -232,6 +232,197 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/swAutoIdentity" />
|
app:layout_constraintTop_toBottomOf="@id/swAutoIdentity" />
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
android:id="@+id/swSendChips"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:checked="true"
|
||||||
|
android:text="@string/title_advanced_send_chips"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvAutoIdentity"
|
||||||
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
android:id="@+id/swSendReminders"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:checked="true"
|
||||||
|
android:text="@string/title_advanced_send_reminders"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/swSendChips"
|
||||||
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvSendReminders"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="48dp"
|
||||||
|
android:text="@string/title_advanced_send_reminders_hint"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textStyle="italic"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/swSendReminders" />
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
android:id="@+id/swSendPending"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:checked="true"
|
||||||
|
android:text="@string/title_advanced_send_pending"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvSendReminders"
|
||||||
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
android:id="@+id/swAutoSaveParagraph"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:checked="true"
|
||||||
|
android:text="@string/title_advanced_auto_save_paragraph"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/swSendPending"
|
||||||
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
android:id="@+id/swAutoSaveDot"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:text="@string/title_advanced_auto_save_dot"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/swAutoSaveParagraph"
|
||||||
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
android:id="@+id/swDiscardDelete"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:text="@string/title_advanced_discard_delete"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/swAutoSaveDot"
|
||||||
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvSendDelayed"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:layout_marginEnd="48dp"
|
||||||
|
android:text="@string/title_advanced_send_delayed"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/swDiscardDelete" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spSendDelayed"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:entries="@array/sendDelayedNames"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvSendDelayed" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvAnswerAction"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:layout_marginEnd="48dp"
|
||||||
|
android:text="@string/title_advanced_answer_action"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/spSendDelayed" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spAnswerAction"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:entries="@array/answerNames"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvAnswerAction" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnSound"
|
||||||
|
style="?android:attr/buttonStyleSmall"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:drawableEnd="@drawable/twotone_audiotrack_24"
|
||||||
|
android:drawablePadding="6dp"
|
||||||
|
android:text="@string/title_advanced_sound"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/spAnswerAction" />
|
||||||
|
</eu.faircode.email.ConstraintLayoutEx>
|
||||||
|
</androidx.cardview.widget.CardView>
|
||||||
|
|
||||||
|
<androidx.cardview.widget.CardView
|
||||||
|
android:id="@+id/cardMessage"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="3dp"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
app:cardBackgroundColor="?attr/colorCardBackground"
|
||||||
|
app:cardCornerRadius="6dp"
|
||||||
|
app:cardElevation="0dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/cardGeneral">
|
||||||
|
|
||||||
|
<eu.faircode.email.ConstraintLayoutEx
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingHorizontal="6dp"
|
||||||
|
android:paddingVertical="12dp">
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvCaptionMessage"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/title_advanced_caption_message"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvComposeFont"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:layout_marginEnd="48dp"
|
||||||
|
android:text="@string/title_advanced_compose_font"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvCaptionMessage" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spComposeFont"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:entries="@array/fontNameNames"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvComposeFont" />
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
android:id="@+id/swPrefixOnce"
|
android:id="@+id/swPrefixOnce"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -241,7 +432,7 @@
|
||||||
android:text="@string/title_advanced_prefix_once"
|
android:text="@string/title_advanced_prefix_once"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvAutoIdentity"
|
app:layout_constraintTop_toBottomOf="@id/spComposeFont"
|
||||||
app:switchPadding="12dp" />
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
@ -325,174 +516,6 @@
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
|
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
|
||||||
</RadioGroup>
|
</RadioGroup>
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
|
||||||
android:id="@+id/swSendChips"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:checked="true"
|
|
||||||
android:text="@string/title_advanced_send_chips"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/rgFwd"
|
|
||||||
app:switchPadding="12dp" />
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
|
||||||
android:id="@+id/swSendReminders"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:checked="true"
|
|
||||||
android:text="@string/title_advanced_send_reminders"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/swSendChips"
|
|
||||||
app:switchPadding="12dp" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvSendReminders"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="48dp"
|
|
||||||
android:text="@string/title_advanced_send_reminders_hint"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textStyle="italic"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/swSendReminders" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvSendDelayed"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:layout_marginEnd="48dp"
|
|
||||||
android:text="@string/title_advanced_send_delayed"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvSendReminders" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/spSendDelayed"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:entries="@array/sendDelayedNames"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvSendDelayed" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvAnswerAction"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:layout_marginEnd="48dp"
|
|
||||||
android:text="@string/title_advanced_answer_action"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/spSendDelayed" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/spAnswerAction"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:entries="@array/answerNames"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvAnswerAction" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnSound"
|
|
||||||
style="?android:attr/buttonStyleSmall"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:drawableEnd="@drawable/twotone_audiotrack_24"
|
|
||||||
android:drawablePadding="6dp"
|
|
||||||
android:text="@string/title_advanced_sound"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/spAnswerAction" />
|
|
||||||
</eu.faircode.email.ConstraintLayoutEx>
|
|
||||||
</androidx.cardview.widget.CardView>
|
|
||||||
|
|
||||||
<androidx.cardview.widget.CardView
|
|
||||||
android:id="@+id/cardMessage"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="3dp"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
app:cardBackgroundColor="?attr/colorCardBackground"
|
|
||||||
app:cardCornerRadius="6dp"
|
|
||||||
app:cardElevation="0dp"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/cardGeneral">
|
|
||||||
|
|
||||||
<eu.faircode.email.ConstraintLayoutEx
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingHorizontal="6dp"
|
|
||||||
android:paddingVertical="12dp">
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvCaptionMessage"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="@string/title_advanced_caption_message"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
|
||||||
android:id="@+id/swAutoSaveParagraph"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:checked="true"
|
|
||||||
android:text="@string/title_advanced_auto_save_paragraph"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvCaptionMessage"
|
|
||||||
app:switchPadding="12dp" />
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
|
||||||
android:id="@+id/swAutoSaveDot"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_advanced_auto_save_dot"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/swAutoSaveParagraph"
|
|
||||||
app:switchPadding="12dp" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvComposeFont"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:layout_marginEnd="48dp"
|
|
||||||
android:text="@string/title_advanced_compose_font"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/swAutoSaveDot" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/spComposeFont"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:entries="@array/fontNameNames"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvComposeFont" />
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
android:id="@+id/swSeparateReply"
|
android:id="@+id/swSeparateReply"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -501,7 +524,7 @@
|
||||||
android:text="@string/title_advanced_separate_reply"
|
android:text="@string/title_advanced_separate_reply"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/spComposeFont"
|
app:layout_constraintTop_toBottomOf="@id/rgFwd"
|
||||||
app:switchPadding="12dp" />
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
|
@ -644,39 +667,6 @@
|
||||||
android:text="@string/title_edit_signature"
|
android:text="@string/title_edit_signature"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/swSignatureForward" />
|
app:layout_constraintTop_toBottomOf="@id/swSignatureForward" />
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
|
||||||
android:id="@+id/swDiscardDelete"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_advanced_discard_delete"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/btnEditSignature"
|
|
||||||
app:switchPadding="12dp" />
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
|
||||||
android:id="@+id/swReplyMove"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_advanced_reply_move"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/swDiscardDelete"
|
|
||||||
app:switchPadding="12dp" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvReplyMoveHint"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="48dp"
|
|
||||||
android:text="@string/title_advanced_reply_move_hint"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textStyle="italic"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/swReplyMove" />
|
|
||||||
</eu.faircode.email.ConstraintLayoutEx>
|
</eu.faircode.email.ConstraintLayoutEx>
|
||||||
</androidx.cardview.widget.CardView>
|
</androidx.cardview.widget.CardView>
|
||||||
|
|
||||||
|
@ -874,16 +864,26 @@
|
||||||
app:layout_constraintTop_toBottomOf="@id/swLookupMx" />
|
app:layout_constraintTop_toBottomOf="@id/swLookupMx" />
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
android:id="@+id/swSendPending"
|
android:id="@+id/swReplyMove"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
android:checked="true"
|
android:text="@string/title_advanced_reply_move"
|
||||||
android:text="@string/title_advanced_send_pending"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvCheckMxHint"
|
app:layout_constraintTop_toBottomOf="@id/tvCheckMxHint"
|
||||||
app:switchPadding="12dp" />
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvReplyMoveHint"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="48dp"
|
||||||
|
android:text="@string/title_advanced_reply_move_hint"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textStyle="italic"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/swReplyMove" />
|
||||||
</eu.faircode.email.ConstraintLayoutEx>
|
</eu.faircode.email.ConstraintLayoutEx>
|
||||||
</androidx.cardview.widget.CardView>
|
</androidx.cardview.widget.CardView>
|
||||||
</eu.faircode.email.ConstraintLayoutEx>
|
</eu.faircode.email.ConstraintLayoutEx>
|
||||||
|
|
Loading…
Reference in New Issue