Use CompositeDisposable instead of Lifecycle when creating ConversationTouchItemCallback

This commit is contained in:
Moez Bhatti
2018-09-22 03:00:15 -04:00
parent d43b4be57a
commit 1cf975bc26
3 changed files with 22 additions and 8 deletions
@@ -32,7 +32,10 @@ import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.dpToPx
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.kotlin.autoDisposable import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import javax.inject.Inject import javax.inject.Inject
@@ -40,7 +43,7 @@ import javax.inject.Inject
class ConversationItemTouchCallback @Inject constructor( class ConversationItemTouchCallback @Inject constructor(
colors: Colors, colors: Colors,
lifecycle: Lifecycle, disposables: CompositeDisposable,
prefs: Preferences, prefs: Preferences,
private val context: Context private val context: Context
) : ItemTouchHelper.SimpleCallback(0, 0) { ) : ItemTouchHelper.SimpleCallback(0, 0) {
@@ -61,11 +64,12 @@ class ConversationItemTouchCallback @Inject constructor(
private val iconLength = 24.dpToPx(context) private val iconLength = 24.dpToPx(context)
init { init {
colors.themeObservable() disposables += colors.themeObservable()
.autoDisposable(lifecycle.scope()) .doOnNext { theme -> paint.color = theme.theme }
.subscribe { theme -> paint.color = theme.theme } .subscribeOn(Schedulers.io())
.subscribe()
Observables disposables += Observables
.combineLatest(prefs.swipeRight.asObservable(), prefs.swipeLeft.asObservable(), colors.themeObservable()) { right, left, theme -> .combineLatest(prefs.swipeRight.asObservable(), prefs.swipeLeft.asObservable(), colors.themeObservable()) { right, left, theme ->
rightAction = right rightAction = right
rightIcon = iconForAction(right, theme.textPrimary) rightIcon = iconForAction(right, theme.textPrimary)
@@ -74,7 +78,7 @@ class ConversationItemTouchCallback @Inject constructor(
setDefaultSwipeDirs((if (right == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.RIGHT) setDefaultSwipeDirs((if (right == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.RIGHT)
or (if (left == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.LEFT)) or (if (left == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.LEFT))
} }
.autoDisposable(lifecycle.scope()) .subscribeOn(Schedulers.io())
.subscribe() .subscribe()
} }
@@ -30,6 +30,7 @@ import android.view.View
import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.view.GravityCompat import androidx.core.view.GravityCompat
import androidx.core.view.accessibility.AccessibilityEventCompat.setAction
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
@@ -56,6 +57,7 @@ import com.moez.QKSMS.repository.SyncRepository
import com.uber.autodispose.kotlin.autoDisposable import com.uber.autodispose.kotlin.autoDisposable
import dagger.android.AndroidInjection import dagger.android.AndroidInjection
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.drawer_view.*
@@ -64,6 +66,7 @@ import javax.inject.Inject
class MainActivity : QkThemedActivity(), MainView { class MainActivity : QkThemedActivity(), MainView {
@Inject lateinit var disposables: CompositeDisposable
@Inject lateinit var navigator: Navigator @Inject lateinit var navigator: Navigator
@Inject lateinit var conversationsAdapter: ConversationsAdapter @Inject lateinit var conversationsAdapter: ConversationsAdapter
@Inject lateinit var drawerBadgesExperiment: DrawerBadgesExperiment @Inject lateinit var drawerBadgesExperiment: DrawerBadgesExperiment
@@ -290,6 +293,11 @@ class MainActivity : QkThemedActivity(), MainView {
activityResumedIntent.onNext(Unit) activityResumedIntent.onNext(Unit)
} }
override fun onDestroy() {
super.onDestroy()
disposables.dispose()
}
override fun showBackButton(show: Boolean) { override fun showBackButton(show: Boolean) {
toggle.onDrawerSlide(drawer, if (show) 1f else 0f) toggle.onDrawerSlide(drawer, if (show) 1f else 0f)
} }
@@ -18,18 +18,20 @@
*/ */
package com.moez.QKSMS.feature.main package com.moez.QKSMS.feature.main
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import com.moez.QKSMS.injection.ViewModelKey import com.moez.QKSMS.injection.ViewModelKey
import com.moez.QKSMS.injection.scope.ActivityScope
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.multibindings.IntoMap import dagger.multibindings.IntoMap
import io.reactivex.disposables.CompositeDisposable
@Module @Module
class MainActivityModule { class MainActivityModule {
@Provides @Provides
fun provideLifecycle(activity: MainActivity): Lifecycle = activity.lifecycle @ActivityScope
fun provideCompositeDiposableLifecycle(): CompositeDisposable = CompositeDisposable()
@Provides @Provides
@IntoMap @IntoMap