From dace8ba3d3815599a70d5e369cd3b1f418842a0e Mon Sep 17 00:00:00 2001
From: BrianBlade <n.gelbertz@gmail.com>
Date: Fri, 3 Apr 2015 00:06:37 +0200
Subject: Enable end-conversation by swipe gesture

Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews

Re-enable selectableItemBackground

Dont end selectedConversation on swipe

Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.

Add blacklistedConversation for undo swipe

Update title_undo_swipe_* strings

Fix undo(), rename blacklistedConversation

Fix discardUndo(); re-init selectedConversation

maintain scroll position after undo

clear notification when dismissing a conversation

modified / simplified maintain scroll position code

simplify handling of selectedConversation

change undo_muc string, remove notifyDataSetChanged()
---
 src/main/res/layout/conversation_list_row.xml | 138 +++++++++++++++-----------
 1 file changed, 78 insertions(+), 60 deletions(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 21147b4a..de04780f 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,68 +1,86 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="8dp" >
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:descendantFocusability="blocksDescendants">
 
-    <ImageView
-        android:id="@+id/conversation_image"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_alignParentLeft="true"
-        android:scaleType="centerCrop" />
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:background="@color/divider"/>
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toRightOf="@+id/conversation_image"
-        android:paddingLeft="8dp" >
+	<FrameLayout
+		android:id="@+id/swipeable_item"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:background="@color/primarybackground">
 
-        <TextView
-            android:id="@+id/conversation_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/conversation_lastwrapper"
-            android:layout_toLeftOf="@+id/conversation_lastupdate"
-            android:singleLine="true"
-            android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeHeadline"
-            android:typeface="sans" />
+	<RelativeLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="?android:selectableItemBackground"
+		android:orientation="horizontal"
+		android:padding="8dp" >
 
-        <LinearLayout
-            android:id="@+id/conversation_lastwrapper"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/conversation_name"
-            android:orientation="vertical"
-            android:paddingTop="3dp" >
+		<ImageView
+			android:id="@+id/conversation_image"
+			android:layout_width="56dp"
+			android:layout_height="56dp"
+			android:layout_alignParentLeft="true"
+			android:scaleType="centerCrop" />
 
-            <TextView
-                android:id="@+id/conversation_lastmsg"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:scrollHorizontally="false"
-                android:singleLine="true"
-                android:textColor="@color/primarytext"
-                android:textSize="?attr/TextSizeBody" />
+		<RelativeLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toRightOf="@+id/conversation_image"
+			android:paddingLeft="8dp" >
 
-            <ImageView
-                android:id="@+id/conversation_lastimage"
-                android:layout_width="fill_parent"
-                android:layout_height="36dp"
-                android:background="@color/primarytext"
-                android:scaleType="centerCrop" />
-        </LinearLayout>
+			<TextView
+				android:id="@+id/conversation_name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignLeft="@+id/conversation_lastwrapper"
+				android:layout_toLeftOf="@+id/conversation_lastupdate"
+				android:singleLine="true"
+				android:textColor="@color/primarytext"
+				android:textSize="?attr/TextSizeHeadline"
+				android:typeface="sans" />
 
-        <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:gravity="right"
-            android:textColor="@color/secondarytext"
-            android:textSize="?attr/TextSizeInfo" />
-    </RelativeLayout>
+			<LinearLayout
+				android:id="@+id/conversation_lastwrapper"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/conversation_name"
+				android:orientation="vertical"
+				android:paddingTop="3dp" >
 
-</RelativeLayout>
\ No newline at end of file
+				<TextView
+					android:id="@+id/conversation_lastmsg"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:scrollHorizontally="false"
+					android:singleLine="true"
+					android:textColor="@color/primarytext"
+					android:textSize="?attr/TextSizeBody" />
+
+				<ImageView
+					android:id="@+id/conversation_lastimage"
+					android:layout_width="fill_parent"
+					android:layout_height="36dp"
+					android:background="@color/primarytext"
+					android:scaleType="centerCrop" />
+			</LinearLayout>
+
+			<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:gravity="right"
+				android:textColor="@color/secondarytext"
+				android:textSize="?attr/TextSizeInfo" />
+		</RelativeLayout>
+	</RelativeLayout>
+	</FrameLayout>
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 845b39cdcc4d20d916bdee5b661c31a19f6cbdac Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 13 Apr 2015 15:59:18 +0200
Subject: fixed regression where the selected conversation wasn't highlighted
 anymore on tabled layout

---
 src/main/res/layout/conversation_list_row.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index de04780f..69abb225 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,7 +6,7 @@
 	<View
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/divider"/>
+		android:background="@color/primary"/>
 
 	<FrameLayout
 		android:id="@+id/swipeable_item"
-- 
cgit v1.2.3


From ffffca10f0c3e399fbbcde200ea4758acc5ba03f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jul 2015 12:55:13 +0200
Subject: renamed colors

---
 src/main/res/layout/conversation_list_row.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 69abb225..28e526e0 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,13 +6,13 @@
 	<View
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/primary"/>
+		android:background="@color/green500"/>
 
 	<FrameLayout
 		android:id="@+id/swipeable_item"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/primarybackground">
+		android:background="@color/grey50">
 
 	<RelativeLayout
 		android:layout_width="fill_parent"
@@ -42,7 +42,7 @@
 				android:layout_alignLeft="@+id/conversation_lastwrapper"
 				android:layout_toLeftOf="@+id/conversation_lastupdate"
 				android:singleLine="true"
-				android:textColor="@color/primarytext"
+				android:textColor="@color/black87"
 				android:textSize="?attr/TextSizeHeadline"
 				android:typeface="sans" />
 
@@ -60,14 +60,14 @@
 					android:layout_height="wrap_content"
 					android:scrollHorizontally="false"
 					android:singleLine="true"
-					android:textColor="@color/primarytext"
+					android:textColor="@color/black87"
 					android:textSize="?attr/TextSizeBody" />
 
 				<ImageView
 					android:id="@+id/conversation_lastimage"
 					android:layout_width="fill_parent"
 					android:layout_height="36dp"
-					android:background="@color/primarytext"
+					android:background="@color/black87"
 					android:scaleType="centerCrop" />
 			</LinearLayout>
 
@@ -78,7 +78,7 @@
 				android:layout_alignBaseline="@+id/conversation_name"
 				android:layout_alignParentRight="true"
 				android:gravity="right"
-				android:textColor="@color/secondarytext"
+				android:textColor="@color/black54"
 				android:textSize="?attr/TextSizeInfo" />
 		</RelativeLayout>
 	</RelativeLayout>
-- 
cgit v1.2.3


From 74e05023b4f884b31876357c013513c51aff5369 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 21 Jul 2015 02:21:34 +0200
Subject: very subtle

---
 src/main/res/layout/conversation_list_row.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 28e526e0..15fa60af 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,7 +1,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:descendantFocusability="blocksDescendants">
+			 xmlns:app="http://schemas.android.com/apk/res-auto"
+			 android:layout_width="fill_parent"
+			 android:layout_height="wrap_content"
+			 android:descendantFocusability="blocksDescendants">
 
 	<View
 		android:layout_width="fill_parent"
@@ -21,12 +22,13 @@
 		android:orientation="horizontal"
 		android:padding="8dp" >
 
-		<ImageView
+		<com.makeramen.roundedimageview.RoundedImageView
 			android:id="@+id/conversation_image"
 			android:layout_width="56dp"
 			android:layout_height="56dp"
 			android:layout_alignParentLeft="true"
-			android:scaleType="centerCrop" />
+			android:scaleType="centerCrop"
+			app:riv_corner_radius="2dp" />
 
 		<RelativeLayout
 			android:layout_width="fill_parent"
-- 
cgit v1.2.3


From eff9e417e02bef9c4d94b659f7a90f3ff334ce25 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 26 Aug 2015 21:17:29 +0200
Subject: use dedicated colors for primary and primary_dark

---
 src/main/res/layout/conversation_list_row.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 15fa60af..7321b0f6 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -7,7 +7,7 @@
 	<View
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:background="@color/green500"/>
+		android:background="@color/primary"/>
 
 	<FrameLayout
 		android:id="@+id/swipeable_item"
-- 
cgit v1.2.3


From 0bb3ae37f0762ad264a4b98b3ebc4753017441af Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Jan 2016 14:41:55 +0100
Subject: show icon in conversations overview when notifications are disabled

---
 src/main/res/layout/conversation_list_row.xml | 173 +++++++++++++++-----------
 1 file changed, 97 insertions(+), 76 deletions(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 7321b0f6..984073b3 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,88 +1,109 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 xmlns:app="http://schemas.android.com/apk/res-auto"
-			 android:layout_width="fill_parent"
-			 android:layout_height="wrap_content"
-			 android:descendantFocusability="blocksDescendants">
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:descendantFocusability="blocksDescendants">
 
-	<View
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="@color/primary"/>
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/primary"/>
 
-	<FrameLayout
-		android:id="@+id/swipeable_item"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="@color/grey50">
+    <FrameLayout
+        android:id="@+id/swipeable_item"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/grey50">
 
-	<RelativeLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:background="?android:selectableItemBackground"
-		android:orientation="horizontal"
-		android:padding="8dp" >
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:orientation="horizontal"
+            android:padding="8dp">
 
-		<com.makeramen.roundedimageview.RoundedImageView
-			android:id="@+id/conversation_image"
-			android:layout_width="56dp"
-			android:layout_height="56dp"
-			android:layout_alignParentLeft="true"
-			android:scaleType="centerCrop"
-			app:riv_corner_radius="2dp" />
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/conversation_image"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_alignParentLeft="true"
+                android:scaleType="centerCrop"
+                app:riv_corner_radius="2dp"/>
 
-		<RelativeLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_toRightOf="@+id/conversation_image"
-			android:paddingLeft="8dp" >
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/conversation_image"
+                android:paddingLeft="8dp">
 
-			<TextView
-				android:id="@+id/conversation_name"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignLeft="@+id/conversation_lastwrapper"
-				android:layout_toLeftOf="@+id/conversation_lastupdate"
-				android:singleLine="true"
-				android:textColor="@color/black87"
-				android:textSize="?attr/TextSizeHeadline"
-				android:typeface="sans" />
+                <TextView
+                    android:id="@+id/conversation_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@+id/conversation_lastwrapper"
+                    android:layout_toLeftOf="@+id/conversation_lastupdate"
+                    android:paddingRight="4dp"
+                    android:singleLine="true"
+                    android:text="Awesome groupchat"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:typeface="sans"/>
 
-			<LinearLayout
-				android:id="@+id/conversation_lastwrapper"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/conversation_name"
-				android:orientation="vertical"
-				android:paddingTop="3dp" >
+                <RelativeLayout
+                    android:id="@+id/conversation_lastwrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/conversation_name"
+                    android:layout_marginTop="4dp">
 
-				<TextView
-					android:id="@+id/conversation_lastmsg"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:scrollHorizontally="false"
-					android:singleLine="true"
-					android:textColor="@color/black87"
-					android:textSize="?attr/TextSizeBody" />
+                    <LinearLayout android:layout_width="match_parent"
+                                  android:layout_height="wrap_content"
+                                  android:layout_alignParentLeft="true"
+                                  android:layout_centerVertical="true"
+                                  android:layout_toLeftOf="@+id/notification_status"
+                                  android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/conversation_lastmsg"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:scrollHorizontally="false"
+                            android:singleLine="true"
+                            android:text="This is a placeholder text to show the last messages"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody"/>
 
-				<ImageView
-					android:id="@+id/conversation_lastimage"
-					android:layout_width="fill_parent"
-					android:layout_height="36dp"
-					android:background="@color/black87"
-					android:scaleType="centerCrop" />
-			</LinearLayout>
+                        <com.makeramen.roundedimageview.RoundedImageView
+                            android:id="@+id/conversation_lastimage"
+                            android:layout_width="fill_parent"
+                            android:layout_height="36dp"
+                            android:background="@color/black87"
+                            android:scaleType="centerCrop"
+                            android:visibility="gone"
+                            app:riv_corner_radius="2dp"/>
+                    </LinearLayout>
+                    <ImageView
+                        android:id="@+id/notification_status"
+                        android:layout_width="16sp"
+                        android:layout_height="16sp"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="4dp"
+                        android:src="@drawable/ic_notifications_grey600_24dp"
+                        />
+                </RelativeLayout>
 
-			<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:gravity="right"
-				android:textColor="@color/black54"
-				android:textSize="?attr/TextSizeInfo" />
-		</RelativeLayout>
-	</RelativeLayout>
-	</FrameLayout>
+                <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:gravity="right"
+                    android:text="23:42"
+                    android:textColor="@color/black54"
+                    android:textSize="?attr/TextSizeInfo"/>
+            </RelativeLayout>
+        </RelativeLayout>
+    </FrameLayout>
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 921d567dcbbf55fed97aa1c69c81316f0abde0f1 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 12 Jan 2016 15:35:23 +0100
Subject: use match_parent as height in conversations overview

---
 src/main/res/layout/conversation_list_row.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 984073b3..cd3f9266 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,13 +6,13 @@
 
     <View
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:background="@color/primary"/>
 
     <FrameLayout
         android:id="@+id/swipeable_item"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:background="@color/grey50">
 
         <RelativeLayout
-- 
cgit v1.2.3


From 73084c9cd30dacb6228a0851efa928aaeabcb229 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Thu, 11 Feb 2016 21:20:51 +0100
Subject: Fixed XML errors after merge

---
 src/main/res/layout/conversation_list_row.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/res/layout/conversation_list_row.xml')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index cde94087..9f040676 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,6 +1,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:emojicon="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -88,7 +88,7 @@
                             android:text="This is a placeholder text to show the last messages"
 					android:textColor="@color/primaryText"
 					android:textSize="?attr/TextSizeBody"
-					emojicon:emojiconSize="20sp" />
+					app:emojiconSize="20sp" />
 
                         <com.makeramen.roundedimageview.RoundedImageView
                             android:id="@+id/conversation_lastimage"
-- 
cgit v1.2.3