From 8ae2c168d5d1537424da9b67c2b416c4dcd5d025 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Mon, 22 Oct 2018 12:15:51 +0200
Subject: [PATCH 1/4] Resolves #320 - setting a fixed line number of 2

+ aligning avatar and unread count at the top
+ adding IDE preview rendering infos
---
 ...rv_item_conversation_with_last_message.xml | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index a67e65b8a..3c18d8bb9 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -24,6 +24,7 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -42,7 +43,8 @@
             <ImageView
                 android:id="@id/dialogAvatar"
                 android:layout_width="@dimen/avatar_size"
-                android:layout_height="@dimen/avatar_size"/>
+                android:layout_height="@dimen/avatar_size"
+                tools:src="@drawable/ic_call_black_24dp"/>
 
             <ImageView
                 android:id="@+id/passwordProtectedRoomImageView"
@@ -71,7 +73,8 @@
             android:includeFontPadding="false"
             android:maxLines="1"
             android:textColor="@color/nc_incoming_text_default"
-            android:textSize="16sp"/>
+            android:textSize="16sp"
+            tools:text="Best conversation"/>
 
         <TextView
             android:id="@id/dialogDate"
@@ -95,8 +98,8 @@
                 android:id="@id/dialogLastMessageUserAvatar"
                 android:layout_width="@dimen/small_item_height"
                 android:layout_height="@dimen/small_item_height"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"/>
+                android:layout_marginEnd="8dp"
+                tools:src="@drawable/ic_call_black_24dp"/>
 
             <TextView
                 android:id="@id/dialogLastMessage"
@@ -107,22 +110,23 @@
                 android:layout_toStartOf="@id/dialogUnreadBubble"
                 android:ellipsize="end"
                 android:gravity="top"
-                android:maxLines="2"
+                android:lines="2"
                 android:singleLine="false"
-                android:textColor="@color/warm_grey_four"/>
+                android:textColor="@color/warm_grey_four"
+                tools:text="This is the last message\nof an incredibly long two line  conversation text"/>
 
             <TextView
                 android:id="@id/dialogUnreadBubble"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
                 android:layout_marginStart="8dp"
                 android:background="@drawable/bubble_circle_unread"
                 android:gravity="center"
                 android:lines="1"
                 android:textAlignment="center"
-                android:textColor="@color/white"/>
+                android:textColor="@color/white"
+                tools:text="1"/>
 
         </RelativeLayout>
 

From 6863b4839e85bcb05d70a8f28ed3929c38ff880c Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 23 Oct 2018 13:34:19 +0200
Subject: [PATCH 2/4] block talkback for avatars in conversation items

---
 .../main/res/layout/rv_item_conversation_with_last_message.xml  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index 3c18d8bb9..ccc918409 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -42,6 +42,7 @@
 
             <ImageView
                 android:id="@id/dialogAvatar"
+                android:contentDescription="@null"
                 android:layout_width="@dimen/avatar_size"
                 android:layout_height="@dimen/avatar_size"
                 tools:src="@drawable/ic_call_black_24dp"/>
@@ -96,6 +97,7 @@
 
             <ImageView
                 android:id="@id/dialogLastMessageUserAvatar"
+                android:contentDescription="@null"
                 android:layout_width="@dimen/small_item_height"
                 android:layout_height="@dimen/small_item_height"
                 android:layout_marginEnd="8dp"

From 23bbd630dd81358c28f7c4ced2976d718d5dda0f Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 23 Oct 2018 13:43:34 +0200
Subject: [PATCH 3/4] update lint score based on master

---
 scripts/analysis/lint-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 9c26355bc..5e7bb489b 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 132 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 2 error and 128 warnings</span>

From 4d4de0472716f3284d1fa01649ee5e675c97ff6c Mon Sep 17 00:00:00 2001
From: nextcloud-android-bot <>
Date: Tue, 23 Oct 2018 11:49:10 +0000
Subject: [PATCH 4/4] Drone: update Lint results to reflect reduced
 error/warning count [skip ci]

---
 scripts/analysis/lint-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 5e7bb489b..b35117bc9 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 2 error and 128 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 2 errors and 126 warnings</span>