From 93448822953c3f1c1e3e2c8d295c2ae941967af9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 18 Jun 2018 20:02:57 -0400 Subject: [PATCH] #975 - Show message details --- .../main/java/common/util/DateFormatter.kt | 4 + .../common/util/MessageDetailsFormatter.kt | 87 +++++++++++++++++++ .../java/feature/compose/ComposeActivity.kt | 10 +++ .../main/java/feature/compose/ComposeView.kt | 1 + .../java/feature/compose/ComposeViewModel.kt | 12 +++ ..._black_24dp.xml => ic_info_black_24dp.xml} | 2 +- .../src/main/res/layout/settings_activity.xml | 2 +- presentation/src/main/res/menu/compose.xml | 7 ++ presentation/src/main/res/values/strings.xml | 11 +++ 9 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 presentation/src/main/java/common/util/MessageDetailsFormatter.kt rename presentation/src/main/res/drawable/{ic_info_outline_black_24dp.xml => ic_info_black_24dp.xml} (56%) diff --git a/presentation/src/main/java/common/util/DateFormatter.kt b/presentation/src/main/java/common/util/DateFormatter.kt index 8eeeaef1..430b06c2 100644 --- a/presentation/src/main/java/common/util/DateFormatter.kt +++ b/presentation/src/main/java/common/util/DateFormatter.kt @@ -41,6 +41,10 @@ class DateFormatter @Inject constructor(val context: Context) { else SimpleDateFormat(pattern, Locale.getDefault()) } + fun getDetailedTimestamp(date: Long): String { + return getFormatter("M/d/y, h:mm:ss a").format(date) + } + fun getTimestamp(date: Long): String { return getFormatter("h:mm a").format(date) } diff --git a/presentation/src/main/java/common/util/MessageDetailsFormatter.kt b/presentation/src/main/java/common/util/MessageDetailsFormatter.kt new file mode 100644 index 00000000..c99ca29a --- /dev/null +++ b/presentation/src/main/java/common/util/MessageDetailsFormatter.kt @@ -0,0 +1,87 @@ +package common.util + +import android.content.Context +import com.google.android.mms.pdu_alt.EncodedStringValue +import com.google.android.mms.pdu_alt.MultimediaMessagePdu +import com.google.android.mms.pdu_alt.PduPersister +import com.moez.QKSMS.R +import model.Message +import util.tryOrNull +import javax.inject.Inject + +class MessageDetailsFormatter @Inject constructor( + private val context: Context, + private val dateFormatter: DateFormatter +) { + + fun format(message: Message): String { + val builder = StringBuilder() + + message.type + .takeIf { it.isNotBlank() } + ?.toUpperCase() + ?.let { context.getString(R.string.compose_details_type, it) } + ?.let(builder::appendln) + + if (message.isSms()) { + message.address + .takeIf { it.isNotBlank() && !message.isMe() } + ?.let { context.getString(R.string.compose_details_from, it) } + ?.let(builder::appendln) + + message.address + .takeIf { it.isNotBlank() && message.isMe() } + ?.let { context.getString(R.string.compose_details_to, it) } + ?.let(builder::appendln) + } else { + val pdu = tryOrNull { + PduPersister.getPduPersister(context) + .load(message.getUri()) + as MultimediaMessagePdu + } + + pdu?.from?.string + ?.takeIf { it.isNotBlank() } + ?.let { context.getString(R.string.compose_details_from, it) } + ?.let(builder::appendln) + + pdu?.to + ?.let(EncodedStringValue::concat) + ?.takeIf { it.isNotBlank() } + ?.let { context.getString(R.string.compose_details_to, it) } + ?.let(builder::appendln) + } + + message.date + .takeIf { it > 0 && message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_sent, it) } + ?.let(builder::appendln) + + message.dateSent + .takeIf { it > 0 && !message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_sent, it) } + ?.let(builder::appendln) + + message.date + .takeIf { it > 0 && !message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_received, it) } + ?.let(builder::appendln) + + message.dateSent + .takeIf { it > 0 && message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_delivered, it) } + ?.let(builder::appendln) + + message.errorCode + .takeIf { it != 0 && message.isSms() } + ?.let { context.getString(R.string.compose_details_error_code, it) } + ?.let(builder::appendln) + + return builder.toString().trim() + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 40190bd9..dd8e445a 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -30,6 +30,7 @@ import android.os.Build import android.os.Bundle import android.provider.MediaStore import android.support.v4.app.ActivityCompat +import android.support.v7.app.AlertDialog import android.support.v7.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem @@ -182,6 +183,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0 && state.query.isEmpty() toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode && state.selectedMessages == 0 && state.query.isEmpty() toolbar.menu.findItem(R.id.copy)?.isVisible = !state.editingMode && state.selectedMessages == 1 + toolbar.menu.findItem(R.id.details)?.isVisible = !state.editingMode && state.selectedMessages == 1 toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && state.selectedMessages > 0 toolbar.menu.findItem(R.id.forward)?.isVisible = !state.editingMode && state.selectedMessages == 1 toolbar.menu.findItem(R.id.previous)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty() @@ -225,6 +227,14 @@ class ComposeActivity : QkThemedActivity(), ComposeView { messageAdapter.clearSelection() } + override fun showDetails(details: String) { + AlertDialog.Builder(this) + .setTitle(R.string.compose_details_title) + .setMessage(details) + .setCancelable(true) + .show() + } + override fun requestStoragePermission() { ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0) } diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 101d473f..a35dba2b 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -52,6 +52,7 @@ interface ComposeView : QkView { val sendIntent: Observable fun clearSelection() + fun showDetails(details: String) fun requestStoragePermission() fun requestCamera() fun requestGallery() diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 772de969..41221125 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -28,6 +28,7 @@ import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.base.QkViewModel import common.util.ClipboardUtils +import common.util.MessageDetailsFormatter import common.util.extensions.makeToast import compat.SubscriptionManagerCompat import compat.TelephonyCompat @@ -82,6 +83,7 @@ class ComposeViewModel @Inject constructor( private val conversationRepo: ConversationRepository, private val deleteMessages: DeleteMessages, private val markRead: MarkRead, + private val messageDetailsFormatter: MessageDetailsFormatter, private val messageRepo: MessageRepository, private val navigator: Navigator, private val permissionManager: PermissionManager, @@ -315,6 +317,16 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.clearSelection() } + // Show the message details + view.optionsItemIntent + .filter { it == R.id.details } + .withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages } + .mapNotNull { messages -> messages.firstOrNull().also { view.clearSelection() } } + .mapNotNull(messageRepo::getMessage) + .map(messageDetailsFormatter::format) + .autoDisposable(view.scope()) + .subscribe { view.showDetails(it) } + // Delete the messages view.optionsItemIntent .filter { it == R.id.delete } diff --git a/presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml b/presentation/src/main/res/drawable/ic_info_black_24dp.xml similarity index 56% rename from presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml rename to presentation/src/main/res/drawable/ic_info_black_24dp.xml index cf53e145..cc940881 100644 --- a/presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_info_black_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/> diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index 588de851..d1166801 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -200,7 +200,7 @@ android:id="@+id/about" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_info_outline_black_24dp" + app:icon="@drawable/ic_info_black_24dp" app:title="@string/settings_about_title" tools:summary="Version 3.0.7" /> diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index d74e426b..f7c12c89 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -40,6 +40,13 @@ android:visible="false" app:showAsAction="ifRoom" /> + + Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo