From 13e7ee1537000f0af549bca287690b4b50791ded Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 18 Jun 2022 22:26:23 +0530 Subject: [PATCH] Add SMS/MMS label under Send button --- .../smsmessenger/activities/ThreadActivity.kt | 18 +++++++++++++++++- app/src/main/res/drawable/ic_send_vector.xml | 4 ++-- app/src/main/res/layout/activity_thread.xml | 8 +++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index fff98d21..3ed5cf2a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -35,6 +35,7 @@ import com.bumptech.glide.request.target.Target import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.klinker.android.send_message.Transaction +import com.klinker.android.send_message.Utils.getNumPages import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* @@ -311,6 +312,7 @@ class ThreadActivity : SimpleActivity() { runOnUiThread { setupThreadTitle() setupSIMSelector() + updateMessageType() } } } @@ -404,7 +406,10 @@ class ThreadActivity : SimpleActivity() { private fun setupButtons() { updateTextColors(thread_holder) val textColor = getProperTextColor() - thread_send_message.applyColorFilter(textColor) + thread_send_message.apply { + setTextColor(textColor) + compoundDrawables.forEach { it?.applyColorFilter(textColor) } + } confirm_manage_contacts.applyColorFilter(textColor) thread_add_attachment.applyColorFilter(textColor) @@ -821,6 +826,7 @@ class ThreadActivity : SimpleActivity() { if (attachmentSelections.isEmpty()) { thread_attachments_holder.beGone() } + checkSendMessageAvailability() } private fun checkSendMessageAvailability() { @@ -831,6 +837,7 @@ class ThreadActivity : SimpleActivity() { thread_send_message.isClickable = false thread_send_message.alpha = 0.4f } + updateMessageType() } private fun sendMessage() { @@ -1059,4 +1066,13 @@ class ThreadActivity : SimpleActivity() { setupAdapter() } + + private fun updateMessageType() { + val settings = getSendMessageSettings() + val text = thread_type_message.text.toString() + val isGroupMms = participants.size > 1 && config.sendGroupMessageMMS + val isLongMmsMessage = getNumPages(settings, text) > settings.sendLongAsMmsAfter && config.sendLongMessageMMS + val res = if (attachmentSelections.isNotEmpty() || isGroupMms || isLongMmsMessage) R.string.mms else R.string.sms + thread_send_message.setText(res) + } } diff --git a/app/src/main/res/drawable/ic_send_vector.xml b/app/src/main/res/drawable/ic_send_vector.xml index 9eb9bd31..84498427 100644 --- a/app/src/main/res/drawable/ic_send_vector.xml +++ b/app/src/main/res/drawable/ic_send_vector.xml @@ -1,6 +1,6 @@ - + android:drawableTop="@drawable/ic_send_vector" + android:paddingVertical="@dimen/small_margin" + android:text="@string/sms" + android:textSize="@dimen/smaller_text_size" />