From 692e0b3455635b9a97a98890b9a2484c019c7c26 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 8 Feb 2017 21:24:46 +0100
Subject: show number of failed uploads in chat list in red bubbles

---
 src/main/res/drawable/rounded_rectangle.xml        | 16 -------------
 .../res/drawable/rounded_rectangle_primary.xml     | 16 +++++++++++++
 src/main/res/drawable/rounded_rectangle_red.xml    | 16 +++++++++++++
 src/main/res/layout/conversation_list_row.xml      | 26 +++++++++++++++++-----
 4 files changed, 53 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/res/drawable/rounded_rectangle.xml
 create mode 100644 src/main/res/drawable/rounded_rectangle_primary.xml
 create mode 100644 src/main/res/drawable/rounded_rectangle_red.xml

(limited to 'src/main/res')

diff --git a/src/main/res/drawable/rounded_rectangle.xml b/src/main/res/drawable/rounded_rectangle.xml
deleted file mode 100644
index fab83eda9..000000000
--- a/src/main/res/drawable/rounded_rectangle.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape android:shape="rectangle">
-            <padding
-                android:bottom="2dp"
-                android:left="2dp"
-                android:right="2dp"
-                android:top="2dp" />
-            <solid android:color="@color/primary" />
-            <corners android:radius="6dp" />
-        </shape>
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/src/main/res/drawable/rounded_rectangle_primary.xml b/src/main/res/drawable/rounded_rectangle_primary.xml
new file mode 100644
index 000000000..3a32aa8e5
--- /dev/null
+++ b/src/main/res/drawable/rounded_rectangle_primary.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+<item>
+    <shape android:shape="rectangle">
+        <padding
+            android:bottom="2dp"
+            android:left="2dp"
+            android:right="2dp"
+            android:top="2dp" />
+        <solid android:color="@color/primary" />
+        <corners android:radius="6dp" />
+    </shape>
+</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/src/main/res/drawable/rounded_rectangle_red.xml b/src/main/res/drawable/rounded_rectangle_red.xml
new file mode 100644
index 000000000..a6cb17d2b
--- /dev/null
+++ b/src/main/res/drawable/rounded_rectangle_red.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="@color/red800" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 195a14621..16d611ce9 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -46,13 +46,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignLeft="@+id/conversation_lastwrapper"
-                    android:layout_toLeftOf="@+id/conversation_unread"
                     android:paddingRight="4dp"
                     android:singleLine="true"
                     android:text="Awesome groupchat"
                     android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeHeadline"
-                    android:typeface="sans" />
+                    android:typeface="sans"
+                    android:layout_toLeftOf="@+id/conversation_failed" />
 
                 <RelativeLayout
                     android:id="@+id/conversation_lastwrapper"
@@ -110,18 +110,34 @@
                     android:text="100"
                     android:textColor="@color/grey50"
                     android:textSize="?attr/TextSizeBody"
-                    android:background="@drawable/rounded_rectangle"
+                    android:background="@drawable/rounded_rectangle_primary"
+                    android:visibility="gone"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:paddingBottom="2dp"
+                    android:layout_margin="1dp" />
+                <TextView
+                    android:id="@+id/conversation_failed"
+                    android:layout_toLeftOf="@+id/conversation_unread"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBaseline="@+id/conversation_name"
+                    android:text="100"
+                    android:textColor="@color/grey50"
+                    android:textSize="?attr/TextSizeBody"
+                    android:background="@drawable/rounded_rectangle_red"
                     android:visibility="gone"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:paddingBottom="2dp" />
+                    android:paddingBottom="2dp"
+                    android:layout_margin="1dp" />
 
                 <TextView
                     android:id="@+id/conversation_lastupdate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignBaseline="@+id/conversation_name"
                     android:layout_alignParentRight="true"
+                    android:layout_alignBaseline="@+id/conversation_name"
                     android:paddingLeft="4dp"
                     android:gravity="right"
                     android:text="23:42"
-- 
cgit v1.2.3