Publishing additional information in message details dialog such as message type and message status

3 files changed, 93 insertions, 10 deletions

diff --git a/src/main/res/layout/dialog_message_details.xml b/src/main/res/layout/dialog_message_details.xml
index 67561ae7..4d63831e 100644
--- a/src/main/res/layout/dialog_message_details.xml
+++ b/src/main/res/layout/dialog_message_details.xml
@@ -11,7 +11,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Time Sent:"
+            android:text="@string/dlg_msg_details_time_sent"
             android:id="@+id/dlgMsgDetLblTimeSent" />
         <TextView
             android:layout_width="wrap_content"
@@ -20,19 +20,21 @@
             android:width="200dp"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true" />
+            android:layout_alignParentEnd="true"
+            android:textAlignment="viewEnd"
+            android:gravity="end" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Sender Resource:"
-            android:id="@+id/dlgMsgDetLblSender"
+            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/dlgMsgDetSender"
+            android:id="@+id/dlgMsgDetMsgType"
             android:layout_below="@+id/dlgMsgDetTimeSent"
             android:layout_alignRight="@+id/dlgMsgDetTimeSent"
             android:layout_alignEnd="@+id/dlgMsgDetTimeSent"
@@ -42,7 +44,41 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Receipient Resource:"
+            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" />
 
@@ -63,7 +99,8 @@
             android:layout_alignParentEnd="true"
             android:stretchColumns="1"
             android:background="@color/black87"
-            android:id="@+id/dlgMsgDetFileTable">
+            android:id="@+id/dlgMsgDetFileTable"
+            android:visibility="gone">
 
             <TableRow
                 android:layout_width="match_parent"
@@ -76,7 +113,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="File Details"
+                    android:text="@string/dlg_msg_details_file_details"
                     android:layout_column="0"/>
             </TableRow>
 
@@ -91,12 +128,14 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Mime Type" />
+                    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>
 
@@ -111,12 +150,14 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Size" />
+                    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>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c9724e5a..16ed5239 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -470,4 +470,25 @@
     <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 0bcbb9c4..b3786b35 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -499,4 +499,25 @@
     <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>