mirror of https://github.com/M66B/FairEmail.git
Always show receipt requested
This commit is contained in:
parent
af73e79e7e
commit
c28834e7f1
|
@ -1606,7 +1606,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibExpanderAddress.setContentDescription(context.getString(show_addresses ? R.string.title_accessibility_hide_addresses : R.string.title_accessibility_show_addresses));
|
ibExpanderAddress.setContentDescription(context.getString(show_addresses ? R.string.title_accessibility_hide_addresses : R.string.title_accessibility_show_addresses));
|
||||||
|
|
||||||
ivPlain.setVisibility(show_addresses && message.plain_only != null && message.plain_only ? View.VISIBLE : View.GONE);
|
ivPlain.setVisibility(show_addresses && message.plain_only != null && message.plain_only ? View.VISIBLE : View.GONE);
|
||||||
ivReceipt.setVisibility(show_addresses && message.receipt_request != null && message.receipt_request ? View.VISIBLE : View.GONE);
|
ivReceipt.setVisibility(message.receipt_request != null && message.receipt_request ? View.VISIBLE : View.GONE);
|
||||||
ivBrowsed.setVisibility(show_addresses && message.ui_browsed ? View.VISIBLE : View.GONE);
|
ivBrowsed.setVisibility(show_addresses && message.ui_browsed ? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
ibSearchContact.setVisibility(show_addresses && (froms > 0 || tos > 0) ? View.VISIBLE : View.GONE);
|
ibSearchContact.setVisibility(show_addresses && (froms > 0 || tos > 0) ? View.VISIBLE : View.GONE);
|
||||||
|
|
|
@ -13,36 +13,6 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<eu.faircode.email.ViewImageHint
|
|
||||||
android:id="@+id/ivPlain"
|
|
||||||
android:layout_width="21dp"
|
|
||||||
android:layout_height="21dp"
|
|
||||||
android:layout_marginStart="6dp"
|
|
||||||
android:contentDescription="@string/title_legend_plain_only"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
|
|
||||||
app:srcCompat="@drawable/baseline_notes_24" />
|
|
||||||
|
|
||||||
<eu.faircode.email.ViewImageHint
|
|
||||||
android:id="@+id/ivReceipt"
|
|
||||||
android:layout_width="21dp"
|
|
||||||
android:layout_height="21dp"
|
|
||||||
android:layout_marginStart="6dp"
|
|
||||||
android:contentDescription="@string/title_legend_receipt"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/ivPlain"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
|
|
||||||
app:srcCompat="@drawable/baseline_playlist_add_check_24" />
|
|
||||||
|
|
||||||
<eu.faircode.email.ViewImageHint
|
|
||||||
android:id="@+id/ivBrowsed"
|
|
||||||
android:layout_width="21dp"
|
|
||||||
android:layout_height="21dp"
|
|
||||||
android:layout_marginStart="6dp"
|
|
||||||
android:contentDescription="@string/title_legend_browsed"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/ivReceipt"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
|
|
||||||
app:srcCompat="@drawable/baseline_playlist_add_24" />
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/ibExpanderAddress"
|
android:id="@+id/ibExpanderAddress"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -55,6 +25,36 @@
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress"
|
app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress"
|
||||||
app:srcCompat="@drawable/expander" />
|
app:srcCompat="@drawable/expander" />
|
||||||
|
|
||||||
|
<eu.faircode.email.ViewImageHint
|
||||||
|
android:id="@+id/ivPlain"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="6dp"
|
||||||
|
android:contentDescription="@string/title_legend_plain_only"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
|
||||||
|
app:srcCompat="@drawable/baseline_notes_24" />
|
||||||
|
|
||||||
|
<eu.faircode.email.ViewImageHint
|
||||||
|
android:id="@+id/ivReceipt"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="6dp"
|
||||||
|
android:contentDescription="@string/title_legend_receipt"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/ivPlain"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
|
||||||
|
app:srcCompat="@drawable/baseline_playlist_add_check_24" />
|
||||||
|
|
||||||
|
<eu.faircode.email.ViewImageHint
|
||||||
|
android:id="@+id/ivBrowsed"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="6dp"
|
||||||
|
android:contentDescription="@string/title_legend_browsed"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/ivReceipt"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
|
||||||
|
app:srcCompat="@drawable/baseline_playlist_add_24" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/ibSearchContact"
|
android:id="@+id/ibSearchContact"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -108,7 +108,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:barrierDirection="bottom"
|
app:barrierDirection="bottom"
|
||||||
app:constraint_referenced_ids="ibSearchContact,ibNotifyContact,ibPinContact,ibAddContact" />
|
app:constraint_referenced_ids="ivPlain,ivReceipt,ivBrowsed,ibSearchContact,ibNotifyContact,ibPinContact,ibAddContact" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
android:id="@+id/tvSubmitterTitle"
|
android:id="@+id/tvSubmitterTitle"
|
||||||
|
|
Loading…
Reference in New Issue