mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Send dialog improvements

This commit is contained in:
M66B 2023-10-21 10:10:49 +02:00
parent 4d84abfc33
commit 6fe0d93504
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/FragmentDialogSend.java
View File

@ -28,8 +28,10 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.ColorStateList;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Typeface;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -252,14 +254,25 @@ public class FragmentDialogSend extends FragmentDialogBase {
ibMore.setOnClickListener(onMore); ibMore.setOnClickListener(onMore);
tvMore.setOnClickListener(onMore); tvMore.setOnClickListener(onMore);
Runnable evalMore = new RunnableEx("more") {
@Override
protected void delegate() {
boolean warning = (cbPlainOnly.isChecked() && styled);
int color = Helper.resolveColor(tvMore.getContext(), warning ? R.attr.colorWarning : android.R.attr.textColorSecondary);
ibMore.setImageTintList(ColorStateList.valueOf(color));
tvMore.setTextColor(color);
tvMore.setTypeface(warning ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
}
};
evalMore.run();
cbPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cbPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
tvPlainHint.setVisibility(checked && styled ? View.VISIBLE : View.GONE); boolean more = (grpMore.getVisibility() == View.VISIBLE);
if (checked && styled && grpMore.getVisibility() != View.VISIBLE) { tvPlainHint.setVisibility(checked && styled && more ? View.VISIBLE : View.GONE);
ibMore.setImageLevel(0); evalMore.run();
grpMore.setVisibility(View.VISIBLE);
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", id); args.putLong("id", id);
@ -288,11 +301,8 @@ public class FragmentDialogSend extends FragmentDialogBase {
cbReceipt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cbReceipt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
tvReceiptHint.setVisibility(checked ? View.VISIBLE : View.GONE); boolean more = (grpMore.getVisibility() == View.VISIBLE);
if (checked && grpMore.getVisibility() != View.VISIBLE) { tvReceiptHint.setVisibility(checked && more ? View.VISIBLE : View.GONE);
ibMore.setImageLevel(0);
grpMore.setVisibility(View.VISIBLE);
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", id); args.putLong("id", id);

7
app/src/main/res/layout/dialog_send.xml
View File

@ -530,7 +530,7 @@
android:id="@+id/cbArchive" android:id="@+id/cbArchive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="24dp"
android:tag="ignore" android:tag="ignore"
android:text="@string/title_send_auto_archive" android:text="@string/title_send_auto_archive"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
@ -541,7 +541,7 @@
android:id="@+id/cbNotAgain" android:id="@+id/cbNotAgain"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="12dp"
android:text="@string/title_no_ask_again" android:text="@string/title_no_ask_again"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -567,8 +567,7 @@
tvEncrypt,spEncrypt,ibEncryption, tvEncrypt,spEncrypt,ibEncryption,
tvPriority,spPriority, tvPriority,spPriority,
tvSensitivity,spSensitivity,ibSensitivity, tvSensitivity,spSensitivity,ibSensitivity,
tvSendTitle,tvSendAt,ibSendAt, tvSendTitle,tvSendAt,ibSendAt" />
cbArchive" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/grpSentMissing" android:id="@+id/grpSentMissing"