Update dialog to reuse properties dialog from file manager

app/build.gradle

@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:4c83ec8740'
+    implementation 'com.github.esensar:Simple-Commons:7b890eae3e'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'com.github.tibbi:android-smsmms:33fcaf94d9'

app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/MessageDetailsDialog.kt

@@ -3,48 +3,41 @@ package com.simplemobiletools.smsmessenger.dialogs
 import android.annotation.SuppressLint
 import android.telephony.SubscriptionInfo
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
+import com.simplemobiletools.commons.dialogs.BasePropertiesDialog
-import com.simplemobiletools.commons.extensions.getTimeFormat
+import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.extensions.config
 import com.simplemobiletools.smsmessenger.extensions.subscriptionManagerCompat
 import com.simplemobiletools.smsmessenger.models.Message
-import kotlinx.android.synthetic.main.dialog_message_details.view.dialog_message_details_text_value
 import org.joda.time.DateTime
 
-class MessageDetailsDialog(val activity: BaseSimpleActivity, val message: Message) {
+class MessageDetailsDialog(val activity: BaseSimpleActivity, val message: Message) : BasePropertiesDialog(activity) {
     init {
         @SuppressLint("MissingPermission")
         val availableSIMs = activity.subscriptionManagerCompat().activeSubscriptionInfoList
 
-        @SuppressLint("SetTextI18n")
+        addProperty(message.getSenderOrReceiverLabel(), message.getSenderOrReceiverPhoneNumbers())
-        val view = activity.layoutInflater.inflate(R.layout.dialog_message_details, null).apply {
+        if (availableSIMs.count() > 1) {
-            dialog_message_details_text_value.text = mutableListOf<String>().apply {
+            addProperty(R.string.message_details_sim, message.getSIM(availableSIMs))
-                add("${message.getReceiverOrSenderLabel()}: ${message.getReceiverOrSenderPhoneNumbers()}")
-                if (availableSIMs.count() > 1) {
-                    add("SIM: ${message.getSIM(availableSIMs)}")
-                }
-                add("${message.getSentOrReceivedAtLabel()}: ${message.getSentOrReceivedAt()}")
-            }.joinToString(separator = System.lineSeparator())
         }
+        addProperty(message.getSentOrReceivedAtLabel(), message.getSentOrReceivedAt())
 
         activity.getAlertDialogBuilder()
             .setPositiveButton(R.string.ok) { _, _ -> }
             .apply {
-                activity.setupDialogStuff(view, this, R.string.message_details)
+                activity.setupDialogStuff(mDialogView, this, R.string.message_details)
             }
     }
 
-    private fun Message.getReceiverOrSenderLabel(): String {
+    private fun Message.getSenderOrReceiverLabel(): Int {
         return if (isReceivedMessage()) {
-            activity.getString(R.string.message_details_sender)
+            R.string.message_details_sender
         } else {
-            activity.getString(R.string.message_details_receiver)
+            R.string.message_details_receiver
         }
     }
 
-    private fun Message.getReceiverOrSenderPhoneNumbers(): String {
+    private fun Message.getSenderOrReceiverPhoneNumbers(): String {
         return if (isReceivedMessage()) {
             formatContactInfo(senderName, senderPhoneNumber)
         } else {
@@ -66,11 +59,11 @@ class MessageDetailsDialog(val activity: BaseSimpleActivity, val message: Messag
         return availableSIMs.firstOrNull { it.subscriptionId == subscriptionId }?.displayName?.toString() ?: activity.getString(R.string.unknown)
     }
 
-    private fun Message.getSentOrReceivedAtLabel(): String {
+    private fun Message.getSentOrReceivedAtLabel(): Int {
         return if (isReceivedMessage()) {
-            activity.getString(R.string.message_details_received_at)
+            R.string.message_details_received_at
         } else {
-            activity.getString(R.string.message_details_sent_at)
+            R.string.message_details_sent_at
         }
     }
 

app/src/main/res/values-ar/strings.xml

@@ -54,6 +54,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-az/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-be/strings.xml

@@ -52,6 +52,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-bg/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-ca/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-cr/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-cs/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-da/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-de/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-el/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-eo/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-es/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-et/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-fi/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-fr/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-gl/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-hi/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-hr/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Pojedinosti poruke</string>
     <string name="message_details_sender">Šalje</string>
     <string name="message_details_receiver">Prima</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Poslano</string>
     <string name="message_details_received_at">Primljeno</string>
     <!-- Notifications -->

app/src/main/res/values-hu/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-in/strings.xml

@@ -49,6 +49,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-is/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-it/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-iw/strings.xml

@@ -52,6 +52,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-ja/strings.xml

@@ -49,6 +49,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-lt/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-lv/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-mk/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-ml/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-nb-rNO/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-nl/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-pa-rPK/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-pl/strings.xml

@@ -52,6 +52,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-pt-rBR/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-pt/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-ro/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-ru/strings.xml

@@ -52,6 +52,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-sk/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-sl/strings.xml

@@ -52,6 +52,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-sr/strings.xml

@@ -51,6 +51,7 @@
     <string name="message_details">Детаљи о поруци</string>
     <string name="message_details_sender">Шалје</string>
     <string name="message_details_receiver">Прима</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Послано</string>
     <string name="message_details_received_at">Примлјено</string>
     <!-- Notifications -->

app/src/main/res/values-sv/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-ta/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-th/strings.xml

@@ -49,6 +49,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-tr/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-uk/strings.xml

@@ -52,6 +52,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-zh-rCN/strings.xml

@@ -49,6 +49,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values-zh-rTW/strings.xml

@@ -49,6 +49,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->

app/src/main/res/values/strings.xml

@@ -50,6 +50,7 @@
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
+    <string name="message_details_sim">SIM</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
     <!-- Notifications -->