diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 58f7c323ff..490bb7a36e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -4814,6 +4814,7 @@ public class FragmentCompose extends FragmentBase { final CheckBox cbReceipt = dview.findViewById(R.id.cbReceipt); final TextView tvReceipt = dview.findViewById(R.id.tvReceiptType); final Spinner spEncrypt = dview.findViewById(R.id.spEncrypt); + final ImageButton ibEncryption = dview.findViewById(R.id.ibEncryption); final Spinner spPriority = dview.findViewById(R.id.spPriority); final TextView tvSendAt = dview.findViewById(R.id.tvSendAt); final ImageButton ibSendAt = dview.findViewById(R.id.ibSendAt); @@ -4945,6 +4946,13 @@ public class FragmentCompose extends FragmentBase { } }); + ibEncryption.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.viewFAQ(getContext(), 12); + } + }); + spPriority.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml index 7788dcb1fd..33b5931224 100644 --- a/app/src/main/res/layout/dialog_send.xml +++ b/app/src/main/res/layout/dialog_send.xml @@ -159,11 +159,14 @@ @@ -172,18 +175,33 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="6dp" + android:layout_marginEnd="12dp" android:entries="@array/encryptNames" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/ibEncryption" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvEncrypt" /> - + + @@ -192,8 +210,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="6dp" + android:layout_marginEnd="12dp" android:entries="@array/priorityNames" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/ibEncryption" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvPriority" /> @@ -202,6 +221,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" + android:layout_marginEnd="12dp" android:text="@string/title_send_at" android:textAppearance="@style/TextAppearance.AppCompat.Medium" app:layout_constraintEnd_toStartOf="@+id/ibSendAt" @@ -213,6 +233,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="6dp" + android:layout_marginEnd="12dp" android:gravity="center_vertical" android:text="now" android:textAppearance="@style/TextAppearance.AppCompat.Medium"