mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Moved unsubscribe button

This commit is contained in:
M66B 2020-03-05 13:49:25 +01:00
parent 9b52f9107f
commit 929a7adc40
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1318,17 +1318,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean cross_hint = prefs.getBoolean("cross_hint", true);
boolean normal = (context.getResources().getConfiguration().screenWidthDp >= 360);
boolean normal = (context.getResources().getConfiguration().screenWidthDp >= 400);
vSeparator.setVisibility(View.VISIBLE);
ibFull.setEnabled(false);
ibFull.setVisibility(View.VISIBLE);
ibImages.setVisibility(View.GONE);
ibUnsubscribe.setVisibility(View.GONE);
ibDecrypt.setVisibility(View.GONE);
ibVerify.setVisibility(View.GONE);
ibUndo.setVisibility(EntityFolder.OUTBOX.equals(message.folderType) ? View.VISIBLE : View.GONE);
ibUnsubscribe.setVisibility(normal || message.unsubscribe == null ? View.GONE : View.VISIBLE);
ibAnswer.setVisibility(normal || EntityFolder.OUTBOX.equals(message.folderType) ? View.GONE : View.VISIBLE);
ibMove.setVisibility(normal || message.folderReadOnly || message.uid == null ? View.GONE : View.VISIBLE);
ibArchive.setVisibility(View.GONE);
@ -1855,8 +1855,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Show images
ibImages.setVisibility(has_images && !(show_full && always_images) ? View.VISIBLE : View.GONE);
ibUnsubscribe.setVisibility(message.unsubscribe == null ? View.GONE : View.VISIBLE);
// Show encrypt actions
ibVerify.setVisibility(false ||
EntityMessage.PGP_SIGNONLY.equals(message.encrypt) ||
@ -3153,6 +3151,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
ibJunk.setTooltipText(title);
ibUnsubscribe.setVisibility(message.unsubscribe == null ? View.GONE : View.VISIBLE);
ibAnswer.setVisibility(outbox ? View.GONE : View.VISIBLE);
ibMove.setVisibility(move ? View.VISIBLE : View.GONE);
ibArchive.setVisibility(archive ? View.VISIBLE : View.GONE);

32
app/src/main/res/layout/include_message_navigation.xml
View File

@ -126,6 +126,21 @@
app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:srcCompat="@drawable/baseline_reply_24" />
<ImageButton
android:id="@+id/ibUnsubscribe"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="9dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_show_unsubscribe"
android:foregroundTint="?android:attr/textColorSecondary"
android:padding="6dp"
android:scaleType="fitCenter"
android:tooltipText="@string/title_legend_show_unsubscribe"
app:layout_constraintStart_toEndOf="@+id/ibAnswer"
app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:srcCompat="@drawable/baseline_unsubscribe_24" />
<ImageButton
android:id="@+id/ibUndo"
android:layout_width="36dp"
@ -189,30 +204,15 @@
android:id="@+id/ibDecrypt"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="9dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_decrypt"
android:foregroundTint="?android:attr/textColorSecondary"
android:padding="6dp"
android:scaleType="fitCenter"
android:tooltipText="@string/title_decrypt"
app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
app:layout_constraintTop_toBottomOf="@id/ibFull"
app:srcCompat="@drawable/baseline_lock_open_24" />
<ImageButton
android:id="@+id/ibUnsubscribe"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_show_unsubscribe"
android:foregroundTint="?android:attr/textColorSecondary"
android:padding="6dp"
android:scaleType="fitCenter"
android:tooltipText="@string/title_legend_show_unsubscribe"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ibFull"
app:srcCompat="@drawable/baseline_unsubscribe_24" />
app:srcCompat="@drawable/baseline_lock_open_24" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSignedData"