From 6363c46134f9396171191400470c53cffa94ffc3 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 13 Jan 2018 15:04:46 -0500 Subject: [PATCH] Replace usage of CompositeDisposable with AutoDispose in Activities and Views --- qksms/build.gradle | 4 +++ .../presentation/common/base/QkActivity.kt | 35 ++++++++++--------- .../presentation/common/widget/AvatarView.kt | 35 +++++++++---------- .../presentation/common/widget/QkEditText.kt | 23 +++++------- .../presentation/common/widget/QkSwitch.kt | 18 ++++------ .../presentation/common/widget/QkTextView.kt | 25 +++++-------- .../presentation/common/widget/Separator.kt | 15 +++----- .../feature/compose/ComposeActivity.kt | 21 +++++++---- .../presentation/feature/main/MainActivity.kt | 18 ++++++---- .../feature/settings/SettingsActivity.kt | 6 ++-- .../feature/setup/SetupActivity.kt | 10 +++--- 11 files changed, 102 insertions(+), 108 deletions(-) diff --git a/qksms/build.gradle b/qksms/build.gradle index 080cd9a0..30b6907f 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -57,6 +57,10 @@ dependencies { compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.mixpanel.android:mixpanel-android:5.2.1' compile 'com.mlsdev.rximagepicker:library:2.0.2' + compile 'com.uber.autodispose:autodispose-android-archcomponents-kotlin:0.5.1' + compile 'com.uber.autodispose:autodispose-android-archcomponents-test-kotlin:0.5.1' + compile 'com.uber.autodispose:autodispose-android-kotlin:0.5.1' + compile 'com.uber.autodispose:autodispose-kotlin:0.5.1' compile 'io.reactivex.rxjava2:rxandroid:2.0.1' compile "io.reactivex.rxjava2:rxjava:2.1.4" compile 'io.reactivex.rxjava2:rxkotlin:2.1.0' diff --git a/qksms/src/main/java/presentation/common/base/QkActivity.kt b/qksms/src/main/java/presentation/common/base/QkActivity.kt index 09766f86..bdfb9e61 100644 --- a/qksms/src/main/java/presentation/common/base/QkActivity.kt +++ b/qksms/src/main/java/presentation/common/base/QkActivity.kt @@ -19,19 +19,20 @@ package presentation.common.base import android.annotation.SuppressLint +import android.arch.lifecycle.Lifecycle import android.arch.lifecycle.ViewModelProviders import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.kotlin.autoDisposable import common.util.Colors -import presentation.common.Navigator -import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.toolbar.* +import presentation.common.Navigator import javax.inject.Inject import kotlin.reflect.KClass @@ -45,20 +46,22 @@ abstract class QkActivity> : AppCompatActivity() { } protected val menu: Subject = BehaviorSubject.create() - protected var disposables = CompositeDisposable() @SuppressLint("InlinedApi") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) onNewIntent(intent) - disposables += colors.appThemeResources + colors.appThemeResources + .autoDisposable(scope()) .subscribe { res -> setTheme(res) } - disposables += colors.statusBarIcons + colors.statusBarIcons + .autoDisposable(scope()) .subscribe { systemUiVisibility -> window.decorView.systemUiVisibility = systemUiVisibility } - disposables += colors.statusBar + colors.statusBar + .autoDisposable(scope()) .subscribe { color -> window.statusBarColor = color } } @@ -66,7 +69,7 @@ abstract class QkActivity> : AppCompatActivity() { super.onPostCreate(savedInstanceState) // Update the colours of the menu items - disposables += Observables.combineLatest(menu, colors.theme, { menu, color -> + Observables.combineLatest(menu, colors.theme, { menu, color -> (0 until menu.size()) .map { position -> menu.getItem(position) } .forEach { menuItem -> @@ -75,25 +78,23 @@ abstract class QkActivity> : AppCompatActivity() { menuItem.icon = this } } - }).subscribe() + }).autoDisposable(scope(Lifecycle.Event.ON_DESTROY)).subscribe() - disposables += colors.textTertiary + colors.textTertiary .doOnNext { color -> toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(color) } } .doOnNext { color -> toolbar?.navigationIcon = toolbar?.navigationIcon?.apply { setTint(color) } } + .autoDisposable(scope(Lifecycle.Event.ON_DESTROY)) .subscribe() - disposables += colors.popupThemeResource + colors.popupThemeResource + .autoDisposable(scope(Lifecycle.Event.ON_DESTROY)) .subscribe { res -> toolbar?.popupTheme = res } - disposables += colors.toolbarColor + colors.toolbarColor + .autoDisposable(scope(Lifecycle.Event.ON_DESTROY)) .subscribe { color -> toolbar?.setBackgroundColor(color) } } - override fun onDestroy() { - super.onDestroy() - disposables.dispose() - } - override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { android.R.id.home -> { diff --git a/qksms/src/main/java/presentation/common/widget/AvatarView.kt b/qksms/src/main/java/presentation/common/widget/AvatarView.kt index ae6379e5..6a5f16a0 100644 --- a/qksms/src/main/java/presentation/common/widget/AvatarView.kt +++ b/qksms/src/main/java/presentation/common/widget/AvatarView.kt @@ -27,15 +27,15 @@ import android.view.View import android.widget.FrameLayout import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R +import com.uber.autodispose.android.scope +import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.Colors import common.util.GlideApp import common.util.extensions.setTint import data.model.Contact -import presentation.common.Navigator -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign import kotlinx.android.synthetic.main.avatar_view.view.* +import presentation.common.Navigator import javax.inject.Inject class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) { @@ -43,8 +43,6 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet @Inject lateinit var colors: Colors @Inject lateinit var navigator: Navigator - private val disposables = CompositeDisposable() - var contact: Contact? = null set(value) { field = value @@ -61,24 +59,23 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet override fun onAttachedToWindow() { super.onAttachedToWindow() - disposables += colors.theme + colors.theme + .autoDisposable(scope()) .subscribe { color -> background.setTint(color) } - disposables += colors.textPrimaryOnTheme + colors.textPrimaryOnTheme + .autoDisposable(scope()) .subscribe { color -> icon.setTint(color) } - disposables += clicks().subscribe { - contact?.lookupKey?.takeIf { it.isNotEmpty() }?.let { key -> - val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, key) - ContactsContract.QuickContact.showQuickContact(context, this@AvatarView, uri, - ContactsContract.QuickContact.MODE_MEDIUM, null) - } - } - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - disposables.clear() + clicks() + .autoDisposable(scope()) + .subscribe { + contact?.lookupKey?.takeIf { it.isNotEmpty() }?.let { key -> + val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, key) + ContactsContract.QuickContact.showQuickContact(context, this@AvatarView, uri, + ContactsContract.QuickContact.MODE_MEDIUM, null) + } + } } override fun onFinishInflate() { diff --git a/qksms/src/main/java/presentation/common/widget/QkEditText.kt b/qksms/src/main/java/presentation/common/widget/QkEditText.kt index 2244366c..44ccd00a 100644 --- a/qksms/src/main/java/presentation/common/widget/QkEditText.kt +++ b/qksms/src/main/java/presentation/common/widget/QkEditText.kt @@ -22,11 +22,11 @@ import android.content.Context import android.util.AttributeSet import android.widget.EditText import com.moez.QKSMS.R +import com.uber.autodispose.android.scope +import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.Colors import io.reactivex.Observable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject /** @@ -39,7 +39,6 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet @Inject lateinit var colors: Colors - private val disposables = CompositeDisposable() private var textColorObservable: Observable? = null private var textColorHintObservable: Observable? = null @@ -69,19 +68,13 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet override fun onAttachedToWindow() { super.onAttachedToWindow() - textColorObservable?.let { observable -> - disposables += observable.subscribe { color -> setTextColor(color) } - } + textColorObservable + ?.autoDisposable(scope()) + ?.subscribe { color -> setTextColor(color) } - textColorHintObservable?.let { observable -> - disposables += observable.subscribe { color -> setHintTextColor(color) } - } - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - - disposables.dispose() + textColorHintObservable + ?.autoDisposable(scope()) + ?.subscribe { color -> setHintTextColor(color) } } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/common/widget/QkSwitch.kt b/qksms/src/main/java/presentation/common/widget/QkSwitch.kt index e596d01c..72259a25 100644 --- a/qksms/src/main/java/presentation/common/widget/QkSwitch.kt +++ b/qksms/src/main/java/presentation/common/widget/QkSwitch.kt @@ -22,20 +22,18 @@ import android.content.Context import android.content.res.ColorStateList import android.support.v7.widget.SwitchCompat import android.util.AttributeSet +import com.uber.autodispose.android.scope +import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.Colors import common.util.extensions.withAlpha -import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SwitchCompat(context, attrs) { @Inject lateinit var colors: Colors - private val disposables = CompositeDisposable() - init { appComponent.inject(this) } @@ -48,20 +46,16 @@ class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? intArrayOf(android.R.attr.state_checked), intArrayOf()) - disposables += Observables.combineLatest(colors.theme, colors.switchThumbEnabled, colors.switchThumbDisabled, + Observables.combineLatest(colors.theme, colors.switchThumbEnabled, colors.switchThumbDisabled, { color, enabled, disabled -> intArrayOf(disabled, color, enabled) }) .map { values -> ColorStateList(states, values) } + .autoDisposable(scope()) .subscribe { tintList -> thumbTintList = tintList } - disposables += Observables.combineLatest(colors.theme, colors.switchTrackEnabled, colors.switchTrackDisabled, + Observables.combineLatest(colors.theme, colors.switchTrackEnabled, colors.switchTrackDisabled, { color, enabled, disabled -> intArrayOf(disabled, color.withAlpha(0x4D), enabled) }) .map { values -> ColorStateList(states, values) } + .autoDisposable(scope()) .subscribe { tintList -> trackTintList = tintList } } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - disposables.clear() - } - } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/common/widget/QkTextView.kt b/qksms/src/main/java/presentation/common/widget/QkTextView.kt index 6f45f483..586ced26 100644 --- a/qksms/src/main/java/presentation/common/widget/QkTextView.kt +++ b/qksms/src/main/java/presentation/common/widget/QkTextView.kt @@ -22,11 +22,11 @@ import android.content.Context import android.support.v7.widget.AppCompatTextView import android.util.AttributeSet import com.moez.QKSMS.R +import com.uber.autodispose.android.scope +import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.Colors import io.reactivex.Observable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject open class QkTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) @@ -34,7 +34,6 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu @Inject lateinit var colors: Colors - private val disposables = CompositeDisposable() private var textColorObservable: Observable? = null init { @@ -50,25 +49,19 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu 5 -> colors.textTertiaryOnTheme else -> null } + recycle() } } override fun onAttachedToWindow() { super.onAttachedToWindow() - - textColorObservable?.let { observable -> - disposables += observable.subscribe { color -> - setTextColor(color) - setLinkTextColor(color) - } - } - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - - disposables.dispose() + textColorObservable + ?.autoDisposable(scope()) + ?.subscribe { color -> + setTextColor(color) + setLinkTextColor(color) + } } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/common/widget/Separator.kt b/qksms/src/main/java/presentation/common/widget/Separator.kt index 3493625f..1d686b68 100644 --- a/qksms/src/main/java/presentation/common/widget/Separator.kt +++ b/qksms/src/main/java/presentation/common/widget/Separator.kt @@ -21,30 +21,25 @@ package presentation.common.widget import android.content.Context import android.util.AttributeSet import android.view.View +import com.uber.autodispose.android.scope +import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.Colors -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject class Separator @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : View(context, attrs) { @Inject lateinit var colors: Colors - private val disposables = CompositeDisposable() - init { appComponent.inject(this) } override fun onAttachedToWindow() { super.onAttachedToWindow() - disposables += colors.separator.subscribe { color -> setBackgroundColor(color) } - } - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - disposables.dispose() + colors.separator + .autoDisposable(scope()) + .subscribe { color -> setBackgroundColor(color) } } - } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index 2c877594..8d0f1b4f 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt @@ -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(), 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) diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index 45c780b0..bb563843 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -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(), 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(), 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(), 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() { diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt index 60f81c57..995451fd 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt @@ -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(), 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 diff --git a/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt b/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt index 64013719..7ce84b89 100644 --- a/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt +++ b/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt @@ -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(), SetupView { @@ -50,7 +51,8 @@ class SetupActivity : QkActivity(), SetupView { setContentView(R.layout.setup_activity) viewModel.bindView(this) - disposables += colors.background + colors.background + .autoDisposable(scope()) .subscribe { color -> window.decorView.setBackgroundColor(color) } }