Reformat RxJava extensions
This commit is contained in:
parent
5a4c82b860
commit
7c320b6fc4
@ -1,6 +0,0 @@
|
|||||||
package com.topjohnwu.magisk.extensions
|
|
||||||
|
|
||||||
import android.os.Handler
|
|
||||||
import android.os.Looper
|
|
||||||
|
|
||||||
fun ui(body: () -> Unit) = Handler(Looper.getMainLooper()).post(body)
|
|
@ -2,6 +2,7 @@ package com.topjohnwu.magisk.extensions
|
|||||||
|
|
||||||
import androidx.databinding.ObservableField
|
import androidx.databinding.ObservableField
|
||||||
import com.topjohnwu.magisk.utils.KObservableField
|
import com.topjohnwu.magisk.utils.KObservableField
|
||||||
|
import com.topjohnwu.superuser.internal.UiThreadHandler
|
||||||
import io.reactivex.*
|
import io.reactivex.*
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.disposables.Disposables
|
import io.reactivex.disposables.Disposables
|
||||||
@ -51,16 +52,16 @@ fun <T> Observable<T>.subscribeK(
|
|||||||
|
|
||||||
fun <T> Single<T>.subscribeK(
|
fun <T> Single<T>.subscribeK(
|
||||||
onError: OnErrorListener = { it.printStackTrace() },
|
onError: OnErrorListener = { it.printStackTrace() },
|
||||||
onNext: OnSuccessListener<T> = {}
|
onSuccess: OnSuccessListener<T> = {}
|
||||||
) = applySchedulers()
|
) = applySchedulers()
|
||||||
.subscribe(onNext, onError)
|
.subscribe(onSuccess, onError)
|
||||||
|
|
||||||
fun <T> Maybe<T>.subscribeK(
|
fun <T> Maybe<T>.subscribeK(
|
||||||
onError: OnErrorListener = { it.printStackTrace() },
|
onError: OnErrorListener = { it.printStackTrace() },
|
||||||
onComplete: OnCompleteListener = {},
|
onComplete: OnCompleteListener = {},
|
||||||
onNext: OnSuccessListener<T> = {}
|
onSuccess: OnSuccessListener<T> = {}
|
||||||
) = applySchedulers()
|
) = applySchedulers()
|
||||||
.subscribe(onNext, onError, onComplete)
|
.subscribe(onSuccess, onError, onComplete)
|
||||||
|
|
||||||
fun <T> Flowable<T>.subscribeK(
|
fun <T> Flowable<T>.subscribeK(
|
||||||
onError: OnErrorListener = { it.printStackTrace() },
|
onError: OnErrorListener = { it.printStackTrace() },
|
||||||
@ -104,54 +105,54 @@ fun Completable.updateBy(
|
|||||||
|
|
||||||
|
|
||||||
fun <T> Observable<T>.doOnSubscribeUi(body: () -> Unit) =
|
fun <T> Observable<T>.doOnSubscribeUi(body: () -> Unit) =
|
||||||
doOnSubscribe { ui { body() } }
|
doOnSubscribe { UiThreadHandler.run { body() } }
|
||||||
|
|
||||||
fun <T> Single<T>.doOnSubscribeUi(body: () -> Unit) =
|
fun <T> Single<T>.doOnSubscribeUi(body: () -> Unit) =
|
||||||
doOnSubscribe { ui { body() } }
|
doOnSubscribe { UiThreadHandler.run { body() } }
|
||||||
|
|
||||||
fun <T> Maybe<T>.doOnSubscribeUi(body: () -> Unit) =
|
fun <T> Maybe<T>.doOnSubscribeUi(body: () -> Unit) =
|
||||||
doOnSubscribe { ui { body() } }
|
doOnSubscribe { UiThreadHandler.run { body() } }
|
||||||
|
|
||||||
fun <T> Flowable<T>.doOnSubscribeUi(body: () -> Unit) =
|
fun <T> Flowable<T>.doOnSubscribeUi(body: () -> Unit) =
|
||||||
doOnSubscribe { ui { body() } }
|
doOnSubscribe { UiThreadHandler.run { body() } }
|
||||||
|
|
||||||
fun Completable.doOnSubscribeUi(body: () -> Unit) =
|
fun Completable.doOnSubscribeUi(body: () -> Unit) =
|
||||||
doOnSubscribe { ui { body() } }
|
doOnSubscribe { UiThreadHandler.run { body() } }
|
||||||
|
|
||||||
|
|
||||||
fun <T> Observable<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
fun <T> Observable<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
||||||
doOnError { ui { body(it) } }
|
doOnError { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun <T> Single<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
fun <T> Single<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
||||||
doOnError { ui { body(it) } }
|
doOnError { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun <T> Maybe<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
fun <T> Maybe<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
||||||
doOnError { ui { body(it) } }
|
doOnError { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun <T> Flowable<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
fun <T> Flowable<T>.doOnErrorUi(body: (Throwable) -> Unit) =
|
||||||
doOnError { ui { body(it) } }
|
doOnError { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun Completable.doOnErrorUi(body: (Throwable) -> Unit) =
|
fun Completable.doOnErrorUi(body: (Throwable) -> Unit) =
|
||||||
doOnError { ui { body(it) } }
|
doOnError { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
|
|
||||||
fun <T> Observable<T>.doOnNextUi(body: (T) -> Unit) =
|
fun <T> Observable<T>.doOnNextUi(body: (T) -> Unit) =
|
||||||
doOnNext { ui { body(it) } }
|
doOnNext { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun <T> Flowable<T>.doOnNextUi(body: (T) -> Unit) =
|
fun <T> Flowable<T>.doOnNextUi(body: (T) -> Unit) =
|
||||||
doOnNext { ui { body(it) } }
|
doOnNext { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun <T> Single<T>.doOnSuccessUi(body: (T) -> Unit) =
|
fun <T> Single<T>.doOnSuccessUi(body: (T) -> Unit) =
|
||||||
doOnSuccess { ui { body(it) } }
|
doOnSuccess { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun <T> Maybe<T>.doOnSuccessUi(body: (T) -> Unit) =
|
fun <T> Maybe<T>.doOnSuccessUi(body: (T) -> Unit) =
|
||||||
doOnSuccess { ui { body(it) } }
|
doOnSuccess { UiThreadHandler.run { body(it) } }
|
||||||
|
|
||||||
fun <T> Maybe<T>.doOnCompleteUi(body: () -> Unit) =
|
fun <T> Maybe<T>.doOnCompleteUi(body: () -> Unit) =
|
||||||
doOnComplete { ui { body() } }
|
doOnComplete { UiThreadHandler.run { body() } }
|
||||||
|
|
||||||
fun Completable.doOnCompleteUi(body: () -> Unit) =
|
fun Completable.doOnCompleteUi(body: () -> Unit) =
|
||||||
doOnComplete { ui { body() } }
|
doOnComplete { UiThreadHandler.run { body() } }
|
||||||
|
|
||||||
|
|
||||||
fun <T, R> Observable<List<T>>.mapList(
|
fun <T, R> Observable<List<T>>.mapList(
|
||||||
|
Loading…
Reference in New Issue
Block a user