Skip to content

Commit

Permalink
Reuse scope() extension
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShaishavGandhi
ShaishavGandhi committed May 15, 2019
1 parent 4a7944b commit aea1483
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
26 changes: 13 additions & 13 deletions ...dispose-rxlifecycle/src/main/java/com/ubercab/autodispose/rxlifecycle/KotlinExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import io.reactivex.parallel.ParallelFlowable
/**
* Extension that converts a [LifecycleProvider] to [ScopeProvider].
*/
fun <E> LifecycleProvider<E>.toScopeProvider(event: E? = null): ScopeProvider {
fun <E> LifecycleProvider<E>.scope(event: E? = null): ScopeProvider {
return if (event == null) {
RxLifecycleInterop.from(this)
} else {
Expand All @@ -53,9 +53,9 @@ fun <E> LifecycleProvider<E>.toScopeProvider(event: E? = null): ScopeProvider {
@CheckReturnValue
inline fun <T, E> Flowable<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): FlowableSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))

This comment has been minimized.

Sign in to view

Copy link
@ZacSweers

ZacSweers May 15, 2019

Collaborator

you could simplify all of these to just a single this.as(AutoDispose.autoDisposable(lifecycleProvider.scope(event))) since event is nullable
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -69,9 +69,9 @@ inline fun <T, E> Flowable<T>.autoDisposable(lifecycleProvider: LifecycleProvide
@CheckReturnValue
inline fun <T, E> Observable<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): ObservableSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -85,9 +85,9 @@ inline fun <T, E> Observable<T>.autoDisposable(lifecycleProvider: LifecycleProvi
@CheckReturnValue
inline fun <T, E> Single<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): SingleSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -101,9 +101,9 @@ inline fun <T, E> Single<T>.autoDisposable(lifecycleProvider: LifecycleProvider<
@CheckReturnValue
inline fun <T, E> Maybe<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): MaybeSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -117,9 +117,9 @@ inline fun <T, E> Maybe<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E
@CheckReturnValue
inline fun <E> Completable.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): CompletableSubscribeProxy {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable<Any>(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable<Any>(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable<Any>(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable<Any>(lifecycleProvider.scope(event)))
}
}

Expand All @@ -133,8 +133,8 @@ inline fun <E> Completable.autoDisposable(lifecycleProvider: LifecycleProvider<E
@CheckReturnValue
inline fun <T, E> ParallelFlowable<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): ParallelFlowableSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}
26 changes: 13 additions & 13 deletions ...spose-rxlifecycle3/src/main/java/com/ubercab/autodispose/rxlifecycle3/KotlinExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import io.reactivex.parallel.ParallelFlowable
/**
* Extension that converts a [LifecycleProvider] to [ScopeProvider].
*/
fun <E> LifecycleProvider<E>.toScopeProvider(event: E? = null): ScopeProvider {
fun <E> LifecycleProvider<E>.scope(event: E? = null): ScopeProvider {
return if (event == null) {
RxLifecycleInterop.from(this)
} else {
Expand All @@ -53,9 +53,9 @@ fun <E> LifecycleProvider<E>.toScopeProvider(event: E? = null): ScopeProvider {
@CheckReturnValue
inline fun <T, E> Flowable<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): FlowableSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -69,9 +69,9 @@ inline fun <T, E> Flowable<T>.autoDisposable(lifecycleProvider: LifecycleProvide
@CheckReturnValue
inline fun <T, E> Observable<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): ObservableSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -85,9 +85,9 @@ inline fun <T, E> Observable<T>.autoDisposable(lifecycleProvider: LifecycleProvi
@CheckReturnValue
inline fun <T, E> Single<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): SingleSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -101,9 +101,9 @@ inline fun <T, E> Single<T>.autoDisposable(lifecycleProvider: LifecycleProvider<
@CheckReturnValue
inline fun <T, E> Maybe<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): MaybeSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

Expand All @@ -117,9 +117,9 @@ inline fun <T, E> Maybe<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E
@CheckReturnValue
inline fun <E> Completable.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): CompletableSubscribeProxy {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable<Any>(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable<Any>(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable<Any>(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable<Any>(lifecycleProvider.scope(event)))
}
}

Expand All @@ -133,8 +133,8 @@ inline fun <E> Completable.autoDisposable(lifecycleProvider: LifecycleProvider<E
@CheckReturnValue
inline fun <T, E> ParallelFlowable<T>.autoDisposable(lifecycleProvider: LifecycleProvider<E>, event: E? = null): ParallelFlowableSubscribeProxy<T> {
return if (event == null) {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope()))
} else {
this.`as`(AutoDispose.autoDisposable(RxLifecycleInterop.from(lifecycleProvider, event)))
this.`as`(AutoDispose.autoDisposable(lifecycleProvider.scope(event)))
}
}

0 comments on commit aea1483

Please sign in to comment.