File tree Expand file tree Collapse file tree 10 files changed +26
-14
lines changed
app/src/main/java/com/hoc/comicapp/ui Expand file tree Collapse file tree 10 files changed +26
-14
lines changed Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ import com.jakewharton.rxrelay3.PublishRelay
1515import io.reactivex.rxjava3.core.Observable
1616import io.reactivex.rxjava3.core.Observable.mergeArray
1717import io.reactivex.rxjava3.core.ObservableTransformer
18+ import io.reactivex.rxjava3.disposables.Disposable
1819import io.reactivex.rxjava3.kotlin.addTo
1920import io.reactivex.rxjava3.kotlin.ofType
2021import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -27,7 +28,7 @@ class CategoryDetailVM(
2728 private val intentS = PublishRelay .create<ViewIntent >()
2829 private val stateS = BehaviorRelay .createDefault(initialState)
2930
30- override fun processIntents (intents : Observable <ViewIntent >) = intents.subscribe(intentS)!!
31+ override fun processIntents (intents : Observable <ViewIntent >): Disposable = intents.subscribe(intentS)
3132
3233 private val initialProcessor =
3334 ObservableTransformer <ViewIntent .Initial , PartialChange > { intent ->
Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ import com.hoc.comicapp.utils.notOfType
1515import com.jakewharton.rxrelay3.PublishRelay
1616import io.reactivex.rxjava3.core.Observable
1717import io.reactivex.rxjava3.core.ObservableTransformer
18+ import io.reactivex.rxjava3.disposables.Disposable
1819import io.reactivex.rxjava3.kotlin.addTo
1920import io.reactivex.rxjava3.kotlin.ofType
2021import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -120,8 +121,8 @@ class ChapterDetailViewModel(
120121 )
121122 }
122123
123- override fun processIntents (intents : Observable <ViewIntent >) =
124- intents.subscribe(intentS)!!
124+ override fun processIntents (intents : Observable <ViewIntent >): Disposable =
125+ intents.subscribe(intentS)
125126
126127 init {
127128 intentS
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ import com.jakewharton.rxrelay3.BehaviorRelay
2626import com.jakewharton.rxrelay3.PublishRelay
2727import io.reactivex.rxjava3.core.Observable
2828import io.reactivex.rxjava3.core.ObservableTransformer
29+ import io.reactivex.rxjava3.disposables.Disposable
2930import io.reactivex.rxjava3.kotlin.addTo
3031import io.reactivex.rxjava3.kotlin.ofType
3132import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -52,8 +53,8 @@ class ComicDetailViewModel(
5253 private val intentS = PublishRelay .create<ComicDetailIntent >()
5354 private val stateS = BehaviorRelay .createDefault(initialState)
5455
55- override fun processIntents (intents : Observable <ComicDetailIntent >) =
56- intents.subscribe(intentS)!!
56+ override fun processIntents (intents : Observable <ComicDetailIntent >): Disposable =
57+ intents.subscribe(intentS)
5758
5859 private val initialProcessor =
5960 ObservableTransformer <ComicDetailIntent .Initial , ComicDetailPartialChange > { intent ->
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import com.hoc.comicapp.utils.notOfType
1212import com.jakewharton.rxrelay3.PublishRelay
1313import io.reactivex.rxjava3.core.Observable
1414import io.reactivex.rxjava3.core.ObservableTransformer
15+ import io.reactivex.rxjava3.disposables.Disposable
1516import io.reactivex.rxjava3.functions.BiFunction
1617import io.reactivex.rxjava3.kotlin.addTo
1718import io.reactivex.rxjava3.kotlin.ofType
@@ -25,7 +26,7 @@ class DownloadedComicsViewModel(
2526
2627 private val intentS = PublishRelay .create<ViewIntent >()
2728
28- override fun processIntents (intents : Observable <ViewIntent >) = intents.subscribe(intentS)!!
29+ override fun processIntents (intents : Observable <ViewIntent >): Disposable = intents.subscribe(intentS)
2930
3031 private val intentToChanges = ObservableTransformer <ViewIntent , PartialChange > { intents ->
3132 intents
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ import com.hoc.comicapp.worker.DownloadComicWorker
2020import com.jakewharton.rxrelay3.PublishRelay
2121import io.reactivex.rxjava3.core.Observable
2222import io.reactivex.rxjava3.core.ObservableTransformer
23+ import io.reactivex.rxjava3.disposables.Disposable
2324import io.reactivex.rxjava3.functions.BiFunction
2425import io.reactivex.rxjava3.kotlin.addTo
2526import io.reactivex.rxjava3.kotlin.ofType
@@ -76,7 +77,8 @@ class DownloadingChaptersViewModel(
7677 }
7778 }
7879
79- override fun processIntents (intents : Observable <ViewIntent >) = intents.subscribe(intentS)!!
80+ override fun processIntents (intents : Observable <ViewIntent >): Disposable =
81+ intents.subscribe(intentS)
8082
8183 init {
8284 Timber .d(" DownloadingChaptersViewModel::init" )
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ import com.hoc.comicapp.utils.notOfType
1313import com.jakewharton.rxrelay3.PublishRelay
1414import io.reactivex.rxjava3.core.Observable
1515import io.reactivex.rxjava3.core.ObservableTransformer
16+ import io.reactivex.rxjava3.disposables.Disposable
1617import io.reactivex.rxjava3.functions.BiFunction
1718import io.reactivex.rxjava3.kotlin.addTo
1819import io.reactivex.rxjava3.kotlin.ofType
@@ -25,7 +26,8 @@ class FavoriteComicsVM(
2526
2627 private val intentS = PublishRelay .create<ViewIntent >()
2728
28- override fun processIntents (intents : Observable <ViewIntent >) = intents.subscribe(intentS)!!
29+ override fun processIntents (intents : Observable <ViewIntent >): Disposable =
30+ intents.subscribe(intentS)
2931
3032 private val initialProcessor =
3133 ObservableTransformer <ViewIntent .Initial , PartialChange > { intent ->
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ import com.jakewharton.rxrelay3.BehaviorRelay
99import com.jakewharton.rxrelay3.PublishRelay
1010import io.reactivex.rxjava3.core.Observable
1111import io.reactivex.rxjava3.core.ObservableTransformer
12+ import io.reactivex.rxjava3.disposables.Disposable
1213import io.reactivex.rxjava3.kotlin.addTo
1314import io.reactivex.rxjava3.kotlin.ofType
1415import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -198,8 +199,8 @@ class HomeViewModel(
198199 .observeOn(rxSchedulerProvider.main)
199200 }
200201
201- override fun processIntents (intents : Observable <HomeViewIntent >) =
202- intents.subscribe(intentS)!!
202+ override fun processIntents (intents : Observable <HomeViewIntent >): Disposable =
203+ intents.subscribe(intentS)
203204
204205 init {
205206 intentS
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ import com.hoc.comicapp.ui.login.LoginContract.ViewState
1111import com.hoc.comicapp.utils.exhaustMap
1212import com.jakewharton.rxrelay3.PublishRelay
1313import io.reactivex.rxjava3.core.Observable
14+ import io.reactivex.rxjava3.disposables.Disposable
1415import io.reactivex.rxjava3.kotlin.addTo
1516import io.reactivex.rxjava3.kotlin.ofType
1617import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -22,7 +23,7 @@ class LoginVM(
2223
2324 private val intentS = PublishRelay .create<Intent >()
2425
25- override fun processIntents (intents : Observable <Intent >) = intents.subscribe(intentS)!!
26+ override fun processIntents (intents : Observable <Intent >): Disposable = intents.subscribe(intentS)
2627
2728 init {
2829 val emailObservable = intentS.ofType<Intent .EmailChanged >()
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ import com.hoc.comicapp.utils.exhaustMap
1717import com.jakewharton.rxrelay3.BehaviorRelay
1818import com.jakewharton.rxrelay3.PublishRelay
1919import io.reactivex.rxjava3.core.Observable
20+ import io.reactivex.rxjava3.disposables.Disposable
2021import io.reactivex.rxjava3.kotlin.addTo
2122import io.reactivex.rxjava3.kotlin.ofType
2223import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -28,7 +29,7 @@ class RegisterVM(
2829
2930 private val intentS = PublishRelay .create<Intent >()
3031
31- override fun processIntents (intents : Observable <Intent >) = intents.subscribe(intentS)!!
32+ override fun processIntents (intents : Observable <Intent >): Disposable = intents.subscribe(intentS)
3233
3334 init {
3435 val avatarSubject = BehaviorRelay .createDefault<Option <Uri >>(None )
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import com.hoc.comicapp.utils.exhaustMap
1212import com.jakewharton.rxrelay3.BehaviorRelay
1313import com.jakewharton.rxrelay3.PublishRelay
1414import io.reactivex.rxjava3.core.Observable
15+ import io.reactivex.rxjava3.disposables.Disposable
1516import io.reactivex.rxjava3.functions.BiFunction
1617import io.reactivex.rxjava3.kotlin.addTo
1718import io.reactivex.rxjava3.kotlin.ofType
@@ -27,8 +28,8 @@ class SearchComicViewModel(
2728 BaseViewModel <ViewIntent , ViewState , SingleEvent >(ViewState .initialState()) {
2829 private val intentS = PublishRelay .create<ViewIntent >()
2930
30- override fun processIntents (intents : Observable <ViewIntent >) =
31- intents.subscribe(intentS)!!
31+ override fun processIntents (intents : Observable <ViewIntent >): Disposable =
32+ intents.subscribe(intentS)
3233
3334 init {
3435 val stateS = BehaviorRelay .createDefault(initialState)
You can’t perform that action at this time.
0 commit comments