mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Replace usage of CompositeDisposable with AutoDispose in Activities and Views
This commit is contained in:
@@ -31,6 +31,8 @@ import com.google.android.flexbox.FlexboxLayoutManager
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.widget.textChanges
|
||||
import com.moez.QKSMS.R
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.di.appComponent
|
||||
import common.util.extensions.setBackgroundTint
|
||||
import common.util.extensions.setTint
|
||||
@@ -40,7 +42,6 @@ import data.model.Contact
|
||||
import data.model.Message
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.compose_activity.*
|
||||
@@ -132,27 +133,33 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
|
||||
intArrayOf(android.R.attr.state_enabled),
|
||||
intArrayOf(-android.R.attr.state_enabled))
|
||||
|
||||
disposables += Observables
|
||||
Observables
|
||||
.combineLatest(colors.textPrimaryOnTheme, colors.textTertiaryOnTheme, { primary, tertiary ->
|
||||
ColorStateList(states, intArrayOf(primary, tertiary))
|
||||
})
|
||||
.autoDisposable(scope())
|
||||
.subscribe { tintList -> sendIcon.imageTintList = tintList }
|
||||
|
||||
disposables += colors.theme
|
||||
colors.theme
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> send.setBackgroundTint(color) }
|
||||
|
||||
disposables += colors.textSecondary
|
||||
colors.textSecondary
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> attach.setTint(color) }
|
||||
|
||||
disposables += colors.bubble
|
||||
colors.bubble
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> messageBackground.setBackgroundTint(color) }
|
||||
|
||||
disposables += colors.background
|
||||
colors.background
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> contacts.setBackgroundColor(color) }
|
||||
|
||||
disposables += colors.composeBackground
|
||||
colors.composeBackground
|
||||
.doOnNext { color -> composeBar.setBackgroundTint(color) }
|
||||
.doOnNext { color -> window.decorView.setBackgroundColor(color) }
|
||||
.autoDisposable(scope())
|
||||
.subscribe()
|
||||
|
||||
window.callback = ComposeWindowCallback(window.callback, this)
|
||||
|
||||
@@ -35,13 +35,14 @@ import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.widget.textChanges
|
||||
import com.moez.QKSMS.R
|
||||
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.setBackgroundTint
|
||||
import common.util.extensions.setVisible
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.drawer_view.*
|
||||
@@ -118,9 +119,10 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
scheduled.isEnabled = false
|
||||
blocked.isEnabled = false
|
||||
|
||||
disposables += colors.background
|
||||
colors.background
|
||||
.doOnNext { color -> window.decorView.setBackgroundColor(color) }
|
||||
.doOnNext { color -> drawer.setBackgroundColor(color) }
|
||||
.autoDisposable(scope())
|
||||
.subscribe()
|
||||
|
||||
val states = arrayOf(
|
||||
@@ -136,17 +138,19 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
}
|
||||
|
||||
// Set the theme color tint to the progressbar and FAB
|
||||
disposables += colors.theme
|
||||
colors.theme
|
||||
.doOnNext { color -> syncingProgress.indeterminateTintList = ColorStateList.valueOf(color) }
|
||||
.doOnNext { color -> compose.setBackgroundTint(color) }
|
||||
.autoDisposable(scope())
|
||||
.subscribe()
|
||||
|
||||
// Set the hamburger icon color
|
||||
disposables += colors.textSecondary
|
||||
colors.textSecondary
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> toggle.drawerArrowDrawable.color = color }
|
||||
|
||||
// Set the color for the drawer icons
|
||||
disposables += Observables
|
||||
Observables
|
||||
.combineLatest(colors.theme, colors.textSecondary, { theme, textSecondary ->
|
||||
ColorStateList(states, intArrayOf(theme, textSecondary))
|
||||
})
|
||||
@@ -156,14 +160,16 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
.doOnNext { tintList -> blockedIcon.imageTintList = tintList }
|
||||
.doOnNext { tintList -> settingsIcon.imageTintList = tintList }
|
||||
.doOnNext { tintList -> helpIcon.imageTintList = tintList }
|
||||
.autoDisposable(scope())
|
||||
.subscribe()
|
||||
|
||||
// Set the background highlight for the drawer options
|
||||
disposables += colors.separator
|
||||
colors.separator
|
||||
.doOnNext { color -> inbox.background = rowBackground(color) }
|
||||
.doOnNext { color -> archived.background = rowBackground(color) }
|
||||
.doOnNext { color -> scheduled.background = rowBackground(color) }
|
||||
.doOnNext { color -> blocked.background = rowBackground(color) }
|
||||
.autoDisposable(scope())
|
||||
.subscribe()
|
||||
|
||||
conversationsAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
|
||||
|
||||
@@ -30,11 +30,12 @@ import android.support.v7.widget.RecyclerView
|
||||
import com.google.android.flexbox.FlexboxLayoutManager
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
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.setVisible
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.settings_activity.*
|
||||
@@ -116,7 +117,8 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
vibration.setVisible(!supportsNotificationChannels)
|
||||
ringtone.setVisible(!supportsNotificationChannels)
|
||||
|
||||
disposables += colors.background
|
||||
colors.background
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
||||
|
||||
// Listen to clicks for all of the preferences
|
||||
|
||||
@@ -23,13 +23,14 @@ import android.os.Bundle
|
||||
import android.support.v4.app.ActivityCompat
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.di.appComponent
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkActivity
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.setup_activity.*
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkActivity
|
||||
import javax.inject.Inject
|
||||
|
||||
class SetupActivity : QkActivity<SetupViewModel>(), SetupView {
|
||||
@@ -50,7 +51,8 @@ class SetupActivity : QkActivity<SetupViewModel>(), SetupView {
|
||||
setContentView(R.layout.setup_activity)
|
||||
viewModel.bindView(this)
|
||||
|
||||
disposables += colors.background
|
||||
colors.background
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user