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

Made priority clickable

Browse Source
pull/199/head
M66B 4 years ago
parent 3c633e568e
commit 78d05820f9
4 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -326,8 +326,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private ImageView ibFlagged; private ImageView ibFlagged;
private ImageButton ibAvatar; private ImageButton ibAvatar;
private ImageButton ibAuth; private ImageButton ibAuth;
private ImageView ivPriorityHigh; private ImageButton ibPriority;
private ImageView ivPriorityLow;
private ImageView ivImportance; private ImageView ivImportance;
private ImageView ivSigned; private ImageView ivSigned;
private ImageView ivEncrypted; private ImageView ivEncrypted;
@ -499,8 +498,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFlagged = itemView.findViewById(R.id.ibFlagged); ibFlagged = itemView.findViewById(R.id.ibFlagged);
ibAvatar = itemView.findViewById(R.id.ibAvatar); ibAvatar = itemView.findViewById(R.id.ibAvatar);
ibAuth = itemView.findViewById(R.id.ibAuth); ibAuth = itemView.findViewById(R.id.ibAuth);
ivPriorityHigh = itemView.findViewById(R.id.ivPriorityHigh); ibPriority = itemView.findViewById(R.id.ibPriority);
ivPriorityLow = itemView.findViewById(R.id.ivPriorityLow);
ivImportance = itemView.findViewById(R.id.ivImportance); ivImportance = itemView.findViewById(R.id.ivImportance);
ivSigned = itemView.findViewById(R.id.ivSigned); ivSigned = itemView.findViewById(R.id.ivSigned);
ivEncrypted = itemView.findViewById(R.id.ivEncrypted); ivEncrypted = itemView.findViewById(R.id.ivEncrypted);
@ -735,6 +733,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibAvatar.setOnClickListener(this); ibAvatar.setOnClickListener(this);
ibAuth.setOnClickListener(this); ibAuth.setOnClickListener(this);
ibPriority.setOnClickListener(this);
ibSnoozed.setOnClickListener(this); ibSnoozed.setOnClickListener(this);
ibFlagged.setOnClickListener(this); ibFlagged.setOnClickListener(this);
if (viewType == ViewType.THREAD) if (viewType == ViewType.THREAD)
@ -858,6 +857,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibAvatar.setOnClickListener(null); ibAvatar.setOnClickListener(null);
ibAuth.setOnClickListener(null); ibAuth.setOnClickListener(null);
ibPriority.setOnClickListener(null);
ibSnoozed.setOnClickListener(null); ibSnoozed.setOnClickListener(null);
ibFlagged.setOnClickListener(null); ibFlagged.setOnClickListener(null);
if (viewType == ViewType.THREAD) if (viewType == ViewType.THREAD)
@ -981,8 +981,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFlagged.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ibFlagged.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ibAvatar.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ibAvatar.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ibAuth.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ibAuth.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivPriorityHigh.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ibPriority.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivPriorityLow.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivImportance.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivImportance.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivSigned.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivSigned.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
ivEncrypted.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f); ivEncrypted.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
@ -1034,18 +1033,25 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Line 1 // Line 1
ibAuth.setVisibility(authentication && !authenticated ? View.VISIBLE : View.GONE); ibAuth.setVisibility(authentication && !authenticated ? View.VISIBLE : View.GONE);
ivPriorityHigh.setVisibility(
EntityMessage.PRIORITIY_HIGH.equals(message.ui_priority) if (EntityMessage.PRIORITIY_HIGH.equals(message.ui_priority)) {
? View.VISIBLE : View.GONE); ibPriority.setImageLevel(0);
ivPriorityLow.setVisibility( ibPriority.setVisibility(View.VISIBLE);
EntityMessage.PRIORITIY_LOW.equals(message.ui_priority) } else if (EntityMessage.PRIORITIY_LOW.equals(message.ui_priority)) {
? View.VISIBLE : View.GONE); ibPriority.setImageLevel(1);
ivImportance.setImageLevel( ibPriority.setVisibility(View.VISIBLE);
EntityMessage.PRIORITIY_HIGH.equals(message.ui_importance) ? 0 : 1); } else
ivImportance.setVisibility( ibPriority.setVisibility(View.GONE);
EntityMessage.PRIORITIY_LOW.equals(message.ui_importance) ||
EntityMessage.PRIORITIY_HIGH.equals(message.ui_importance) if (EntityMessage.PRIORITIY_HIGH.equals(message.ui_importance)) {
? View.VISIBLE : View.GONE); ivImportance.setImageLevel(0);
ivImportance.setVisibility(View.VISIBLE);
} else if (EntityMessage.PRIORITIY_LOW.equals(message.ui_importance)) {
ivImportance.setImageLevel(1);
ivImportance.setVisibility(View.VISIBLE);
} else
ivImportance.setVisibility(View.GONE);
ivSigned.setVisibility(message.signed > 0 ? View.VISIBLE : View.GONE); ivSigned.setVisibility(message.signed > 0 ? View.VISIBLE : View.GONE);
if (message.verified) if (message.verified)
ivSigned.setColorFilter(colorEncrypt); ivSigned.setColorFilter(colorEncrypt);
@ -3113,6 +3119,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onViewContact(message); onViewContact(message);
else if (view.getId() == R.id.ibAuth) else if (view.getId() == R.id.ibAuth)
onShowAuth(message); onShowAuth(message);
else if (view.getId() == R.id.ibPriority)
onShowPriority(message);
else if (view.getId() == R.id.ibSnoozed) else if (view.getId() == R.id.ibSnoozed)
onShowSnoozed(message); onShowSnoozed(message);
else if (view.getId() == R.id.ibFlagged) else if (view.getId() == R.id.ibFlagged)
@ -3464,6 +3472,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ToastEx.makeText(context, sb.toString(), Toast.LENGTH_LONG).show(); ToastEx.makeText(context, sb.toString(), Toast.LENGTH_LONG).show();
} }
private void onShowPriority(TupleMessageEx message) {
if (EntityMessage.PRIORITIY_HIGH.equals(message.ui_priority))
ToastEx.makeText(context, R.string.title_legend_priority, Toast.LENGTH_LONG).show();
else
ToastEx.makeText(context, R.string.title_legend_priority_low, Toast.LENGTH_LONG).show();
}
private void onShowSnoozed(TupleMessageEx message) { private void onShowSnoozed(TupleMessageEx message) {
if (message.ui_snoozed != null && message.ui_snoozed != Long.MAX_VALUE) { if (message.ui_snoozed != null && message.ui_snoozed != Long.MAX_VALUE) {
DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT); DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);

9
app/src/main/res/drawable/priority.xml
Unescape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/twotone_priority_high_24"
android:maxLevel="0" />
<item
android:drawable="@drawable/twotone_low_priority_24"
android:maxLevel="1" />
</level-list>

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

@ -70,39 +70,28 @@
app:srcCompat="@drawable/twotone_flag_24" app:srcCompat="@drawable/twotone_flag_24"
app:tint="?attr/colorWarning" /> app:tint="?attr/colorWarning" />
<ImageView <ImageButton
android:id="@+id/ivPriorityHigh" android:id="@+id/ibPriority"
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_priority" android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom" app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/ibAuth" app:layout_constraintStart_toEndOf="@id/ibAuth"
app:layout_constraintTop_toTopOf="@+id/tvFrom" app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/twotone_priority_high_24" app:srcCompat="@drawable/priority"
app:tint="?attr/colorAccent" /> app:tint="?attr/colorAccent" />
<ImageView
android:id="@+id/ivPriorityLow"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_priority_low"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/ivPriorityHigh"
app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/twotone_low_priority_24" />
<ImageView <ImageView
android:id="@+id/ivImportance" android:id="@+id/ivImportance"
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_priority_low"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom" app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/ivPriorityLow" app:layout_constraintStart_toEndOf="@id/ibPriority"
app:layout_constraintTop_toTopOf="@+id/tvFrom" app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/importance" /> app:srcCompat="@drawable/importance"
app:tint="?attr/colorAccent" />
<ImageView <ImageView
android:id="@+id/ivSigned" android:id="@+id/ivSigned"

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

@ -70,38 +70,27 @@
app:tint="?attr/colorWarning" /> app:tint="?attr/colorWarning" />
<ImageView <ImageView
android:id="@+id/ivPriorityHigh" android:id="@+id/ibPriority"
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_priority" android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom" app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/ibAuth" app:layout_constraintStart_toEndOf="@id/ibAuth"
app:layout_constraintTop_toTopOf="@+id/tvFrom" app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/twotone_priority_high_24" app:srcCompat="@drawable/priority"
app:tint="?attr/colorAccent" /> app:tint="?attr/colorAccent" />
<ImageView
android:id="@+id/ivPriorityLow"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_priority_low"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/ivPriorityHigh"
app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/twotone_low_priority_24" />
<ImageView <ImageView
android:id="@+id/ivImportance" android:id="@+id/ivImportance"
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_priority_low"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom" app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/ivPriorityLow" app:layout_constraintStart_toEndOf="@id/ibPriority"
app:layout_constraintTop_toTopOf="@+id/tvFrom" app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/importance" /> app:srcCompat="@drawable/importance"
app:tint="?attr/colorAccent" />
<ImageView <ImageView
android:id="@+id/ivSigned" android:id="@+id/ivSigned"

Write Preview
Loading…
Cancel
Save