diff --git a/qksms/src/main/java/common/util/Preferences.kt b/qksms/src/main/java/common/util/Preferences.kt index c0a9483e..eebc8cb9 100644 --- a/qksms/src/main/java/common/util/Preferences.kt +++ b/qksms/src/main/java/common/util/Preferences.kt @@ -36,6 +36,6 @@ class Preferences @Inject constructor(rxPrefs: RxSharedPreferences) { val delivery = rxPrefs.getBoolean("delivery", false) val unicode = rxPrefs.getBoolean("unicode", false) val mms = rxPrefs.getBoolean("mms", true) - val mmsSize = rxPrefs.getLong("mmsSize", -1) + val mmsSize = rxPrefs.getInteger("mmsSize", 100) } \ No newline at end of file diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index ea8d88a7..34c27784 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -83,14 +83,14 @@ class SendMessage @Inject constructor( attachments .map { uri -> RxImageConverters.uriToBitmap(context, uri).blockingFirst() } - .map { bitmap -> shrink(bitmap, 1000 * 1024) } + .map { bitmap -> shrink(bitmap, prefs.mmsSize.get() * 1024) } .forEach { bitmap -> message.addMedia(bitmap, "image/jpeg") } val transaction = Transaction(context, settings) transaction.sendNewMessage(message, threadId) } - private fun shrink(src: Bitmap, maxBytes: Long): ByteArray { + private fun shrink(src: Bitmap, maxBytes: Int): ByteArray { var step = 0.0 val factor = 0.5 val quality = 60 diff --git a/qksms/src/main/java/presentation/common/MenuItemAdapter.kt b/qksms/src/main/java/presentation/common/MenuItemAdapter.kt index ba1f3fea..7d0111d6 100644 --- a/qksms/src/main/java/presentation/common/MenuItemAdapter.kt +++ b/qksms/src/main/java/presentation/common/MenuItemAdapter.kt @@ -19,24 +19,48 @@ package presentation.common import android.content.Context -import android.view.View +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater import android.view.ViewGroup import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R +import common.util.Colors +import common.util.extensions.setTint +import common.util.extensions.setVisible import data.model.MenuItem -import presentation.common.base.QkAdapter -import presentation.common.base.QkViewHolder +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.menu_list_item.view.* +import presentation.common.base.QkAdapter +import presentation.common.base.QkViewHolder import javax.inject.Inject -class MenuItemAdapter @Inject constructor(private val context: Context): QkAdapter() { +class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter() { val menuItemClicks: Subject = PublishSubject.create() + private val disposables = CompositeDisposable() + + var selectedItem: Int? = null + set(value) { + val old = data.map { it.actionId }.indexOfFirst { it == field } + val new = data.map { it.actionId }.indexOfFirst { it == value } + + field = value + + old.let { notifyItemChanged(it) } + new.let { notifyItemChanged(it) } + } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - return QkViewHolder(View.inflate(context, R.layout.menu_list_item, null)) + val view = LayoutInflater.from(context).inflate(R.layout.menu_list_item, parent, false) + + disposables += colors.theme + .subscribe { view.check.setTint(it) } + + return QkViewHolder(view) } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { @@ -46,6 +70,12 @@ class MenuItemAdapter @Inject constructor(private val context: Context): QkAdapt view.clicks().subscribe { menuItemClicks.onNext(menuItem.actionId) } view.title.setText(menuItem.title) + view.check.setVisible(menuItem.actionId == selectedItem) + } + + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { + super.onDetachedFromRecyclerView(recyclerView) + disposables.clear() } } \ 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 7dbd400e..3fa8cbc5 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt @@ -26,6 +26,7 @@ import android.media.RingtoneManager import android.net.Uri import android.os.Build import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView import com.google.android.flexbox.FlexboxLayoutManager import com.jakewharton.rxbinding2.view.clicks @@ -34,23 +35,27 @@ 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 data.model.MenuItem import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.settings_activity.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* +import presentation.common.MenuItemAdapter import presentation.common.base.QkActivity import presentation.common.widget.PreferenceView +import javax.inject.Inject class SettingsActivity : QkActivity(), SettingsView { + @Inject lateinit var menuItemAdapter: MenuItemAdapter + override val viewModelClass = SettingsViewModel::class 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() + override val mmsSizeSelectedIntent: Subject by lazy { menuItemAdapter.menuItemClicks } // TODO remove this private val progressDialog by lazy { @@ -105,6 +110,27 @@ class SettingsActivity : QkActivity(), SettingsView { } } + private val mmsSizeDialog by lazy { + menuItemAdapter.data = arrayListOf( + MenuItem(R.string.menu_mms_size_100kb, 100), + MenuItem(R.string.menu_mms_size_200kb, 200), + MenuItem(R.string.menu_mms_size_300kb, 300), + MenuItem(R.string.menu_mms_size_600kb, 600), + MenuItem(R.string.menu_mms_size_1000kb, 1000), + MenuItem(R.string.menu_mms_size_no_limit, 0)) + + val recyclerView = RecyclerView(this) + recyclerView.layoutManager = LinearLayoutManager(this) + recyclerView.adapter = menuItemAdapter + recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) + AlertDialog.Builder(this) + .setTitle(R.string.settings_mms_size_title) + .setMessage(R.string.settings_mms_size_summary) + .setNegativeButton(R.string.button_cancel, null) + .setView(recyclerView) + .create() + } + override fun onCreate(savedInstanceState: Bundle?) { appComponent.inject(this) super.onCreate(savedInstanceState) @@ -160,7 +186,7 @@ class SettingsActivity : QkActivity(), SettingsView { mms.checkbox.isChecked = state.mmsEnabled - mmsSize.summary = state.maxMmsSize + menuItemAdapter.selectedItem = state.maxMmsSize } override fun showRingtonePicker(default: Uri) { @@ -172,9 +198,9 @@ class SettingsActivity : QkActivity(), SettingsView { startActivityForResult(intent, 123) } - override fun showMmsSizePicker() { - makeToast("Max MMS size") - } + override fun showMmsSizePicker() = mmsSizeDialog.show() + + override fun dismissMmsSizePicker() = mmsSizeDialog.dismiss() override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsState.kt b/qksms/src/main/java/presentation/feature/settings/SettingsState.kt index 5d27cc00..a9b3e1eb 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsState.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsState.kt @@ -31,5 +31,5 @@ data class SettingsState( val splitSmsEnabled: Boolean = false, val stripUnicodeEnabled: Boolean = false, val mmsEnabled: Boolean = true, - val maxMmsSize: String = "" + val maxMmsSize: Int = 100 ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsView.kt b/qksms/src/main/java/presentation/feature/settings/SettingsView.kt index 7a418521..a128947d 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsView.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsView.kt @@ -33,4 +33,5 @@ interface SettingsView : QkView { fun showRingtonePicker(default: Uri) fun showMmsSizePicker() + fun dismissMmsSizePicker() } diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt index fb18ecc0..54f77b4e 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt @@ -77,7 +77,7 @@ class SettingsViewModel : QkViewModel(SettingsState } disposables += prefs.mmsSize.asObservable().subscribe { maxMmsSize -> - newState { it.copy(maxMmsSize = maxMmsSize.toString()) } + newState { it.copy(maxMmsSize = maxMmsSize) } } disposables += fullSync @@ -135,5 +135,10 @@ class SettingsViewModel : QkViewModel(SettingsState view.ringtoneSelectedIntent .autoDisposable(view.scope()) .subscribe { ringtone -> prefs.ringtone.set(ringtone) } + + view.mmsSizeSelectedIntent + .doOnNext { view.dismissMmsSizePicker() } + .autoDisposable(view.scope()) + .subscribe { prefs.mmsSize.set(it) } } } \ No newline at end of file diff --git a/qksms/src/main/res/drawable/ic_check_black_24dp.xml b/qksms/src/main/res/drawable/ic_check_black_24dp.xml new file mode 100644 index 00000000..8d82bf82 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_check_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/qksms/src/main/res/layout/menu_list_item.xml b/qksms/src/main/res/layout/menu_list_item.xml index c427f470..762e72bc 100644 --- a/qksms/src/main/res/layout/menu_list_item.xml +++ b/qksms/src/main/res/layout/menu_list_item.xml @@ -21,16 +21,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/ripple" - android:orientation="vertical"> + android:gravity="center_vertical" + android:orientation="horizontal"> + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml index 90fc9307..3fe43c23 100644 --- a/qksms/src/main/res/layout/settings_activity.xml +++ b/qksms/src/main/res/layout/settings_activity.xml @@ -123,6 +123,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="visible" + app:summary="@string/settings_mms_size_summary" app:title="@string/settings_mms_size_title" /> Archive conversation Remove from archive Delete + No limit + 100KB + 200KB + 300KB + 600KB + 1000KB Optimizing database, this might take a minute… @@ -70,6 +76,7 @@ Remove accents from characters in outgoing SMS messages MMS enabled Max MMS attachment size + Compress the attachments in an MMS message Sync messages Re-sync your messages with the native Android SMS database @@ -79,6 +86,7 @@ Mark read Undo + Cancel Copied Archived conversation