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

Added images separator

This commit is contained in:
M66B 2019-05-13 20:44:08 +02:00
parent e435a4a1ba
commit 3fa67067ee
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,6 +258,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private Group grpHeaders;
private Group grpAttachments;
private Group grpExpanded;
private Group grpImages;
private AdapterAttachment adapterAttachment;
private AdapterImage adapterImage;
@ -360,6 +361,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
grpHeaders = itemView.findViewById(R.id.grpHeaders);
grpAttachments = itemView.findViewById(R.id.grpAttachments);
grpExpanded = itemView.findViewById(R.id.grpExpanded);
grpImages = itemView.findViewById(R.id.grpImages);
}
Rect getItemRect() {
@ -728,7 +730,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
vwBody.setVisibility(View.GONE);
pbBody.setVisibility(View.GONE);
tvNoInternetBody.setVisibility(View.GONE);
rvImage.setVisibility(View.GONE);
grpImages.setVisibility(View.GONE);
}
private void bindFlagged(TupleMessageEx message) {
@ -1415,7 +1417,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tbHtml.setVisibility(View.VISIBLE);
ibFull.setVisibility(View.INVISIBLE);
tvBody.setVisibility(View.GONE);
rvImage.setVisibility(adapterImage.getItemCount() > 0 ? View.INVISIBLE : View.GONE);
grpImages.setVisibility(adapterImage.getItemCount() > 0 ? View.INVISIBLE : View.GONE);
// For performance reasons the WebView is created when needed only
if (!(vwBody instanceof WebView)) {
@ -1822,7 +1824,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
pbBody.setVisibility(View.GONE);
rvImage.setVisibility(adapterImage.getItemCount() > 0 ? View.VISIBLE : View.GONE);
grpImages.setVisibility(adapterImage.getItemCount() > 0 ? View.VISIBLE : View.GONE);
}
@Override

20
app/src/main/res/layout/item_message_compact.xml
View File

@ -350,6 +350,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inMessage" />
<View
android:id="@+id/vSeparatorImages"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vwBody" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvImage"
android:layout_width="0dp"
@ -357,6 +369,12 @@
android:layout_marginTop="3dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vwBody" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorImages" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpImages"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="vSeparatorImages,rvImage" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

20
app/src/main/res/layout/item_message_normal.xml
View File

@ -343,6 +343,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inMessage" />
<View
android:id="@+id/vSeparatorImages"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vwBody" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvImage"
android:layout_width="0dp"
@ -350,6 +362,12 @@
android:layout_marginTop="3dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vwBody" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorImages" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpImages"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="vSeparatorImages,rvImage" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>