Merge branch 'trz/rename' into trz/rebase

Conflicts:
	build.gradle
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

13 files changed, 242 insertions, 7 deletions

diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
index 25fc8591..1bea2f74 100644
--- a/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
index 733e9615..f2df046e 100644
--- a/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
index c9e48859..2c0f1647 100644
--- a/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
index e69b9c8d..f8edda90 100644
--- a/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
index 668504df..d9aa6c0e 100644
--- a/src/main/res/drawable-xxxhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index c79628d4..efa10748 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:padding="8dp"
-	android:descendantFocusability="blocksDescendants">
+	android:descendantFocusability="blocksDescendants"
+	android:id="@+id/conversationListRowFrame">
 
 	<View
 		android:layout_width="fill_parent"
@@ -21,9 +22,9 @@
 	<RelativeLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:background="?android:selectableItemBackground"
 		android:orientation="horizontal"
-		android:padding="8dp" >
+		android:padding="8dp"
+		android:id="@+id/conversationListRowContent">
 
 		<ImageView
 			android:id="@+id/conversation_image"
@@ -46,7 +47,7 @@
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
 			android:layout_toRightOf="@+id/conversation_image"
-			android:paddingLeft="8dp" >
+			android:paddingLeft="8dp">
 
 
 			<TextView
diff --git a/src/main/res/layout/dialog_message_details.xml b/src/main/res/layout/dialog_message_details.xml
new file mode 100644
index 00000000..4d63831e
--- /dev/null
+++ b/src/main/res/layout/dialog_message_details.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="8dp">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dlg_msg_details_time_sent"
+            android:id="@+id/dlgMsgDetLblTimeSent" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/dlgMsgDetTimeSent"
+            android:width="200dp"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:textAlignment="viewEnd"
+            android:gravity="end" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dlg_msg_details_msg_type"
+            android:id="@+id/dlgMsgDetLblMsgType"
+            android:layout_below="@+id/dlgMsgDetLblTimeSent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/dlgMsgDetMsgType"
+            android:layout_below="@+id/dlgMsgDetTimeSent"
+            android:layout_alignRight="@+id/dlgMsgDetTimeSent"
+            android:layout_alignEnd="@+id/dlgMsgDetTimeSent"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dlg_msg_details_msg_status"
+            android:id="@+id/dlgMsgDetLblMsgStatus"
+            android:layout_below="@+id/dlgMsgDetLblMsgType" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/dlgMsgDetMsgStatus"
+            android:layout_below="@+id/dlgMsgDetMsgType"
+            android:layout_alignRight="@+id/dlgMsgDetMsgType"
+            android:layout_alignEnd="@+id/dlgMsgDetMsgType"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dlg_msg_details_sender_resource"
+            android:id="@+id/dlgMsgDetLblSender"
+            android:layout_below="@+id/dlgMsgDetLblMsgStatus" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/dlgMsgDetSender"
+            android:layout_below="@+id/dlgMsgDetMsgStatus"
+            android:layout_alignRight="@+id/dlgMsgDetMsgStatus"
+            android:layout_alignEnd="@+id/dlgMsgDetMsgStatus"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dlg_msg_details_receipient_resource"
+            android:id="@+id/dlgMsgDetLblReceipient"
+            android:layout_below="@+id/dlgMsgDetLblSender" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/dlgMsgDetReceipient"
+            android:layout_below="@+id/dlgMsgDetSender"
+            android:layout_alignRight="@+id/dlgMsgDetSender"
+            android:layout_alignEnd="@+id/dlgMsgDetSender" />
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dlgMsgDetLblReceipient"
+            android:layout_marginTop="11dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:stretchColumns="1"
+            android:background="@color/black87"
+            android:id="@+id/dlgMsgDetFileTable"
+            android:visibility="gone">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:layout_marginTop="0.3dp"
+                android:layout_marginLeft="0.3dp"
+                android:layout_marginRight="0.3dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dlg_msg_details_file_details"
+                    android:layout_column="0"/>
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:layout_marginTop="0.3dp"
+                android:layout_marginLeft="0.3dp"
+                android:layout_marginRight="0.3dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dlg_msg_details_file_mime" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textAlignment="textEnd"
+                    android:gravity="end"
+                    android:id="@+id/dlgMsgDetFileMimeType" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:layout_marginLeft="0.3dp"
+                android:layout_marginTop="0.3dp"
+                android:layout_marginRight="0.3dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dlg_msg_details_file_size" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textAlignment="textEnd"
+                    android:gravity="end"
+                    android:id="@+id/dlgMsgDetFileSize"/>
+            </TableRow>
+        </TableLayout>
+    </RelativeLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_resources_status.xml b/src/main/res/layout/dialog_resources_status.xml
new file mode 100644
index 00000000..4dd511f5
--- /dev/null
+++ b/src/main/res/layout/dialog_resources_status.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="Medium Text"
+        android:id="@+id/dlg_res_stat_resource_name"
+        android:layout_marginLeft="10dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 68ed5711..82f85176 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -44,7 +44,7 @@
                 android:id="@+id/message_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:autoLink="web"
+                android:autoLink="web|phone|email"
                 android:textColor="@color/black87"
                 android:textSize="?attr/TextSizeBody"
                 emojicon:emojiconSize="28sp" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 563e2e29..3b8212a5 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -44,7 +44,7 @@
                 android:id="@+id/message_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:autoLink="web"
+                android:autoLink="web|phone|email"
                 android:textColor="@color/black87"
                 android:textSize="?attr/TextSizeBody"
                 emojicon:emojiconSize="28sp" />
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 4e1316d3..2fe1ca22 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
+    <item
+        android:id="@+id/msg_ctx_mnu_details"
+        android:title="@string/msg_ctx_mnu_details"
+        android:visible="true"/>
     <item
         android:id="@+id/copy_text"
         android:title="@string/copy_text"
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 2d5337be..16ed5239 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -466,4 +466,29 @@
   <string name="search_for_contacts_or_groups">Nach Kontakten oder Konferenzen suchen</string>
     <string name="pref_led_notification_color">LED-Benachrichtigung Farbe</string>
     <string name="pref_led_notification_color_summary">Setze die Farbe der LED-Benachrichtigung</string>
+    <string name="msg_ctx_mnu_details">Nachrichtendetails</string>
+    <string name="dlg_msg_details_title">Nachrichtendetails</string>
+    <string name="cplus_ok">Ok</string>
+    <string name="dlg_resources_title">%1$s (%2$d)</string><!-- %s = bare jid, %d = count of online resources -->
+    <string name="dlg_msg_details_receipient_resource">Empfänger Resource:</string>
+    <string name="dlg_msg_details_receipient_nick">Empfänger Nickname:</string>
+    <string name="dlg_msg_details_sender_resource">Absender Resource:</string>
+    <string name="dlg_msg_details_sender_nick">Absender Nickname:</string>
+    <string name="dlg_msg_details_time_sent">Gesendet:</string>
+    <string name="dlg_msg_details_msg_type">Nachrichtentyp:</string>
+    <string name="dlg_msg_details_msg_status">Nachrichtenstatus:</string>
+    <string name="dlg_msg_details_file_details">Dateidetails</string>
+    <string name="dlg_msg_details_file_mime">Mime Type</string>
+    <string name="dlg_msg_details_file_size">Größe</string>
+    <string name="dlg_msg_details_msg_type_text">Text</string>
+    <string name="dlg_msg_details_msg_type_image">Bild</string>
+    <string name="dlg_msg_details_msg_type_file">Datei</string>
+    <string name="dlg_msg_details_msg_type_status">Status</string>
+    <string name="dlg_msg_details_msg_type_private">Privat</string>
+    <string name="dlg_msg_details_msg_status_sent">Gesendet</string>
+    <string name="dlg_msg_details_msg_status_received">Empfangen</string>
+    <string name="dlg_msg_details_msg_status_waiting">Wartend</string>
+    <string name="dlg_msg_details_msg_status_unsend">In Übertragung</string>
+    <string name="dlg_msg_details_msg_status_offered">Angeboten</string>
+    <string name="dlg_msg_details_msg_status_failed">Fehlgeschlagen</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 94d75164..25eb3dbd 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -495,4 +495,29 @@
 	<string name="search_for_contacts_or_groups">Search for contacts or groups</string>
     <string name="pref_led_notification_color">LED notification color</string>
     <string name="pref_led_notification_color_summary">Change the color of the LED notification</string>
+    <string name="msg_ctx_mnu_details">Message Details</string>
+    <string name="dlg_msg_details_title">Message Details</string>
+    <string name="cplus_ok">Ok</string>
+    <string name="dlg_resources_title">%1$s (%2$d)</string><!-- %s = bare jid, %d = count of online resources -->
+    <string name="dlg_msg_details_receipient_resource">Receipient Resource:</string>
+    <string name="dlg_msg_details_receipient_nick">Receipient Nick:</string>
+    <string name="dlg_msg_details_sender_resource">Sender Resource:</string>
+    <string name="dlg_msg_details_sender_nick">Sender Nick:</string>
+    <string name="dlg_msg_details_time_sent">Time Sent:</string>
+    <string name="dlg_msg_details_msg_type">Message Type:</string>
+    <string name="dlg_msg_details_msg_status">Message Status:</string>
+    <string name="dlg_msg_details_file_details">File Details</string>
+    <string name="dlg_msg_details_file_mime">Mime Type</string>
+    <string name="dlg_msg_details_file_size">Size</string>
+    <string name="dlg_msg_details_msg_type_text">Text</string>
+    <string name="dlg_msg_details_msg_type_image">Image</string>
+    <string name="dlg_msg_details_msg_type_file">File</string>
+    <string name="dlg_msg_details_msg_type_status">Status</string>
+    <string name="dlg_msg_details_msg_type_private">Private</string>
+    <string name="dlg_msg_details_msg_status_sent">Sent</string>
+    <string name="dlg_msg_details_msg_status_received">Received</string>
+    <string name="dlg_msg_details_msg_status_waiting">Waiting</string>
+    <string name="dlg_msg_details_msg_status_unsend">Unsend</string>
+    <string name="dlg_msg_details_msg_status_offered">Offered</string>
+    <string name="dlg_msg_details_msg_status_failed">Failed</string>
 </resources>