From 2486042d8fb8b8d1b77726c462c852ba1d53395f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 19 Jan 2018 14:06:19 -0500 Subject: [PATCH] Display option to select Max MMS size --- .../main/java/common/util/extensions/ContextExtensions.kt | 4 ++++ .../java/presentation/feature/settings/SettingsActivity.kt | 6 ++++++ .../main/java/presentation/feature/settings/SettingsView.kt | 2 ++ .../java/presentation/feature/settings/SettingsViewModel.kt | 3 +-- qksms/src/main/res/layout/settings_activity.xml | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/qksms/src/main/java/common/util/extensions/ContextExtensions.kt b/qksms/src/main/java/common/util/extensions/ContextExtensions.kt index b0aaa29a..85cb4db4 100644 --- a/qksms/src/main/java/common/util/extensions/ContextExtensions.kt +++ b/qksms/src/main/java/common/util/extensions/ContextExtensions.kt @@ -29,4 +29,8 @@ fun Context.getColorCompat(colorRes: Int): Int { fun Context.makeToast(@StringRes res: Int, duration: Int = Toast.LENGTH_SHORT) { Toast.makeText(this, res, duration).show() +} + +fun Context.makeToast(text: String, duration: Int = Toast.LENGTH_SHORT) { + Toast.makeText(this, text, duration).show() } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt index 995451fd..7dbd400e 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt @@ -34,6 +34,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.extensions.dpToPx +import common.util.extensions.makeToast import common.util.extensions.setVisible import io.reactivex.Observable import io.reactivex.subjects.PublishSubject @@ -49,6 +50,7 @@ class SettingsActivity : QkActivity(), SettingsView { override val preferenceClickIntent: Subject = PublishSubject.create() override val themeSelectedIntent: Observable by lazy { themeAdapter.colorSelected } override val ringtoneSelectedIntent: Subject = PublishSubject.create() + override val mmsSizeSelectedIntent: Subject = PublishSubject.create() // TODO remove this private val progressDialog by lazy { @@ -170,6 +172,10 @@ class SettingsActivity : QkActivity(), SettingsView { startActivityForResult(intent, 123) } + override fun showMmsSizePicker() { + makeToast("Max MMS size") + } + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) if (requestCode == 123 && resultCode == Activity.RESULT_OK) { diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsView.kt b/qksms/src/main/java/presentation/feature/settings/SettingsView.kt index b3479a06..7a418521 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsView.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsView.kt @@ -29,6 +29,8 @@ interface SettingsView : QkView { val preferenceClickIntent: Subject val themeSelectedIntent: Observable val ringtoneSelectedIntent: Observable + val mmsSizeSelectedIntent: Observable fun showRingtonePicker(default: Uri) + fun showMmsSizePicker() } diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt index 6670b87c..fb18ecc0 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt @@ -114,8 +114,7 @@ class SettingsViewModel : QkViewModel(SettingsState R.id.mms -> prefs.mms.set(!prefs.mms.get()) - R.id.mmsSize -> { - } + R.id.mmsSize -> view.showMmsSizePicker() R.id.sync -> { newState { it.copy(syncing = true) } diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml index 0f649765..90fc9307 100644 --- a/qksms/src/main/res/layout/settings_activity.xml +++ b/qksms/src/main/res/layout/settings_activity.xml @@ -122,7 +122,7 @@ android:id="@+id/mmsSize" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="gone" + android:visibility="visible" app:title="@string/settings_mms_size_title" />