code cleanup

30 files changed, 1 insertions, 60 deletions

diff --git a/src/main/res/drawable-hdpi/ic_action_download.png b/src/main/res/drawable-hdpi/ic_action_download.png
deleted file mode 100644
index 596fd582c..000000000
--- a/src/main/res/drawable-hdpi/ic_action_download.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/tab_selected_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 68b1dd750..000000000
--- a/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 557452d31..000000000
--- a/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index e91a93fa1..000000000
--- a/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 3dbdb6156..000000000
--- a/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index c4a248118..000000000
--- a/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_action_download.png b/src/main/res/drawable-mdpi/ic_action_download.png
deleted file mode 100644
index e2a58608f..000000000
--- a/src/main/res/drawable-mdpi/ic_action_download.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/tab_selected_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
deleted file mode 100644
index e18c2e9c6..000000000
--- a/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 5ce9469df..000000000
--- a/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index 4bb9e6a64..000000000
--- a/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 255fb97f0..000000000
--- a/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index 8803ec053..000000000
--- a/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_action_download.png b/src/main/res/drawable-xhdpi/ic_action_download.png
deleted file mode 100644
index a43f70428..000000000
--- a/src/main/res/drawable-xhdpi/ic_action_download.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 7de791d70..000000000
--- a/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index b9ab85694..000000000
--- a/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index 2fe1ffada..000000000
--- a/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 3d59b0d0d..000000000
--- a/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index 2da35fe80..000000000
--- a/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_action_download.png b/src/main/res/drawable-xxhdpi/ic_action_download.png
deleted file mode 100644
index d01732ee9..000000000
--- a/src/main/res/drawable-xxhdpi/ic_action_download.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 9f13a9c20..000000000
--- a/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 0b20a8af2..000000000
--- a/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index f6dab1b05..000000000
--- a/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 31f944a83..000000000
--- a/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index a54ea8506..000000000
--- a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
diff --git a/src/main/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml
deleted file mode 100644
index ffd36f6fe..000000000
--- a/src/main/res/drawable/actionbar_tab_indicator.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/src/main/res/layout/show_location_infowindow.xml b/src/main/res/layout/show_location_infowindow.xml
deleted file mode 100644
index d7c208610..000000000
--- a/src/main/res/layout/show_location_infowindow.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <android.support.text.emoji.widget.EmojiTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="?attr/TextSizeBody"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/snippet"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="?attr/TextSizeInfo" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/tool_bar.xml b/src/main/res/layout/tool_bar.xml
deleted file mode 100644
index 990a00e03..000000000
--- a/src/main/res/layout/tool_bar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/primary"
-    android:elevation="2dp"
-    android:theme="@style/Base.ThemeOverlay.AppCompat.Dark" />
\ No newline at end of file
diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
index 4a3d93d1b..37ee278ce 100644
--- a/src/main/res/values-v21/dimens.xml
+++ b/src/main/res/values-v21/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp -->
+    <!-- 48dp + 15dp -->
     <dimen name="image_button_padding">12dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index cb103131a..cb92f725e 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -4,6 +4,5 @@
     <dimen name="activity_vertical_margin">8dp</dimen>
     <dimen name="infocard_padding">16dp</dimen>
     <dimen name="image_button_padding">8dp</dimen>
-    <dimen name="elv_touch_slop">64dp</dimen>
     <dimen name="audio_player_width">224dp</dimen>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 00d99e8bb..2d5d6fa20 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -428,8 +428,6 @@
     <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 group chat</string>
     <string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>
     <string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string>
     <string name="pref_remove_trusted_certificates_title">Remove certificates</string>
@@ -460,7 +458,6 @@
     <string name="download_failed_server_not_found">Download failed: Server not found</string>
     <string name="download_failed_file_not_found">Download failed: File not found</string>
     <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string>
-    <string name="elv_undo">undo</string>
     <string name="download_failed_could_not_write_file">Download failed: Could not write file</string>
     <string name="pref_use_white_background">Use white background</string>
     <string name="pref_use_white_background_summary">Show sent messages as black text on a white background</string>