From 1cf975bc26903e9a912e84621eb4909af74bdb4b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 22 Sep 2018 03:00:15 -0400 Subject: [PATCH] Use CompositeDisposable instead of Lifecycle when creating ConversationTouchItemCallback --- .../ConversationItemTouchCallback.kt | 16 ++++++++++------ .../com/moez/QKSMS/feature/main/MainActivity.kt | 8 ++++++++ .../QKSMS/feature/main/MainActivityModule.kt | 6 ++++-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt index 2c5d117e..b7b87ec6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt @@ -32,7 +32,10 @@ import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.util.Preferences import com.uber.autodispose.kotlin.autoDisposable +import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.Observables +import io.reactivex.rxkotlin.plusAssign +import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import javax.inject.Inject @@ -40,7 +43,7 @@ import javax.inject.Inject class ConversationItemTouchCallback @Inject constructor( colors: Colors, - lifecycle: Lifecycle, + disposables: CompositeDisposable, prefs: Preferences, private val context: Context ) : ItemTouchHelper.SimpleCallback(0, 0) { @@ -61,11 +64,12 @@ class ConversationItemTouchCallback @Inject constructor( private val iconLength = 24.dpToPx(context) init { - colors.themeObservable() - .autoDisposable(lifecycle.scope()) - .subscribe { theme -> paint.color = theme.theme } + disposables += colors.themeObservable() + .doOnNext { theme -> paint.color = theme.theme } + .subscribeOn(Schedulers.io()) + .subscribe() - Observables + disposables += Observables .combineLatest(prefs.swipeRight.asObservable(), prefs.swipeLeft.asObservable(), colors.themeObservable()) { right, left, theme -> rightAction = right rightIcon = iconForAction(right, theme.textPrimary) @@ -74,7 +78,7 @@ class ConversationItemTouchCallback @Inject constructor( setDefaultSwipeDirs((if (right == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.RIGHT) or (if (left == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.LEFT)) } - .autoDisposable(lifecycle.scope()) + .subscribeOn(Schedulers.io()) .subscribe() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 682bc036..71f8b7ef 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -30,6 +30,7 @@ import android.view.View import androidx.appcompat.app.ActionBarDrawerToggle import androidx.core.app.ActivityCompat import androidx.core.view.GravityCompat +import androidx.core.view.accessibility.AccessibilityEventCompat.setAction import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders @@ -56,6 +57,7 @@ import com.moez.QKSMS.repository.SyncRepository import com.uber.autodispose.kotlin.autoDisposable import dagger.android.AndroidInjection import io.reactivex.Observable +import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.drawer_view.* @@ -64,6 +66,7 @@ import javax.inject.Inject class MainActivity : QkThemedActivity(), MainView { + @Inject lateinit var disposables: CompositeDisposable @Inject lateinit var navigator: Navigator @Inject lateinit var conversationsAdapter: ConversationsAdapter @Inject lateinit var drawerBadgesExperiment: DrawerBadgesExperiment @@ -290,6 +293,11 @@ class MainActivity : QkThemedActivity(), MainView { activityResumedIntent.onNext(Unit) } + override fun onDestroy() { + super.onDestroy() + disposables.dispose() + } + override fun showBackButton(show: Boolean) { toggle.onDrawerSlide(drawer, if (show) 1f else 0f) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt index f87b6c88..d616c4d2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt @@ -18,18 +18,20 @@ */ package com.moez.QKSMS.feature.main -import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModel import com.moez.QKSMS.injection.ViewModelKey +import com.moez.QKSMS.injection.scope.ActivityScope import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import io.reactivex.disposables.CompositeDisposable @Module class MainActivityModule { @Provides - fun provideLifecycle(activity: MainActivity): Lifecycle = activity.lifecycle + @ActivityScope + fun provideCompositeDiposableLifecycle(): CompositeDisposable = CompositeDisposable() @Provides @IntoMap