mirror of https://github.com/M66B/FairEmail.git
Use resend title instead of icon
This commit is contained in:
parent
c1b4c0d19d
commit
2998b5f65b
|
@ -245,6 +245,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
private RecyclerView rvAttachment;
|
private RecyclerView rvAttachment;
|
||||||
private TextView tvNoInternetAttachments;
|
private TextView tvNoInternetAttachments;
|
||||||
private TextView tvDsn;
|
private TextView tvDsn;
|
||||||
|
private TextView tvResend;
|
||||||
private TextView tvPlainTextOnly;
|
private TextView tvPlainTextOnly;
|
||||||
private EditTextCompose etBody;
|
private EditTextCompose etBody;
|
||||||
private TextView tvNoInternet;
|
private TextView tvNoInternet;
|
||||||
|
@ -254,7 +255,6 @@ public class FragmentCompose extends FragmentBase {
|
||||||
private TextView tvReference;
|
private TextView tvReference;
|
||||||
private ImageButton ibCloseRefHint;
|
private ImageButton ibCloseRefHint;
|
||||||
private ImageButton ibWriteAboveBelow;
|
private ImageButton ibWriteAboveBelow;
|
||||||
private ImageView ivResend;
|
|
||||||
private ImageButton ibReferenceEdit;
|
private ImageButton ibReferenceEdit;
|
||||||
private ImageButton ibReferenceImages;
|
private ImageButton ibReferenceImages;
|
||||||
private View vwAnchor;
|
private View vwAnchor;
|
||||||
|
@ -368,6 +368,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
rvAttachment = view.findViewById(R.id.rvAttachment);
|
rvAttachment = view.findViewById(R.id.rvAttachment);
|
||||||
tvNoInternetAttachments = view.findViewById(R.id.tvNoInternetAttachments);
|
tvNoInternetAttachments = view.findViewById(R.id.tvNoInternetAttachments);
|
||||||
tvDsn = view.findViewById(R.id.tvDsn);
|
tvDsn = view.findViewById(R.id.tvDsn);
|
||||||
|
tvResend = view.findViewById(R.id.tvResend);
|
||||||
tvPlainTextOnly = view.findViewById(R.id.tvPlainTextOnly);
|
tvPlainTextOnly = view.findViewById(R.id.tvPlainTextOnly);
|
||||||
etBody = view.findViewById(R.id.etBody);
|
etBody = view.findViewById(R.id.etBody);
|
||||||
tvNoInternet = view.findViewById(R.id.tvNoInternet);
|
tvNoInternet = view.findViewById(R.id.tvNoInternet);
|
||||||
|
@ -377,7 +378,6 @@ public class FragmentCompose extends FragmentBase {
|
||||||
tvReference = view.findViewById(R.id.tvReference);
|
tvReference = view.findViewById(R.id.tvReference);
|
||||||
ibCloseRefHint = view.findViewById(R.id.ibCloseRefHint);
|
ibCloseRefHint = view.findViewById(R.id.ibCloseRefHint);
|
||||||
ibWriteAboveBelow = view.findViewById(R.id.ibWriteAboveBelow);
|
ibWriteAboveBelow = view.findViewById(R.id.ibWriteAboveBelow);
|
||||||
ivResend = view.findViewById(R.id.ivResend);
|
|
||||||
ibReferenceEdit = view.findViewById(R.id.ibReferenceEdit);
|
ibReferenceEdit = view.findViewById(R.id.ibReferenceEdit);
|
||||||
ibReferenceImages = view.findViewById(R.id.ibReferenceImages);
|
ibReferenceImages = view.findViewById(R.id.ibReferenceImages);
|
||||||
vwAnchor = view.findViewById(R.id.vwAnchor);
|
vwAnchor = view.findViewById(R.id.vwAnchor);
|
||||||
|
@ -943,6 +943,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
etExtra.setHint("");
|
etExtra.setHint("");
|
||||||
tvDomain.setText(null);
|
tvDomain.setText(null);
|
||||||
tvDsn.setVisibility(View.GONE);
|
tvDsn.setVisibility(View.GONE);
|
||||||
|
tvResend.setVisibility(View.GONE);
|
||||||
tvPlainTextOnly.setVisibility(View.GONE);
|
tvPlainTextOnly.setVisibility(View.GONE);
|
||||||
etBody.setText(null);
|
etBody.setText(null);
|
||||||
|
|
||||||
|
@ -955,7 +956,6 @@ public class FragmentCompose extends FragmentBase {
|
||||||
grpSignature.setVisibility(View.GONE);
|
grpSignature.setVisibility(View.GONE);
|
||||||
grpReferenceHint.setVisibility(View.GONE);
|
grpReferenceHint.setVisibility(View.GONE);
|
||||||
ibWriteAboveBelow.setVisibility(View.GONE);
|
ibWriteAboveBelow.setVisibility(View.GONE);
|
||||||
ivResend.setVisibility(View.GONE);
|
|
||||||
ibReferenceEdit.setVisibility(View.GONE);
|
ibReferenceEdit.setVisibility(View.GONE);
|
||||||
ibReferenceImages.setVisibility(View.GONE);
|
ibReferenceImages.setVisibility(View.GONE);
|
||||||
tvReference.setVisibility(View.GONE);
|
tvReference.setVisibility(View.GONE);
|
||||||
|
@ -5282,6 +5282,8 @@ public class FragmentCompose extends FragmentBase {
|
||||||
draft.dsn != null && !EntityMessage.DSN_NONE.equals(draft.dsn)
|
draft.dsn != null && !EntityMessage.DSN_NONE.equals(draft.dsn)
|
||||||
? View.VISIBLE : View.GONE);
|
? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
|
tvResend.setVisibility(draft.headers == null ? View.GONE : View.VISIBLE);
|
||||||
|
|
||||||
tvPlainTextOnly.setVisibility(
|
tvPlainTextOnly.setVisibility(
|
||||||
draft.plain_only != null && draft.plain_only && !plain_only
|
draft.plain_only != null && draft.plain_only && !plain_only
|
||||||
? View.VISIBLE : View.GONE);
|
? View.VISIBLE : View.GONE);
|
||||||
|
@ -6386,7 +6388,6 @@ public class FragmentCompose extends FragmentBase {
|
||||||
ibWriteAboveBelow.setVisibility(text[1] == null ||
|
ibWriteAboveBelow.setVisibility(text[1] == null ||
|
||||||
draft.wasforwardedfrom != null || BuildConfig.PLAY_STORE_RELEASE
|
draft.wasforwardedfrom != null || BuildConfig.PLAY_STORE_RELEASE
|
||||||
? View.GONE : View.VISIBLE);
|
? View.GONE : View.VISIBLE);
|
||||||
ivResend.setVisibility(draft.headers == null ? View.GONE : View.VISIBLE);
|
|
||||||
ibReferenceEdit.setVisibility(text[1] == null ? View.GONE : View.VISIBLE);
|
ibReferenceEdit.setVisibility(text[1] == null ? View.GONE : View.VISIBLE);
|
||||||
ibReferenceImages.setVisibility(ref_has_images && !show_images ? View.VISIBLE : View.GONE);
|
ibReferenceImages.setVisibility(ref_has_images && !show_images ? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
|
|
|
@ -284,6 +284,18 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator" />
|
app:layout_constraintTop_toBottomOf="@id/vSeparator" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvResend"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/title_resend"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
android:textStyle="italic"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvDsn" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
android:id="@+id/tvPlainTextOnly"
|
android:id="@+id/tvPlainTextOnly"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -294,7 +306,7 @@
|
||||||
android:textStyle="italic"
|
android:textStyle="italic"
|
||||||
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/tvDsn" />
|
app:layout_constraintTop_toBottomOf="@id/tvResend" />
|
||||||
|
|
||||||
<eu.faircode.email.EditTextCompose
|
<eu.faircode.email.EditTextCompose
|
||||||
android:id="@+id/etBody"
|
android:id="@+id/etBody"
|
||||||
|
@ -424,19 +436,6 @@
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
|
app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
|
||||||
app:srcCompat="@drawable/abovebelow" />
|
app:srcCompat="@drawable/abovebelow" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedImageView
|
|
||||||
android:id="@+id/ivResend"
|
|
||||||
android:layout_width="36dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="6dp"
|
|
||||||
android:layout_marginEnd="6dp"
|
|
||||||
android:contentDescription="@string/title_resend"
|
|
||||||
android:padding="3dp"
|
|
||||||
android:tooltipText="@string/title_resend"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/ibWriteAboveBelow"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
|
|
||||||
app:srcCompat="@drawable/twotone_redo_24" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedImageButton
|
<eu.faircode.email.FixedImageButton
|
||||||
android:id="@+id/ibReferenceEdit"
|
android:id="@+id/ibReferenceEdit"
|
||||||
android:layout_width="36dp"
|
android:layout_width="36dp"
|
||||||
|
|
Loading…
Reference in New Issue