From 938ba2b20c867d66f5754d791bc273b7b2178a06 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 15 Nov 2021 14:47:14 +0100 Subject: [PATCH] removing the file size limit label from the app settings --- app/build.gradle | 2 +- .../smsmessenger/activities/SettingsActivity.kt | 3 --- .../smsmessenger/extensions/Context.kt | 12 ------------ app/src/main/res/layout/activity_settings.xml | 9 --------- build.gradle | 2 +- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 92e00249..fb269945 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:a8c7dfd635' + implementation 'com.github.SimpleMobileTools:Simple-Commons:c615eda325' 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 e965940b..31125441 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt @@ -13,7 +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.getMMSFileLimitText import com.simplemobiletools.smsmessenger.helpers.* import kotlinx.android.synthetic.main.activity_settings.* import java.util.* @@ -191,7 +190,6 @@ class SettingsActivity : SimpleActivity() { } private fun setupMMSFileSizeLimit() { - settings_mms_file_size_limit.text = getMMSFileLimitText(config.mmsFileSizeLimit) settings_mms_file_size_limit_holder.setOnClickListener { val items = arrayListOf( RadioItem(1, getString(R.string.mms_file_size_limit_100kb), FILE_SIZE_100_KB), @@ -206,7 +204,6 @@ 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) } } } 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 3d35dab6..ae1c005a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -846,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} = ?" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3b8b422a..fe56b56a 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,6 +1,5 @@ @@ -271,14 +270,6 @@ android:layout_height="wrap_content" android:text="@string/mms_file_size_limit" /> - - diff --git a/build.gradle b/build.gradle index bc5d9d2b..d4859658 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.5.31' repositories { google() jcenter()