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()

6 files changed, 89 insertions, 62 deletions

diff --git a/src/main/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
index 2744f38ef..50039c03a 100644
--- a/src/main/res/layout-w960dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
@@ -12,7 +12,7 @@
         android:background="@color/primarybackground"
         android:orientation="vertical" >
 
-        <ListView
+        <de.timroes.android.listview.EnhancedListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 21147b4a0..de04780fe 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
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 695700288..24c653ae6 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -10,7 +10,7 @@
         android:background="@color/primarybackground"
         android:orientation="vertical" >
 
-        <ListView
+        <de.timroes.android.listview.EnhancedListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index b8266182c..3f6f471bc 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -427,6 +427,8 @@
   <string name="no_application_found_to_display_location">Keine App für die Standort-Anzeige gefunden</string>
   <string name="location">Standort</string>
   <string name="received_location">Standort empfangen</string>
+  <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string>
+  <string name="title_undo_swipe_out_muc">Konferenz verlassen</string>
   <plurals name="select_contact">
     <item quantity="one">%d Kontakt ausgewählt</item>
     <item quantity="other">%d Kontakte ausgewählt</item>
diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
new file mode 100644
index 000000000..8bc8f3f7b
--- /dev/null
+++ b/src/main/res/values-v21/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp -->
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index af56c0146..50e9d9e43 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -296,6 +296,7 @@
             \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
             \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
             \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
+            \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0)
     </string>
     <string name="title_pref_quiet_hours">Quiet Hours</string>
     <string name="title_pref_quiet_hours_start_time">Start time</string>
@@ -454,6 +455,8 @@
     <string name="no_application_found_to_display_location">No application found to display location</string>
     <string name="location">Location</string>
     <string name="received_location">Received location</string>
+	<string name="title_undo_swipe_out_conversation">Conversation closed</string>
+	<string name="title_undo_swipe_out_muc">Left conference</string>
 	<plurals name="select_contact">
 		<item quantity="one">Select %d contact</item>
 		<item quantity="other">Select %d contacts</item>