msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Message image buttons

Browse Source
pull/162/head
M66B 6 years ago
parent 3dff252b37
commit 8f3c0edf02
3 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File

60
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -238,14 +238,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private View vwColor; private View vwColor;
private ImageButton ivExpander; private ImageButton ivExpander;
private ImageView ivFlagged; private ImageView ibFlagged;
private ImageView ivAvatar; private ImageView ivAvatar;
private TextView tvFrom; private TextView tvFrom;
private TextView tvSize; private TextView tvSize;
private TextView tvTime; private TextView tvTime;
private ImageView ivType; private ImageView ivType;
private ImageView ivAuth; private ImageView ibAuth;
private ImageView ivSnoozed; private ImageView ibSnoozed;
private ImageView ivBrowsed; private ImageView ivBrowsed;
private ImageView ivAnswered; private ImageView ivAnswered;
private ImageView ivPlain; private ImageView ivPlain;
@ -346,14 +346,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
vwColor = itemView.findViewById(R.id.vwColor); vwColor = itemView.findViewById(R.id.vwColor);
ivExpander = itemView.findViewById(R.id.ibExpander); ivExpander = itemView.findViewById(R.id.ibExpander);
ivFlagged = itemView.findViewById(R.id.ivFlagged); ibFlagged = itemView.findViewById(R.id.ibFlagged);
ivAvatar = itemView.findViewById(R.id.ivAvatar); ivAvatar = itemView.findViewById(R.id.ivAvatar);
tvFrom = itemView.findViewById(subject_top ? R.id.tvSubject : R.id.tvFrom); tvFrom = itemView.findViewById(subject_top ? R.id.tvSubject : R.id.tvFrom);
tvSize = itemView.findViewById(R.id.tvSize); tvSize = itemView.findViewById(R.id.tvSize);
tvTime = itemView.findViewById(R.id.tvTime); tvTime = itemView.findViewById(R.id.tvTime);
ivType = itemView.findViewById(R.id.ivType); ivType = itemView.findViewById(R.id.ivType);
ivAuth = itemView.findViewById(R.id.ivAuth); ibAuth = itemView.findViewById(R.id.ibAuth);
ivSnoozed = itemView.findViewById(R.id.ivSnoozed); ibSnoozed = itemView.findViewById(R.id.ibSnoozed);
ivBrowsed = itemView.findViewById(R.id.ivBrowsed); ivBrowsed = itemView.findViewById(R.id.ivBrowsed);
ivAnswered = itemView.findViewById(R.id.ivAnswered); ivAnswered = itemView.findViewById(R.id.ivAnswered);
ivPlain = itemView.findViewById(R.id.ivPlain); ivPlain = itemView.findViewById(R.id.ivPlain);
@ -494,11 +494,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}); });
view.setOnKeyListener(this); view.setOnKeyListener(this);
ivAuth.setOnClickListener(this); ibAuth.setOnClickListener(this);
ivSnoozed.setOnClickListener(this); ibSnoozed.setOnClickListener(this);
ivFlagged.setOnClickListener(this); ibFlagged.setOnClickListener(this);
if (viewType == ViewType.THREAD) if (viewType == ViewType.THREAD)
ivFlagged.setOnLongClickListener(this); ibFlagged.setOnLongClickListener(this);
if (vsBody != null) { if (vsBody != null) {
ibExpanderAddress.setOnClickListener(this); ibExpanderAddress.setOnClickListener(this);
@ -543,11 +543,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
touch.setOnClickListener(null); touch.setOnClickListener(null);
view.setOnKeyListener(null); view.setOnKeyListener(null);
ivAuth.setOnClickListener(null); ibAuth.setOnClickListener(null);
ivSnoozed.setOnClickListener(null); ibSnoozed.setOnClickListener(null);
ivFlagged.setOnClickListener(null); ibFlagged.setOnClickListener(null);
if (viewType == ViewType.THREAD) if (viewType == ViewType.THREAD)
ivFlagged.setOnLongClickListener(null); ibFlagged.setOnLongClickListener(null);
if (vsBody != null) { if (vsBody != null) {
ibExpanderAddress.setOnClickListener(null); ibExpanderAddress.setOnClickListener(null);
@ -575,14 +575,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private void clear() { private void clear() {
vwColor.setVisibility(View.GONE); vwColor.setVisibility(View.GONE);
ivExpander.setVisibility(View.GONE); ivExpander.setVisibility(View.GONE);
ivFlagged.setVisibility(View.GONE); ibFlagged.setVisibility(View.GONE);
ivAvatar.setVisibility(View.GONE); ivAvatar.setVisibility(View.GONE);
tvFrom.setText(null); tvFrom.setText(null);
tvSize.setText(null); tvSize.setText(null);
tvTime.setText(null); tvTime.setText(null);
ivType.setVisibility(View.GONE); ivType.setVisibility(View.GONE);
ivAuth.setVisibility(View.GONE); ibAuth.setVisibility(View.GONE);
ivSnoozed.setVisibility(View.GONE); ibSnoozed.setVisibility(View.GONE);
ivBrowsed.setVisibility(View.GONE); ivBrowsed.setVisibility(View.GONE);
ivAnswered.setVisibility(View.GONE); ivAnswered.setVisibility(View.GONE);
ivPlain.setVisibility(View.GONE); ivPlain.setVisibility(View.GONE);
@ -640,14 +640,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Duplicate // Duplicate
if (viewType == ViewType.THREAD) { if (viewType == ViewType.THREAD) {
boolean dim = (message.duplicate || EntityFolder.TRASH.equals(message.folderType)); boolean dim = (message.duplicate || EntityFolder.TRASH.equals(message.folderType));
ivFlagged.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ibFlagged.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivAvatar.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivAvatar.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
tvFrom.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); tvFrom.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
tvSize.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); tvSize.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
tvTime.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); tvTime.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivType.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivType.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivAuth.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ibAuth.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivSnoozed.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ibSnoozed.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivBrowsed.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivBrowsed.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivAnswered.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivAnswered.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivPlain.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivPlain.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
@ -719,8 +719,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
(viewType == ViewType.UNIFIED && type == null && !inbox) || (viewType == ViewType.UNIFIED && type == null && !inbox) ||
(viewType == ViewType.THREAD && EntityFolder.SENT.equals(message.folderType)) (viewType == ViewType.THREAD && EntityFolder.SENT.equals(message.folderType))
? View.VISIBLE : View.GONE); ? View.VISIBLE : View.GONE);
ivAuth.setVisibility(authentication && !authenticated ? View.VISIBLE : View.GONE); ibAuth.setVisibility(authentication && !authenticated ? View.VISIBLE : View.GONE);
ivSnoozed.setVisibility(message.ui_snoozed == null ? View.GONE : View.VISIBLE); ibSnoozed.setVisibility(message.ui_snoozed == null ? View.GONE : View.VISIBLE);
ivBrowsed.setVisibility(message.ui_browsed ? View.VISIBLE : View.GONE); ivBrowsed.setVisibility(message.ui_browsed ? View.VISIBLE : View.GONE);
ivAnswered.setVisibility(message.ui_answered ? View.VISIBLE : View.GONE); ivAnswered.setVisibility(message.ui_answered ? View.VISIBLE : View.GONE);
ivPlain.setVisibility(message.plain_only != null && message.plain_only ? View.VISIBLE : View.GONE); ivPlain.setVisibility(message.plain_only != null && message.plain_only ? View.VISIBLE : View.GONE);
@ -916,12 +916,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private void bindFlagged(TupleMessageEx message) { private void bindFlagged(TupleMessageEx message) {
int flagged = (message.count - message.unflagged); int flagged = (message.count - message.unflagged);
ivFlagged.setImageResource(flagged > 0 ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24); ibFlagged.setImageResource(flagged > 0 ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24);
ivFlagged.setImageTintList(ColorStateList.valueOf(flagged > 0 ibFlagged.setImageTintList(ColorStateList.valueOf(flagged > 0
? message.color == null || !ActivityBilling.isPro(context) ? message.color == null || !ActivityBilling.isPro(context)
? colorAccent : message.color : textColorSecondary)); ? colorAccent : message.color : textColorSecondary));
ivFlagged.setVisibility(flags && !message.folderReadOnly ? View.VISIBLE : View.GONE); ibFlagged.setVisibility(flags && !message.folderReadOnly ? View.VISIBLE : View.GONE);
ivFlagged.setEnabled(message.uid != null); ibFlagged.setEnabled(message.uid != null);
} }
private void bindContactInfo(ContactInfo info, TupleMessageEx message) { private void bindContactInfo(ContactInfo info, TupleMessageEx message) {
@ -1464,11 +1464,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message == null) if (message == null)
return; return;
if (view.getId() == R.id.ivAuth) if (view.getId() == R.id.ibAuth)
onShowAuth(message); onShowAuth(message);
else if (view.getId() == R.id.ivSnoozed) else if (view.getId() == R.id.ibSnoozed)
onShowSnoozed(message); onShowSnoozed(message);
else if (view.getId() == R.id.ivFlagged) else if (view.getId() == R.id.ibFlagged)
onToggleFlag(message); onToggleFlag(message);
else if (view.getId() == R.id.ibSearchContact) else if (view.getId() == R.id.ibSearchContact)
onSearchContact(message); onSearchContact(message);
@ -1636,7 +1636,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message == null || message.folderReadOnly) if (message == null || message.folderReadOnly)
return false; return false;
if (view.getId() == R.id.ivFlagged) { if (view.getId() == R.id.ibFlagged) {
onMenuColoredStar(message); onMenuColoredStar(message);
return true; return true;
} }

22
app/src/main/res/layout/include_message_compact.xml
Unescape View File

@ -96,7 +96,7 @@
android:text="Time" android:text="Time"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom" app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged" app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
app:layout_constraintTop_toBottomOf="@id/paddingTop" /> app:layout_constraintTop_toBottomOf="@id/paddingTop" />
<ImageView <ImageView
@ -110,11 +110,12 @@
app:layout_constraintTop_toTopOf="@+id/tvSubject" app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_edit_24" /> app:srcCompat="@drawable/baseline_edit_24" />
<ImageView <ImageButton
android:id="@+id/ivAuth" android:id="@+id/ibAuth"
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:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_auth" android:contentDescription="@string/title_legend_auth"
android:tint="@color/colorError" android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject" app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
@ -122,14 +123,15 @@
app:layout_constraintTop_toTopOf="@+id/tvSubject" app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_flag_24" /> app:srcCompat="@drawable/baseline_flag_24" />
<ImageView <ImageButton
android:id="@+id/ivSnoozed" android:id="@+id/ibSnoozed"
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:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_snoozed" android:contentDescription="@string/title_legend_snoozed"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject" app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivAuth" app:layout_constraintStart_toEndOf="@id/ibAuth"
app:layout_constraintTop_toTopOf="@+id/tvSubject" app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_timelapse_24" /> app:srcCompat="@drawable/baseline_timelapse_24" />
@ -140,7 +142,7 @@
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_browsed" android:contentDescription="@string/title_legend_browsed"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject" app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivSnoozed" app:layout_constraintStart_toEndOf="@id/ibSnoozed"
app:layout_constraintTop_toTopOf="@+id/tvSubject" app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_playlist_add_24" /> app:srcCompat="@drawable/baseline_playlist_add_24" />
@ -240,12 +242,12 @@
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_thread" android:contentDescription="@string/title_legend_thread"
app:layout_constraintBottom_toBottomOf="@id/tvSubject" app:layout_constraintBottom_toBottomOf="@id/tvSubject"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged" app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
app:layout_constraintTop_toTopOf="@+id/tvSubject" app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_message_24" /> app:srcCompat="@drawable/baseline_message_24" />
<ImageView <ImageButton
android:id="@+id/ivFlagged" android:id="@+id/ibFlagged"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"

24
app/src/main/res/layout/include_message_normal.xml
Unescape View File

@ -93,7 +93,7 @@
android:text="Time" android:text="Time"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom" app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged" app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
app:layout_constraintTop_toBottomOf="@id/paddingTop" /> app:layout_constraintTop_toBottomOf="@id/paddingTop" />
<TextView <TextView
@ -107,12 +107,12 @@
android:minHeight="24dp" android:minHeight="24dp"
android:text="Subject" android:text="Subject"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged" app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
app:layout_constraintStart_toEndOf="@id/ivAvatar" app:layout_constraintStart_toEndOf="@id/ivAvatar"
app:layout_constraintTop_toBottomOf="@id/tvFrom" /> app:layout_constraintTop_toBottomOf="@id/tvFrom" />
<ImageView <ImageButton
android:id="@+id/ivFlagged" android:id="@+id/ibFlagged"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
@ -135,11 +135,12 @@
app:layout_constraintTop_toTopOf="@+id/tvFolder" app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_edit_24" /> app:srcCompat="@drawable/baseline_edit_24" />
<ImageView <ImageButton
android:id="@+id/ivAuth" android:id="@+id/ibAuth"
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:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_auth" android:contentDescription="@string/title_legend_auth"
android:tint="@color/colorError" android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder" app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
@ -147,14 +148,15 @@
app:layout_constraintTop_toTopOf="@+id/tvFolder" app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_flag_24" /> app:srcCompat="@drawable/baseline_flag_24" />
<ImageView <ImageButton
android:id="@+id/ivSnoozed" android:id="@+id/ibSnoozed"
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:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_snoozed" android:contentDescription="@string/title_legend_snoozed"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder" app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivAuth" app:layout_constraintStart_toEndOf="@id/ibAuth"
app:layout_constraintTop_toTopOf="@+id/tvFolder" app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_timelapse_24" /> app:srcCompat="@drawable/baseline_timelapse_24" />
@ -165,7 +167,7 @@
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_browsed" android:contentDescription="@string/title_legend_browsed"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder" app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivSnoozed" app:layout_constraintStart_toEndOf="@id/ibSnoozed"
app:layout_constraintTop_toTopOf="@+id/tvFolder" app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_playlist_add_24" /> app:srcCompat="@drawable/baseline_playlist_add_24" />
@ -248,7 +250,7 @@
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_thread" android:contentDescription="@string/title_legend_thread"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder" app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged" app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
app:layout_constraintTop_toTopOf="@+id/tvFolder" app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_message_24" /> app:srcCompat="@drawable/baseline_message_24" />

Write Preview
Loading…
Cancel
Save