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

Show extra info on separate line in normal view

This commit is contained in:
M66B 2018-12-08 12:50:29 +01:00
parent 5e7ec5172c
commit 812401086e
2 changed files with 78 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@
android:paddingBottom="6dp"
android:src="@drawable/baseline_star_24"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/barrier2"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintEnd_toEndOf="@id/paddingEnd"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />

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

@ -50,10 +50,9 @@
android:id="@+id/ivAvatar"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginStart="6dp"
android:padding="6dp"
android:src="@drawable/baseline_person_24"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintBottom_toTopOf="@+id/barrier3"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toEndOf="@id/paddingStart"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
@ -111,26 +110,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/barrier1" />
<ImageView
android:id="@+id/ivAnswered"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:src="@drawable/baseline_reply_24"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintStart_toEndOf="@id/ivAvatar"
app:layout_constraintTop_toBottomOf="@id/padding1" />
<ImageView
android:id="@+id/ivAttachments"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:src="@drawable/baseline_attachment_24"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintStart_toEndOf="@id/ivAnswered"
app:layout_constraintTop_toBottomOf="@id/padding1" />
<TextView
android:id="@+id/tvSubject"
android:layout_width="0dp"
@ -140,42 +119,8 @@
android:text="Subject"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintEnd_toStartOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivAttachments"
app:layout_constraintTop_toBottomOf="@id/padding1" />
<TextView
android:id="@+id/tvFolder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:maxLines="1"
android:text="folder"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintEnd_toStartOf="@+id/tvCount"
app:layout_constraintTop_toBottomOf="@id/padding1" />
<TextView
android:id="@+id/tvCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="3dp"
android:maxLines="1"
android:text="3"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintEnd_toStartOf="@+id/ivThread"
app:layout_constraintTop_toBottomOf="@id/padding1" />
<ImageView
android:id="@+id/ivThread"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginEnd="6dp"
android:src="@drawable/baseline_message_24"
app:layout_constraintBottom_toTopOf="@+id/barrier2"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
app:layout_constraintStart_toEndOf="@id/ivAvatar"
app:layout_constraintTop_toBottomOf="@id/padding1" />
<ImageView
@ -185,7 +130,7 @@
android:padding="6dp"
android:src="@drawable/baseline_star_24"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/barrier2"
app:layout_constraintBottom_toTopOf="@+id/barrier3"
app:layout_constraintEnd_toEndOf="@id/paddingEnd"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
@ -194,7 +139,79 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="ivAvatar,ivAnswered,ivAttachments,tvSubject,tvFolder,tvCount,ivThread,ivFlagged" />
app:constraint_referenced_ids="tvSubject" />
<View
android:id="@+id/padding2"
android:layout_width="match_parent"
android:layout_height="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/barrier2" />
<ImageView
android:id="@+id/ivAnswered"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:src="@drawable/baseline_reply_24"
app:layout_constraintBottom_toTopOf="@+id/barrier3"
app:layout_constraintStart_toEndOf="@id/ivAvatar"
app:layout_constraintTop_toBottomOf="@id/padding2" />
<ImageView
android:id="@+id/ivAttachments"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:src="@drawable/baseline_attachment_24"
app:layout_constraintBottom_toTopOf="@+id/barrier3"
app:layout_constraintStart_toEndOf="@id/ivAnswered"
app:layout_constraintTop_toBottomOf="@id/padding2" />
<TextView
android:id="@+id/tvFolder"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:gravity="end"
android:maxLines="1"
android:text="folder"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toTopOf="@+id/barrier3"
app:layout_constraintEnd_toStartOf="@+id/tvCount"
app:layout_constraintStart_toEndOf="@id/ivAttachments"
app:layout_constraintTop_toBottomOf="@id/padding2" />
<TextView
android:id="@+id/tvCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="3dp"
android:maxLines="1"
android:text="3"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toTopOf="@+id/barrier3"
app:layout_constraintEnd_toStartOf="@+id/ivThread"
app:layout_constraintTop_toBottomOf="@id/padding2" />
<ImageView
android:id="@+id/ivThread"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginEnd="6dp"
android:src="@drawable/baseline_message_24"
app:layout_constraintBottom_toTopOf="@+id/barrier3"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
app:layout_constraintTop_toBottomOf="@id/padding2" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="ivAvatar,ivAnswered,ivAttachments,tvFolder,tvCount,ivThread,ivFlagged" />
<TextView
android:id="@+id/tvPreview"
@ -211,7 +228,7 @@
android:textStyle="italic"
app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
app:layout_constraintStart_toEndOf="@id/paddingStart"
app:layout_constraintTop_toBottomOf="@id/barrier2" />
app:layout_constraintTop_toBottomOf="@id/barrier3" />
<TextView
android:id="@+id/tvError"