forked from upstream-mirrors/quik
@@ -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)
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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<MenuItem>() {
|
||||
class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<MenuItem>() {
|
||||
|
||||
val menuItemClicks: Subject<Int> = 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()
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<SettingsViewModel>(), SettingsView {
|
||||
|
||||
@Inject lateinit var menuItemAdapter: MenuItemAdapter
|
||||
|
||||
override val viewModelClass = SettingsViewModel::class
|
||||
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
|
||||
override val themeSelectedIntent: Observable<Int> by lazy { themeAdapter.colorSelected }
|
||||
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
|
||||
override val mmsSizeSelectedIntent: Subject<Int> = PublishSubject.create()
|
||||
override val mmsSizeSelectedIntent: Subject<Int> by lazy { menuItemAdapter.menuItemClicks }
|
||||
|
||||
// TODO remove this
|
||||
private val progressDialog by lazy {
|
||||
@@ -105,6 +110,27 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), 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<SettingsViewModel>(), 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<SettingsViewModel>(), 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)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
@@ -33,4 +33,5 @@ interface SettingsView : QkView<SettingsState> {
|
||||
|
||||
fun showRingtonePicker(default: Uri)
|
||||
fun showMmsSizePicker()
|
||||
fun dismissMmsSizePicker()
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(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<SettingsView, SettingsState>(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) }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
<!--
|
||||
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
~
|
||||
~ This file is part of QKSMS.
|
||||
~
|
||||
~ QKSMS is free software: you can redistribute it and/or modify
|
||||
~ it under the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation, either version 3 of the License, or
|
||||
~ (at your option) any later version.
|
||||
~
|
||||
~ QKSMS is distributed in the hope that it will be useful,
|
||||
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
~ GNU General Public License for more details.
|
||||
~
|
||||
~ You should have received a copy of the GNU General Public License
|
||||
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
|
||||
</vector>
|
||||
@@ -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">
|
||||
|
||||
<presentation.common.widget.QkTextView
|
||||
android:id="@+id/title"
|
||||
style="@style/TextPrimary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:paddingBottom="12dp"
|
||||
android:paddingLeft="24dp"
|
||||
android:paddingRight="24dp"
|
||||
android:paddingTop="12dp" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/check"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:layout_marginRight="24dp"
|
||||
android:src="@drawable/ic_check_black_24dp" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -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" />
|
||||
|
||||
<presentation.common.widget.PreferenceView
|
||||
|
||||
@@ -37,6 +37,12 @@
|
||||
<string name="menu_archive">Archive conversation</string>
|
||||
<string name="menu_unarchive">Remove from archive</string>
|
||||
<string name="menu_delete">Delete</string>
|
||||
<string name="menu_mms_size_no_limit">No limit</string>
|
||||
<string name="menu_mms_size_100kb">100KB</string>
|
||||
<string name="menu_mms_size_200kb">200KB</string>
|
||||
<string name="menu_mms_size_300kb">300KB</string>
|
||||
<string name="menu_mms_size_600kb">600KB</string>
|
||||
<string name="menu_mms_size_1000kb">1000KB</string>
|
||||
|
||||
<string name="main_syncing">Optimizing database, this might take a minute…</string>
|
||||
|
||||
@@ -70,6 +76,7 @@
|
||||
<string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
|
||||
<string name="settings_mms_title">MMS enabled</string>
|
||||
<string name="settings_mms_size_title">Max MMS attachment size</string>
|
||||
<string name="settings_mms_size_summary">Compress the attachments in an MMS message</string>
|
||||
<string name="settings_sync_title">Sync messages</string>
|
||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||
|
||||
@@ -79,6 +86,7 @@
|
||||
<string name="notification_read">Mark read</string>
|
||||
|
||||
<string name="button_undo">Undo</string>
|
||||
<string name="button_cancel">Cancel</string>
|
||||
|
||||
<string name="toast_copied">Copied</string>
|
||||
<string name="toast_archived">Archived conversation</string>
|
||||
|
||||
Reference in New Issue
Block a user