forked from upstream-mirrors/quik
Upgrade to latest Autodispose
This commit is contained in:
@@ -24,15 +24,12 @@ import android.view.ViewGroup
|
||||
import androidx.annotation.LayoutRes
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.bluelinelabs.conductor.Controller
|
||||
import com.bluelinelabs.conductor.autodispose.ControllerEvent
|
||||
import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
|
||||
import com.uber.autodispose.LifecycleScopeProvider
|
||||
import com.bluelinelabs.conductor.archlifecycle.LifecycleController
|
||||
import kotlinx.android.extensions.LayoutContainer
|
||||
import kotlinx.android.synthetic.*
|
||||
import kotlinx.android.synthetic.main.toolbar.view.*
|
||||
|
||||
abstract class QkController<ViewContract : QkViewContract<State>, State, Presenter : QkPresenter<ViewContract, State>> : Controller(), LayoutContainer {
|
||||
abstract class QkController<ViewContract : QkViewContract<State>, State, Presenter : QkPresenter<ViewContract, State>> : LifecycleController(), LayoutContainer {
|
||||
|
||||
abstract var presenter: Presenter
|
||||
|
||||
@@ -80,8 +77,4 @@ abstract class QkController<ViewContract : QkViewContract<State>, State, Present
|
||||
presenter.onCleared()
|
||||
}
|
||||
|
||||
fun scope(): LifecycleScopeProvider<ControllerEvent> {
|
||||
return ControllerScopeProvider.from(this)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,8 @@
|
||||
package com.moez.QKSMS.common.base
|
||||
|
||||
import androidx.annotation.CallSuper
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
|
||||
@@ -27,11 +27,11 @@ import android.view.View
|
||||
import androidx.core.view.iterator
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.androidxcompat.scope
|
||||
import com.moez.QKSMS.common.util.Colors
|
||||
import com.moez.QKSMS.common.util.extensions.resolveThemeColor
|
||||
import com.moez.QKSMS.util.Preferences
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
|
||||
@@ -18,13 +18,10 @@
|
||||
*/
|
||||
package com.moez.QKSMS.common.base
|
||||
|
||||
import com.bluelinelabs.conductor.autodispose.ControllerEvent
|
||||
import com.uber.autodispose.LifecycleScopeProvider
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
|
||||
interface QkViewContract<in State> {
|
||||
interface QkViewContract<in State>: LifecycleOwner {
|
||||
|
||||
fun render(state: State)
|
||||
|
||||
fun scope(): LifecycleScopeProvider<ControllerEvent>
|
||||
|
||||
}
|
||||
@@ -20,8 +20,8 @@ package com.moez.QKSMS.common.base
|
||||
|
||||
import androidx.annotation.CallSuper
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.moez.QKSMS.common.androidxcompat.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
|
||||
Reference in New Issue
Block a user