Revert "Show language flag"

This reverts commit 2a6410af3a.
pull/182/head
M66B 5 years ago
parent 2a6410af3a
commit fa30468e75

@ -352,7 +352,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private ImageButton ibExpanderAddress; private ImageButton ibExpanderAddress;
private ImageView ivFlag;
private ImageView ivPlain; private ImageView ivPlain;
private ImageView ivReceipt; private ImageView ivReceipt;
private ImageView ivBrowsed; private ImageView ivBrowsed;
@ -533,7 +532,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibExpanderAddress = vsBody.findViewById(R.id.ibExpanderAddress); ibExpanderAddress = vsBody.findViewById(R.id.ibExpanderAddress);
ivFlag = vsBody.findViewById(R.id.ivFlag);
ivPlain = vsBody.findViewById(R.id.ivPlain); ivPlain = vsBody.findViewById(R.id.ivPlain);
ivReceipt = vsBody.findViewById(R.id.ivReceipt); ivReceipt = vsBody.findViewById(R.id.ivReceipt);
ivBrowsed = vsBody.findViewById(R.id.ivBrowsed); ivBrowsed = vsBody.findViewById(R.id.ivBrowsed);
@ -1222,7 +1220,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
grpAttachments.setVisibility(View.GONE); grpAttachments.setVisibility(View.GONE);
grpImages.setVisibility(View.GONE); grpImages.setVisibility(View.GONE);
ivFlag.setVisibility(View.GONE);
ivPlain.setVisibility(View.GONE); ivPlain.setVisibility(View.GONE);
ivReceipt.setVisibility(View.GONE); ivReceipt.setVisibility(View.GONE);
ivBrowsed.setVisibility(View.GONE); ivBrowsed.setVisibility(View.GONE);
@ -1573,17 +1570,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibExpanderAddress.setImageLevel(show_addresses ? 0 /* less */ : 1 /* more */); ibExpanderAddress.setImageLevel(show_addresses ? 0 /* less */ : 1 /* more */);
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));
if (message.language != null && language_detection) {
int resid = context.getResources().getIdentifier(
"flag_" + message.language.toLowerCase(),
"drawable", context.getPackageName());
if (resid == 0)
ivFlag.setImageDrawable(null);
else
ivFlag.setImageResource(resid);
}
ivFlag.setVisibility(show_addresses && message.language != null && language_detection ? View.VISIBLE : View.GONE);
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(show_addresses && 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);

@ -13,22 +13,13 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivFlag"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
app:srcCompat="@drawable/flag_nl" />
<eu.faircode.email.ViewImageHint <eu.faircode.email.ViewImageHint
android:id="@+id/ivPlain" android:id="@+id/ivPlain"
android:layout_width="21dp" android:layout_width="21dp"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_plain_only" android:contentDescription="@string/title_legend_plain_only"
app:layout_constraintStart_toEndOf="@id/ivFlag" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress" app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
app:srcCompat="@drawable/baseline_notes_24" /> app:srcCompat="@drawable/baseline_notes_24" />

Loading…
Cancel
Save