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

Another approach

This commit is contained in:
M66B 2021-10-09 12:14:50 +02:00
parent 3d80fee78e
commit ffbc591684
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1762,7 +1762,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
vSeparator.setVisibility(View.VISIBLE); vSeparator.setVisibility(View.VISIBLE);
ibFull.setEnabled(false); ibFull.setEnabled(false);
ibFull.setVisibility(View.VISIBLE); ibFull.setVisibility(View.VISIBLE);
ibImages.setVisibility(View.GONE); ibImages.setVisibility(View.INVISIBLE);
ibDecrypt.setVisibility(View.GONE); ibDecrypt.setVisibility(View.GONE);
ibVerify.setVisibility(View.GONE); ibVerify.setVisibility(View.GONE);
ibUndo.setVisibility(View.GONE); ibUndo.setVisibility(View.GONE);
@ -2673,7 +2673,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean always_images = prefs.getBoolean("html_always_images", false); boolean always_images = prefs.getBoolean("html_always_images", false);
// Show images // Show images
ibImages.setVisibility(has_images && !(show_full && always_images) ? View.VISIBLE : View.GONE); ibImages.setVisibility(has_images && !(show_full && always_images) ? View.VISIBLE : View.INVISIBLE);
// Show encrypt actions // Show encrypt actions
ibVerify.setVisibility(false || ibVerify.setVisibility(false ||

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

@ -55,7 +55,7 @@
app:flow_horizontalGap="3dp" app:flow_horizontalGap="3dp"
app:flow_horizontalStyle="packed" app:flow_horizontalStyle="packed"
app:flow_wrapMode="chain" app:flow_wrapMode="chain"
app:layout_constraintEnd_toStartOf="@+id/ibVerify" app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintStart_toEndOf="@id/ibTools" app:layout_constraintStart_toEndOf="@id/ibTools"
app:layout_constraintTop_toBottomOf="@id/vSeparator" /> app:layout_constraintTop_toBottomOf="@id/vSeparator" />
@ -364,9 +364,8 @@
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tooltipText="@string/title_verify" android:tooltipText="@string/title_verify"
app:layout_constraintEnd_toStartOf="@+id/ibDecrypt" app:layout_constraintEnd_toStartOf="@+id/ibDecrypt"
app:layout_constraintTop_toBottomOf="@id/vSeparator" app:layout_constraintTop_toBottomOf="@+id/ibFull"
app:srcCompat="@drawable/twotone_gesture_24" app:srcCompat="@drawable/twotone_gesture_24" />
app:tint="?attr/colorAccent" />
<ImageButton <ImageButton
android:id="@+id/ibDecrypt" android:id="@+id/ibDecrypt"
@ -378,10 +377,9 @@
android:padding="6dp" android:padding="6dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tooltipText="@string/title_decrypt" android:tooltipText="@string/title_decrypt"
app:layout_constraintEnd_toStartOf="@+id/ibImages" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparator" app:layout_constraintTop_toBottomOf="@+id/ibFull"
app:srcCompat="@drawable/twotone_lock_open_24" app:srcCompat="@drawable/twotone_lock_open_24" />
app:tint="?attr/colorAccent" />
<ImageButton <ImageButton
android:id="@+id/ibImages" android:id="@+id/ibImages"