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

Reorganized send settings

Browse Source
pull/176/head
M66B 5 years ago
parent ff6b65e721
commit 0794aaa3b7
3 changed files with 185 additions and 154 deletions
Show Stats Download Patch File Download Diff File

148
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
Unescape View File

@ -47,30 +47,32 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
private SwitchCompat swSuggestSent; private SwitchCompat swSuggestSent;
private SwitchCompat swSuggestReceived; private SwitchCompat swSuggestReceived;
private Button btnLocalContacts; private Button btnLocalContacts;
private SwitchCompat swSendReminders;
private Spinner spSendDelayed;
private SwitchCompat swPrefixOnce; private SwitchCompat swPrefixOnce;
private SwitchCompat swExtendedReply; private SwitchCompat swExtendedReply;
private SwitchCompat swQuoteReply; private SwitchCompat swQuoteReply;
private SwitchCompat swPlainOnly;
private SwitchCompat swFormatFlowed;
private Spinner spSignatureLocation; private Spinner spSignatureLocation;
private SwitchCompat swUsenetSignature;
private SwitchCompat swRemoveSignatures;
private SwitchCompat swResizeImages; private SwitchCompat swResizeImages;
private SwitchCompat swResizeAttachments; private SwitchCompat swResizeAttachments;
private Spinner spAutoResize; private Spinner spAutoResize;
private TextView tvAutoResize; private TextView tvAutoResize;
private SwitchCompat swSendReminders;
private SwitchCompat swPlainOnly;
private SwitchCompat swFormatFlowed;
private SwitchCompat swUsenetSignature;
private SwitchCompat swRemoveSignatures;
private SwitchCompat swReceipt; private SwitchCompat swReceipt;
private Spinner spReceiptType; private Spinner spReceiptType;
private SwitchCompat swLookupMx; private SwitchCompat swLookupMx;
private Spinner spSendDelayed;
private final static String[] RESET_OPTIONS = new String[]{ private final static String[] RESET_OPTIONS = new String[]{
"keyboard", "suggest_sent", "suggested_received", "keyboard", "suggest_sent", "suggested_received", "send_reminders", "send_delayed",
"prefix_once", "extended_reply", "quote_reply", "prefix_once", "extended_reply", "quote_reply", "signature_location",
"plain_only", "format_flowed", "signature_location", "usenet_signature", "remove_signatures",
"resize_images", "resize_attachments", "resize", "resize_images", "resize_attachments", "resize",
"send_reminders", "receipt_default", "receipt_type", "lookup_mx", "send_delayed" "plain_only", "format_flowed", "usenet_signature", "remove_signatures",
"receipt_default", "receipt_type", "lookup_mx"
}; };
@Override @Override
@ -87,23 +89,25 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
swSuggestSent = view.findViewById(R.id.swSuggestSent); swSuggestSent = view.findViewById(R.id.swSuggestSent);
swSuggestReceived = view.findViewById(R.id.swSuggestReceived); swSuggestReceived = view.findViewById(R.id.swSuggestReceived);
btnLocalContacts = view.findViewById(R.id.btnLocalContacts); btnLocalContacts = view.findViewById(R.id.btnLocalContacts);
swSendReminders = view.findViewById(R.id.swSendReminders);
spSendDelayed = view.findViewById(R.id.spSendDelayed);
swPrefixOnce = view.findViewById(R.id.swPrefixOnce); swPrefixOnce = view.findViewById(R.id.swPrefixOnce);
swExtendedReply = view.findViewById(R.id.swExtendedReply); swExtendedReply = view.findViewById(R.id.swExtendedReply);
swQuoteReply = view.findViewById(R.id.swQuoteReply); swQuoteReply = view.findViewById(R.id.swQuoteReply);
swPlainOnly = view.findViewById(R.id.swPlainOnly);
swFormatFlowed = view.findViewById(R.id.swFormatFlowed);
spSignatureLocation = view.findViewById(R.id.spSignatureLocation); spSignatureLocation = view.findViewById(R.id.spSignatureLocation);
swUsenetSignature = view.findViewById(R.id.swUsenetSignature);
swRemoveSignatures = view.findViewById(R.id.swRemoveSignatures);
swResizeImages = view.findViewById(R.id.swResizeImages); swResizeImages = view.findViewById(R.id.swResizeImages);
swResizeAttachments = view.findViewById(R.id.swResizeAttachments); swResizeAttachments = view.findViewById(R.id.swResizeAttachments);
spAutoResize = view.findViewById(R.id.spAutoResize); spAutoResize = view.findViewById(R.id.spAutoResize);
tvAutoResize = view.findViewById(R.id.tvAutoResize); tvAutoResize = view.findViewById(R.id.tvAutoResize);
swSendReminders = view.findViewById(R.id.swSendReminders);
swPlainOnly = view.findViewById(R.id.swPlainOnly);
swFormatFlowed = view.findViewById(R.id.swFormatFlowed);
swUsenetSignature = view.findViewById(R.id.swUsenetSignature);
swRemoveSignatures = view.findViewById(R.id.swRemoveSignatures);
swReceipt = view.findViewById(R.id.swReceipt); swReceipt = view.findViewById(R.id.swReceipt);
spReceiptType = view.findViewById(R.id.spReceiptType); spReceiptType = view.findViewById(R.id.spReceiptType);
swLookupMx = view.findViewById(R.id.swLookupMx); swLookupMx = view.findViewById(R.id.swLookupMx);
spSendDelayed = view.findViewById(R.id.spSendDelayed);
setOptions(); setOptions();
@ -140,38 +144,44 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
} }
}); });
swPrefixOnce.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swSendReminders.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("prefix_once", checked).apply(); prefs.edit().putBoolean("send_reminders", checked).apply();
} }
}); });
swExtendedReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { spSendDelayed.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
prefs.edit().putBoolean("extended_reply", checked).apply(); int[] values = getResources().getIntArray(R.array.sendDelayedValues);
prefs.edit().putInt("send_delayed", values[position]).apply();
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
prefs.edit().remove("send_delayed").apply();
} }
}); });
swQuoteReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swPrefixOnce.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("quote_reply", checked).apply(); prefs.edit().putBoolean("prefix_once", checked).apply();
} }
}); });
swPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swExtendedReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("plain_only", checked).apply(); prefs.edit().putBoolean("extended_reply", checked).apply();
} }
}); });
swFormatFlowed.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swQuoteReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("format_flowed", checked).apply(); prefs.edit().putBoolean("quote_reply", checked).apply();
} }
}); });
@ -187,20 +197,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
} }
}); });
swUsenetSignature.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("usenet_signature", checked).apply();
}
});
swRemoveSignatures.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("remove_signatures", checked).apply();
}
});
swResizeImages.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swResizeImages.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -231,49 +227,57 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
} }
}); });
swReceipt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("receipt_default", checked).apply(); prefs.edit().putBoolean("plain_only", checked).apply();
} }
}); });
spReceiptType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { swFormatFlowed.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putInt("receipt_type", position).apply(); prefs.edit().putBoolean("format_flowed", checked).apply();
} }
});
swUsenetSignature.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onNothingSelected(AdapterView<?> parent) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().remove("receipt_type").apply(); prefs.edit().putBoolean("usenet_signature", checked).apply();
} }
}); });
swSendReminders.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swRemoveSignatures.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("send_reminders", checked).apply(); prefs.edit().putBoolean("remove_signatures", checked).apply();
} }
}); });
swLookupMx.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swReceipt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("lookup_mx", checked).apply(); prefs.edit().putBoolean("receipt_default", checked).apply();
} }
}); });
spSendDelayed.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { spReceiptType.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) {
int[] values = getResources().getIntArray(R.array.sendDelayedValues); prefs.edit().putInt("receipt_type", position).apply();
prefs.edit().putInt("send_delayed", values[position]).apply();
} }
@Override @Override
public void onNothingSelected(AdapterView<?> parent) { public void onNothingSelected(AdapterView<?> parent) {
prefs.edit().remove("send_delayed").apply(); prefs.edit().remove("receipt_type").apply();
}
});
swLookupMx.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("lookup_mx", checked).apply();
} }
}); });
@ -326,18 +330,23 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
swKeyboard.setChecked(prefs.getBoolean("keyboard", true)); swKeyboard.setChecked(prefs.getBoolean("keyboard", true));
swSuggestSent.setChecked(prefs.getBoolean("suggest_sent", true)); swSuggestSent.setChecked(prefs.getBoolean("suggest_sent", true));
swSuggestReceived.setChecked(prefs.getBoolean("suggest_received", false)); swSuggestReceived.setChecked(prefs.getBoolean("suggest_received", false));
swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
int send_delayed = prefs.getInt("send_delayed", 0);
int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues);
for (int pos = 0; pos < sendDelayedValues.length; pos++)
if (sendDelayedValues[pos] == send_delayed) {
spSendDelayed.setSelection(pos);
break;
}
swPrefixOnce.setChecked(prefs.getBoolean("prefix_once", true)); swPrefixOnce.setChecked(prefs.getBoolean("prefix_once", true));
swExtendedReply.setChecked(prefs.getBoolean("extended_reply", false)); swExtendedReply.setChecked(prefs.getBoolean("extended_reply", false));
swQuoteReply.setChecked(prefs.getBoolean("quote_reply", true)); swQuoteReply.setChecked(prefs.getBoolean("quote_reply", true));
swPlainOnly.setChecked(prefs.getBoolean("plain_only", false));
swFormatFlowed.setChecked(prefs.getBoolean("format_flowed", false));
int signature_location = prefs.getInt("signature_location", 1); int signature_location = prefs.getInt("signature_location", 1);
spSignatureLocation.setSelection(signature_location); spSignatureLocation.setSelection(signature_location);
swUsenetSignature.setChecked(prefs.getBoolean("usenet_signature", false));
swRemoveSignatures.setChecked(prefs.getBoolean("remove_signatures", false));
swResizeImages.setChecked(prefs.getBoolean("resize_images", true)); swResizeImages.setChecked(prefs.getBoolean("resize_images", true));
swResizeAttachments.setChecked(prefs.getBoolean("resize_attachments", true)); swResizeAttachments.setChecked(prefs.getBoolean("resize_attachments", true));
@ -351,18 +360,15 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
} }
spAutoResize.setEnabled(swResizeImages.isChecked() || swResizeAttachments.isChecked()); spAutoResize.setEnabled(swResizeImages.isChecked() || swResizeAttachments.isChecked());
swSendReminders.setChecked(prefs.getBoolean("send_reminders", true)); swPlainOnly.setChecked(prefs.getBoolean("plain_only", false));
swFormatFlowed.setChecked(prefs.getBoolean("format_flowed", false));
swUsenetSignature.setChecked(prefs.getBoolean("usenet_signature", false));
swRemoveSignatures.setChecked(prefs.getBoolean("remove_signatures", false));
swReceipt.setChecked(prefs.getBoolean("receipt_default", false));
int receipt_type = prefs.getInt("receipt_type", 2); int receipt_type = prefs.getInt("receipt_type", 2);
spReceiptType.setSelection(receipt_type); spReceiptType.setSelection(receipt_type);
swReceipt.setChecked(prefs.getBoolean("receipt_default", false));
swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
int send_delayed = prefs.getInt("send_delayed", 0); swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues);
for (int pos = 0; pos < sendDelayedValues.length; pos++)
if (sendDelayedValues[pos] == send_delayed) {
spSendDelayed.setSelection(pos);
break;
}
} }
} }

190
app/src/main/res/layout/fragment_options_send.xml
Unescape View File

@ -101,60 +101,95 @@
app:layout_constraintTop_toBottomOf="@id/swSuggestReceived" /> app:layout_constraintTop_toBottomOf="@id/swSuggestReceived" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swPrefixOnce" android:id="@+id/swSendReminders"
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:checked="true"
android:text="@string/title_advanced_prefix_once" android:text="@string/title_advanced_send_reminders"
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/btnLocalContacts" app:layout_constraintTop_toBottomOf="@id/btnLocalContacts"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat <eu.faircode.email.FixedTextView
android:id="@+id/swExtendedReply" 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_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_extended_reply" 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_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swPrefixOnce" app:layout_constraintTop_toBottomOf="@id/tvSendReminders" />
app:switchPadding="12dp" />
<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/tvCaptionMessage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
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_toBottomOf="@+id/spSendDelayed" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swQuoteReply" android:id="@+id/swPrefixOnce"
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:checked="true"
android:text="@string/title_advanced_quote_reply" 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/swExtendedReply" app:layout_constraintTop_toBottomOf="@id/tvCaptionMessage"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swPlainOnly" android:id="@+id/swExtendedReply"
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:text="@string/title_advanced_plain_only" android:text="@string/title_advanced_extended_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/swQuoteReply" app:layout_constraintTop_toBottomOf="@id/swPrefixOnce"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swFormatFlowed" android:id="@+id/swQuoteReply"
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:text="@string/title_advanced_flow" android:checked="true"
android:text="@string/title_advanced_quote_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/swPlainOnly" app:layout_constraintTop_toBottomOf="@id/swExtendedReply"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
@ -168,7 +203,7 @@
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
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/swFormatFlowed" /> app:layout_constraintTop_toBottomOf="@id/swQuoteReply" />
<Spinner <Spinner
android:id="@+id/spSignatureLocation" android:id="@+id/spSignatureLocation"
@ -179,40 +214,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSignatureLocation" /> app:layout_constraintTop_toBottomOf="@id/tvSignatureLocation" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swUsenetSignature"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_usenet_signature"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spSignatureLocation"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvUsenetSignatureHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_usenet_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swUsenetSignature" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swRemoveSignatures"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_remove_signatures"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvUsenetSignatureHint"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swResizeImages" android:id="@+id/swResizeImages"
android:layout_width="0dp" android:layout_width="0dp"
@ -222,7 +223,7 @@
android:text="@string/title_advanced_resize_images" android:text="@string/title_advanced_resize_images"
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/swRemoveSignatures" app:layout_constraintTop_toBottomOf="@id/spSignatureLocation"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
@ -255,28 +256,73 @@
app:layout_constraintStart_toEndOf="@id/spAutoResize" app:layout_constraintStart_toEndOf="@id/spAutoResize"
app:layout_constraintTop_toTopOf="@id/spAutoResize" /> app:layout_constraintTop_toTopOf="@id/spAutoResize" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvCaptionAdvanced"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:gravity="center"
android:text="@string/title_setup_advanced"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spAutoResize" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swSendReminders" android:id="@+id/swPlainOnly"
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_plain_only"
android:text="@string/title_advanced_send_reminders" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCaptionAdvanced"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swFormatFlowed"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_flow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swPlainOnly"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swUsenetSignature"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_usenet_signature"
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/spAutoResize" app:layout_constraintTop_toBottomOf="@id/swFormatFlowed"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvSendReminders" android:id="@+id/tvUsenetSignatureHint"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="48dp" android:layout_marginEnd="48dp"
android:text="@string/title_advanced_send_reminders_hint" android:text="@string/title_advanced_usenet_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swSendReminders" /> app:layout_constraintTop_toBottomOf="@id/swUsenetSignature" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swRemoveSignatures"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_remove_signatures"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvUsenetSignatureHint"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swReceipt" android:id="@+id/swReceipt"
@ -286,7 +332,7 @@
android:text="@string/title_identity_receipt" android:text="@string/title_identity_receipt"
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/tvSendReminders" app:layout_constraintTop_toBottomOf="@id/swRemoveSignatures"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
@ -333,27 +379,5 @@
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/swLookupMx" /> app:layout_constraintTop_toBottomOf="@id/swLookupMx" />
<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/tvCheckMxHint" />
<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" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>

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

@ -302,6 +302,7 @@
<string name="title_advanced_caption_general">General</string> <string name="title_advanced_caption_general">General</string>
<string name="title_advanced_caption_list">List</string> <string name="title_advanced_caption_list">List</string>
<string name="title_advanced_caption_conversation">Conversation</string> <string name="title_advanced_caption_conversation">Conversation</string>
<string name="title_advanced_caption_message">Message</string>
<string name="title_advanced_caption_message_header">Message header</string> <string name="title_advanced_caption_message_header">Message header</string>
<string name="title_advanced_caption_message_body">Message body</string> <string name="title_advanced_caption_message_body">Message body</string>

Write Preview
Loading…
Cancel
Save