From ed50f8ec313ef325f4490b21736841c18f85e70d Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 15 Nov 2021 18:03:19 +0100 Subject: [PATCH] moving some helper functions from context to settings --- app/build.gradle | 2 +- .../activities/SettingsActivity.kt | 31 +++++++++++++++---- .../smsmessenger/extensions/Context.kt | 20 ------------ 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8ac416c3..9596d4a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:7123443731' + implementation 'com.github.SimpleMobileTools:Simple-Commons:0684fdde38' implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.klinkerapps:android-smsmms:5.2.6' implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a' diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt index 75828744..d0d11ea5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt @@ -13,8 +13,6 @@ import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.getLockScreenVisibilityText -import com.simplemobiletools.smsmessenger.extensions.getMMSFileLimitText import com.simplemobiletools.smsmessenger.helpers.* import kotlinx.android.synthetic.main.activity_settings.* import java.util.* @@ -178,7 +176,7 @@ class SettingsActivity : SimpleActivity() { } private fun setupLockScreenVisibility() { - settings_lock_screen_visibility.text = getLockScreenVisibilityText(config.lockScreenVisibilitySetting) + settings_lock_screen_visibility.text = getLockScreenVisibilityText() settings_lock_screen_visibility_holder.setOnClickListener { val items = arrayListOf( RadioItem(LOCK_SCREEN_SENDER_MESSAGE, getString(R.string.sender_and_message)), @@ -188,13 +186,21 @@ class SettingsActivity : SimpleActivity() { RadioGroupDialog(this@SettingsActivity, items, config.lockScreenVisibilitySetting) { config.lockScreenVisibilitySetting = it as Int - settings_lock_screen_visibility.text = getLockScreenVisibilityText(config.lockScreenVisibilitySetting) + settings_lock_screen_visibility.text = getLockScreenVisibilityText() } } } + private fun getLockScreenVisibilityText() = getString( + when (config.lockScreenVisibilitySetting) { + LOCK_SCREEN_SENDER_MESSAGE -> R.string.sender_and_message + LOCK_SCREEN_SENDER -> R.string.sender_only + else -> R.string.nothing + } + ) + private fun setupMMSFileSizeLimit() { - settings_mms_file_size_limit.text = getMMSFileLimitText(config.mmsFileSizeLimit) + settings_mms_file_size_limit.text = getMMSFileLimitText() settings_mms_file_size_limit_holder.setOnClickListener { val items = arrayListOf( RadioItem(1, getString(R.string.mms_file_size_limit_100kb), FILE_SIZE_100_KB), @@ -209,8 +215,21 @@ class SettingsActivity : SimpleActivity() { val checkedItemId = items.find { it.value == config.mmsFileSizeLimit }?.id ?: 7 RadioGroupDialog(this@SettingsActivity, items, checkedItemId) { config.mmsFileSizeLimit = it as Long - settings_mms_file_size_limit.text = getMMSFileLimitText(config.mmsFileSizeLimit) + settings_mms_file_size_limit.text = getMMSFileLimitText() } } } + + private fun getMMSFileLimitText() = getString( + when (config.mmsFileSizeLimit) { + FILE_SIZE_100_KB -> R.string.mms_file_size_limit_100kb + FILE_SIZE_200_KB -> R.string.mms_file_size_limit_200kb + FILE_SIZE_300_KB -> R.string.mms_file_size_limit_300kb + FILE_SIZE_600_KB -> R.string.mms_file_size_limit_600kb + FILE_SIZE_1_MB -> R.string.mms_file_size_limit_1mb + FILE_SIZE_2_MB -> R.string.mms_file_size_limit_2mb + else -> R.string.mms_file_size_limit_none + } + ) + } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index 02774d3f..ae1c005a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -771,14 +771,6 @@ fun Context.showMessageNotification(address: String, body: String, threadId: Lon notificationManager.notify(threadId.hashCode(), builder.build()) } -fun Context.getLockScreenVisibilityText(type: Int) = getString( - when (type) { - LOCK_SCREEN_SENDER_MESSAGE -> R.string.sender_and_message - LOCK_SCREEN_SENDER -> R.string.sender_only - else -> R.string.nothing - } -) - fun Context.removeDiacriticsIfNeeded(text: String): String { return if (config.useSimpleCharacters) text.normalizeString() else text } @@ -854,18 +846,6 @@ fun Context.deleteSmsDraft(threadId: Long) { } } -fun Context.getMMSFileLimitText(size: Long) = getString( - when (size) { - FILE_SIZE_100_KB -> R.string.mms_file_size_limit_100kb - FILE_SIZE_200_KB -> R.string.mms_file_size_limit_200kb - FILE_SIZE_300_KB -> R.string.mms_file_size_limit_300kb - FILE_SIZE_600_KB -> R.string.mms_file_size_limit_600kb - FILE_SIZE_1_MB -> R.string.mms_file_size_limit_1mb - FILE_SIZE_2_MB -> R.string.mms_file_size_limit_2mb - else -> R.string.mms_file_size_limit_none - } -) - fun Context.updateLastConversationMessage(threadId: Long) { val uri = Threads.CONTENT_URI val selection = "${Threads._ID} = ?"