From c69d1b8c9048a740454ab38264ba9fd5b631259b Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sun, 11 Aug 2019 19:36:46 +0200 Subject: [PATCH] Upgrade to latest Autodispose --- build.gradle | 2 +- presentation/build.gradle | 17 +- .../AndroidLifecycleScopeProvider.java | 166 ------------------ .../AutodisposeAndroidLifecycle.kt | 74 -------- .../LifecycleEventsObservable.java | 124 ------------- .../moez/QKSMS/common/base/QkController.kt | 13 +- .../com/moez/QKSMS/common/base/QkPresenter.kt | 3 +- .../QKSMS/common/base/QkThemedActivity.kt | 4 +- .../moez/QKSMS/common/base/QkViewContract.kt | 7 +- .../com/moez/QKSMS/common/base/QkViewModel.kt | 4 +- .../moez/QKSMS/common/widget/AvatarView.kt | 2 +- .../QKSMS/common/widget/PagerTitleView.kt | 2 +- .../QKSMS/feature/backup/BackupPresenter.kt | 3 +- .../QKSMS/feature/blocked/BlockedViewModel.kt | 4 +- .../QKSMS/feature/compose/ComposeActivity.kt | 4 +- .../QKSMS/feature/compose/ComposeViewModel.kt | 4 +- .../ConversationInfoController.kt | 3 +- .../ConversationInfoPresenter.kt | 3 +- .../ConversationItemTouchCallback.kt | 4 - .../QKSMS/feature/gallery/GalleryViewModel.kt | 4 +- .../moez/QKSMS/feature/main/MainActivity.kt | 9 +- .../moez/QKSMS/feature/main/MainViewModel.kt | 4 +- .../NotificationPrefsActivity.kt | 4 +- .../NotificationPrefsViewModel.kt | 4 +- .../moez/QKSMS/feature/plus/PlusViewModel.kt | 4 +- .../QKSMS/feature/qkreply/QkReplyViewModel.kt | 4 +- .../feature/scheduled/ScheduledViewModel.kt | 4 +- .../feature/settings/SettingsController.kt | 3 +- .../feature/settings/SettingsPresenter.kt | 3 +- .../feature/settings/about/AboutPresenter.kt | 3 +- .../settings/swipe/SwipeActionsController.kt | 3 +- .../settings/swipe/SwipeActionsPresenter.kt | 3 +- .../themepicker/ThemePickerPresenter.kt | 3 +- 33 files changed, 67 insertions(+), 431 deletions(-) delete mode 100644 presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AndroidLifecycleScopeProvider.java delete mode 100644 presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AutodisposeAndroidLifecycle.kt delete mode 100644 presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/LifecycleEventsObservable.java diff --git a/build.gradle b/build.gradle index 5b07340b..80f55585 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.androidx_exifinterface_version = '1.0.0' ext.androidx_testrunner_version = '1.1.0-alpha3' ext.androidx_viewpager_version = '1.0.0-alpha01' - ext.autodispose_version = '0.7.0' + ext.autodispose_version = '1.3.0' ext.conductor_version = '2.1.5' ext.dagger_version = "2.16" ext.espresso_version = '3.1.0-alpha3' diff --git a/presentation/build.gradle b/presentation/build.gradle index 2d0140b3..a09bd23e 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -56,6 +56,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = "1.8" + } + lintOptions { abortOnError false } @@ -99,7 +103,7 @@ dependencies { // conductor implementation "com.bluelinelabs:conductor:$conductor_version" - implementation "com.bluelinelabs:conductor-autodispose:$conductor_version" + implementation "com.bluelinelabs:conductor-archlifecycle:$conductor_version" // glide implementation "com.github.bumptech.glide:glide:$glide_version" @@ -116,10 +120,11 @@ dependencies { implementation "com.jakewharton.rxbinding2:rxbinding-support-v4-kotlin:$rxbinding_version" // autodispose - implementation "com.uber.autodispose:autodispose-android-archcomponents-kotlin:$autodispose_version" - implementation "com.uber.autodispose:autodispose-android-archcomponents-test-kotlin:$autodispose_version" - implementation "com.uber.autodispose:autodispose-android-kotlin:$autodispose_version" - implementation "com.uber.autodispose:autodispose-kotlin:$autodispose_version" + implementation "com.uber.autodispose:autodispose-android-archcomponents:$autodispose_version" + implementation "com.uber.autodispose:autodispose-android-archcomponents-test:$autodispose_version" + implementation "com.uber.autodispose:autodispose-android:$autodispose_version" + implementation "com.uber.autodispose:autodispose:$autodispose_version" + implementation "com.uber.autodispose:autodispose-lifecycle:$autodispose_version" // dagger implementation "com.google.dagger:dagger:$dagger_version" @@ -136,12 +141,12 @@ dependencies { }) // realm + implementation 'com.akaita.java:rxjava2-debug:1.2.2' implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false } kapt "io.realm:realm-annotations:$realm_version" kapt "io.realm:realm-annotations-processor:$realm_version" // rxjava - implementation 'com.akaita.java:rxjava2-debug:1.2.2' implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version" implementation "io.reactivex.rxjava2:rxjava:$rxjava_version" implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version" diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AndroidLifecycleScopeProvider.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AndroidLifecycleScopeProvider.java deleted file mode 100644 index 79692732..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AndroidLifecycleScopeProvider.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package com.moez.QKSMS.common.androidxcompat; - -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleOwner; -import com.uber.autodispose.LifecycleEndedException; -import com.uber.autodispose.LifecycleScopeProvider; -import io.reactivex.Observable; -import io.reactivex.functions.Function; - -/** - * A {@link LifecycleScopeProvider} that can provide scoping for Android {@link Lifecycle} and - * {@link LifecycleOwner} classes. - *

- *


- *   AutoDispose.autoDisposable(AndroidLifecycleScopeProvider.from(lifecycleOwner))
- * 
- */ -public final class AndroidLifecycleScopeProvider - implements LifecycleScopeProvider { - - private static final Function DEFAULT_CORRESPONDING_EVENTS = - new Function() { - @Override public Lifecycle.Event apply(Lifecycle.Event lastEvent) throws Exception { - switch (lastEvent) { - case ON_CREATE: - return Lifecycle.Event.ON_DESTROY; - case ON_START: - return Lifecycle.Event.ON_STOP; - case ON_RESUME: - return Lifecycle.Event.ON_PAUSE; - case ON_PAUSE: - return Lifecycle.Event.ON_STOP; - case ON_STOP: - case ON_DESTROY: - default: - throw new LifecycleEndedException("Lifecycle has ended! Last event was " + lastEvent); - } - } - }; - - private final Function boundaryResolver; - - /** - * Creates a {@link AndroidLifecycleScopeProvider} for Android LifecycleOwners. - * - * @param owner the owner to scope for. - * @return a {@link AndroidLifecycleScopeProvider} against this owner. - */ - public static AndroidLifecycleScopeProvider from(LifecycleOwner owner) { - return from(owner.getLifecycle()); - } - - /** - * Creates a {@link AndroidLifecycleScopeProvider} for Android LifecycleOwners. - * - * @param owner the owner to scope for. - * @param untilEvent the event until the scope is valid. - * @return a {@link AndroidLifecycleScopeProvider} against this owner. - */ - public static AndroidLifecycleScopeProvider from( - LifecycleOwner owner, - Lifecycle.Event untilEvent) { - return from(owner.getLifecycle(), untilEvent); - } - - /** - * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. - * - * @param lifecycle the lifecycle to scope for. - * @return a {@link AndroidLifecycleScopeProvider} against this lifecycle. - */ - public static AndroidLifecycleScopeProvider from(Lifecycle lifecycle) { - return from(lifecycle, DEFAULT_CORRESPONDING_EVENTS); - } - - /** - * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. - * - * @param lifecycle the lifecycle to scope for. - * @param untilEvent the event until the scope is valid. - * @return a {@link AndroidLifecycleScopeProvider} against this lifecycle. - */ - public static AndroidLifecycleScopeProvider from( - Lifecycle lifecycle, - Lifecycle.Event untilEvent) { - return from(lifecycle, new UntilEventFunction(untilEvent)); - } - - /** - * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. - * - * @param owner the owner to scope for. - * @param boundaryResolver function that resolves the event boundary. - * @return a {@link AndroidLifecycleScopeProvider} against this owner. - */ - public static AndroidLifecycleScopeProvider from( - LifecycleOwner owner, - Function boundaryResolver) { - return from(owner.getLifecycle(), boundaryResolver); - } - - /** - * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. - * - * @param lifecycle the lifecycle to scope for. - * @param boundaryResolver function that resolves the event boundary. - * @return a {@link AndroidLifecycleScopeProvider} against this lifecycle. - */ - public static AndroidLifecycleScopeProvider from( - Lifecycle lifecycle, - Function boundaryResolver) { - return new AndroidLifecycleScopeProvider(lifecycle, boundaryResolver); - } - - private final LifecycleEventsObservable lifecycleObservable; - - private AndroidLifecycleScopeProvider(Lifecycle lifecycle, - Function boundaryResolver) { - this.lifecycleObservable = new LifecycleEventsObservable(lifecycle); - this.boundaryResolver = boundaryResolver; - } - - @Override public Observable lifecycle() { - return lifecycleObservable; - } - - @Override public Function correspondingEvents() { - return boundaryResolver; - } - - @Override public Lifecycle.Event peekLifecycle() { - lifecycleObservable.backfillEvents(); - return lifecycleObservable.getValue(); - } - - private static class UntilEventFunction implements Function { - private final Lifecycle.Event untilEvent; - - UntilEventFunction(Lifecycle.Event untilEvent) { - this.untilEvent = untilEvent; - } - - @Override public Lifecycle.Event apply(Lifecycle.Event event) throws Exception { - return untilEvent; - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AutodisposeAndroidLifecycle.kt b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AutodisposeAndroidLifecycle.kt deleted file mode 100644 index 49e05b7f..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AutodisposeAndroidLifecycle.kt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package com.moez.QKSMS.common.androidxcompat - -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.Lifecycle.Event -import androidx.lifecycle.LifecycleOwner -import com.uber.autodispose.LifecycleScopeProvider -import io.reactivex.annotations.CheckReturnValue -import io.reactivex.functions.Function - -/** - * Extension that returns a [LifecycleScopeProvider] for this [LifecycleOwner]. - */ -@CheckReturnValue -inline fun LifecycleOwner.scope(): LifecycleScopeProvider<*> = AndroidLifecycleScopeProvider.from(this) - -/** - * Extension that returns a [LifecycleScopeProvider] for this [LifecycleOwner]. - * - * @param untilEvent the event until the scope is valid. - */ -@CheckReturnValue -inline fun LifecycleOwner.scope(untilEvent: Lifecycle.Event): LifecycleScopeProvider<*> = - AndroidLifecycleScopeProvider.from(this, untilEvent) - -/** - * Extension that returns a [LifecycleScopeProvider] for this [LifecycleOwner]. - * - * @param boundaryResolver function that resolves the event boundary. - */ -@CheckReturnValue -inline fun LifecycleOwner.scope(boundaryResolver: Function): LifecycleScopeProvider<*> = - AndroidLifecycleScopeProvider.from(this, boundaryResolver) - -/** - * Extension that returns a [LifecycleScopeProvider] for this [Lifecycle]. - */ -@CheckReturnValue -inline fun Lifecycle.scope(): LifecycleScopeProvider<*> = AndroidLifecycleScopeProvider.from(this) - -/** - * Extension that returns a [LifecycleScopeProvider] for this [Lifecycle]. - * - * @param untilEvent the event until the scope is valid. - */ -@CheckReturnValue -inline fun Lifecycle.scope(untilEvent: Lifecycle.Event): LifecycleScopeProvider<*> = - AndroidLifecycleScopeProvider.from(this, untilEvent) - -/** - * Extension that returns a [LifecycleScopeProvider] for this [Lifecycle]. - * - * @param boundaryResolver function that resolves the event boundary. - */ -@CheckReturnValue -inline fun Lifecycle.scope(boundaryResolver: Function): LifecycleScopeProvider<*> = - AndroidLifecycleScopeProvider.from(this, boundaryResolver) \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/LifecycleEventsObservable.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/LifecycleEventsObservable.java deleted file mode 100644 index c11ca095..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/LifecycleEventsObservable.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package com.moez.QKSMS.common.androidxcompat; - -import androidx.annotation.Nullable; -import androidx.annotation.RestrictTo; -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.Lifecycle.Event; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.LifecycleOwner; -import androidx.lifecycle.OnLifecycleEvent; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.android.MainThreadDisposable; -import io.reactivex.subjects.BehaviorSubject; - -import static androidx.annotation.RestrictTo.Scope.LIBRARY; -import static androidx.lifecycle.Lifecycle.Event.ON_CREATE; -import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; -import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; -import static androidx.lifecycle.Lifecycle.Event.ON_START; -import static com.uber.autodispose.android.internal.AutoDisposeAndroidUtil.isMainThread; - -@RestrictTo(LIBRARY) class LifecycleEventsObservable extends Observable { - - private final Lifecycle lifecycle; - private final BehaviorSubject eventsObservable = BehaviorSubject.create(); - - @SuppressWarnings("CheckReturnValue") LifecycleEventsObservable(Lifecycle lifecycle) { - this.lifecycle = lifecycle; - } - - Event getValue() { - return eventsObservable.getValue(); - } - - /** - * Backfill if already created for boundary checking. We do a trick here for corresponding events - * where we pretend something is created upon initialized state so that it assumes the - * corresponding event is DESTROY. - */ - void backfillEvents() { - @Nullable Lifecycle.Event correspondingEvent; - switch (lifecycle.getCurrentState()) { - case INITIALIZED: - correspondingEvent = ON_CREATE; - break; - case CREATED: - correspondingEvent = ON_START; - break; - case STARTED: - case RESUMED: - correspondingEvent = ON_RESUME; - break; - case DESTROYED: - default: - correspondingEvent = ON_DESTROY; - break; - } - eventsObservable.onNext(correspondingEvent); - } - - @Override protected void subscribeActual(Observer observer) { - ArchLifecycleObserver archObserver = - new ArchLifecycleObserver(lifecycle, observer, eventsObservable); - observer.onSubscribe(archObserver); - if (!isMainThread()) { - observer.onError( - new IllegalStateException("Lifecycles can only be bound to on the main thread!")); - return; - } - lifecycle.addObserver(archObserver); - if (archObserver.isDisposed()) { - lifecycle.removeObserver(archObserver); - } - } - - static final class ArchLifecycleObserver extends MainThreadDisposable - implements LifecycleObserver { - private final Lifecycle lifecycle; - private final Observer observer; - private final BehaviorSubject eventsObservable; - - ArchLifecycleObserver(Lifecycle lifecycle, Observer observer, - BehaviorSubject eventsObservable) { - this.lifecycle = lifecycle; - this.observer = observer; - this.eventsObservable = eventsObservable; - } - - @Override protected void onDispose() { - lifecycle.removeObserver(this); - } - - @OnLifecycleEvent(Event.ON_ANY) - void onStateChange(@SuppressWarnings("unused") LifecycleOwner owner, Event event) { - if (!isDisposed()) { - if (!(event == ON_CREATE && eventsObservable.getValue() == event)) { - // Due to the INITIALIZED->ON_CREATE mapping trick we do in backfill(), - // we fire this conditionally to avoid duplicate CREATE events. - eventsObservable.onNext(event); - } - observer.onNext(event); - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt index 9c56f119..deefa8e2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt @@ -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, State, Presenter : QkPresenter> : Controller(), LayoutContainer { +abstract class QkController, State, Presenter : QkPresenter> : LifecycleController(), LayoutContainer { abstract var presenter: Presenter @@ -80,8 +77,4 @@ abstract class QkController, State, Present presenter.onCleared() } - fun scope(): LifecycleScopeProvider { - return ControllerScopeProvider.from(this) - } - -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt index d2b64c46..7d152ffe 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt @@ -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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt index 122355e2..5a4a2ad2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt @@ -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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt index f50bb95c..19ade510 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt @@ -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 { +interface QkViewContract: LifecycleOwner { fun render(state: State) - fun scope(): LifecycleScopeProvider - } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt index e73b4a25..c59e75af 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt @@ -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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt index 1f12c557..9345d53b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt @@ -36,7 +36,7 @@ import com.moez.QKSMS.model.Contact import com.moez.QKSMS.model.Recipient import com.moez.QKSMS.util.GlideApp import com.uber.autodispose.android.ViewScopeProvider -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.autoDisposable import kotlinx.android.synthetic.main.avatar_view.view.* import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index 870752b4..3f2ff65f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -31,7 +31,7 @@ import com.moez.QKSMS.common.util.extensions.forEach import com.moez.QKSMS.common.util.extensions.resolveThemeColor import com.moez.QKSMS.injection.appComponent import com.uber.autodispose.android.ViewScopeProvider -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.autoDisposable import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.tab_view.view.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index efa47978..3f0174a1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -28,7 +28,8 @@ import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.interactor.PerformBackup import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.repository.BackupRepository -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.subjects.BehaviorSubject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt index d8396c47..7cbc516f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt @@ -20,14 +20,14 @@ package com.moez.QKSMS.feature.blocked import android.content.Context import com.moez.QKSMS.common.Navigator -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.interactor.MarkUnblocked import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.tryOrNull -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 20307ba6..9ef6f238 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -43,7 +43,6 @@ import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkThemedActivity import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.extensions.autoScrollToStart @@ -56,7 +55,8 @@ import com.moez.QKSMS.common.util.extensions.showKeyboard import com.moez.QKSMS.model.Attachment import com.moez.QKSMS.model.Contact import com.moez.QKSMS.model.Message -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index fb34d22a..47bddb3d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -26,7 +26,6 @@ import android.telephony.SmsMessage import android.view.inputmethod.EditorInfo import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.common.util.ClipboardUtils @@ -60,7 +59,8 @@ import com.moez.QKSMS.repository.MessageRepository import com.moez.QKSMS.util.ActiveSubscriptionObservable import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.tryOrNull -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.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index f5140e88..f0de025e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt @@ -33,7 +33,8 @@ import com.moez.QKSMS.common.widget.FieldDialog import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoModule import com.moez.QKSMS.feature.themepicker.ThemePickerController import com.moez.QKSMS.injection.appComponent -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.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index 749a548f..57c3999e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -30,7 +30,8 @@ import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.model.Conversation import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.MessageRepository -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.subjects.BehaviorSubject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt index 5979ec96..58f3b087 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt @@ -23,15 +23,12 @@ import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Paint import androidx.core.graphics.drawable.toBitmap -import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView 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.dpToPx import com.moez.QKSMS.util.Preferences -import com.uber.autodispose.kotlin.autoDisposable import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign @@ -40,7 +37,6 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import javax.inject.Inject - class ConversationItemTouchCallback @Inject constructor( colors: Colors, disposables: CompositeDisposable, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt index 68033caa..9d72c07d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt @@ -20,7 +20,6 @@ package com.moez.QKSMS.feature.gallery import android.content.Context import com.moez.QKSMS.R -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.extensions.mapNotNull @@ -28,7 +27,8 @@ import com.moez.QKSMS.interactor.SaveImage import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.MessageRepository -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 3d58ec99..e08bbbe0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -31,7 +31,6 @@ import android.view.ViewStub import androidx.appcompat.app.ActionBarDrawerToggle import androidx.core.app.ActivityCompat import androidx.core.view.GravityCompat -import androidx.core.view.accessibility.AccessibilityEventCompat.setAction import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders @@ -43,7 +42,6 @@ import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.androidxcompat.drawerOpen -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkThemedActivity import com.moez.QKSMS.common.util.extensions.autoScrollToStart import com.moez.QKSMS.common.util.extensions.dismissKeyboard @@ -56,7 +54,8 @@ import com.moez.QKSMS.feature.changelog.ChangelogDialog import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback import com.moez.QKSMS.feature.conversations.ConversationsAdapter import com.moez.QKSMS.repository.SyncRepository -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.disposables.CompositeDisposable @@ -131,7 +130,7 @@ class MainActivity : QkThemedActivity(), MainView { viewModel.bindView(this) (snackbar as? ViewStub)?.setOnInflateListener { _, _ -> - snackbarButton.clicks().subscribe(snackbarButtonIntent) + snackbarButton.clicks().autoDisposable(scope()).subscribe(snackbarButtonIntent) } (syncing as? ViewStub)?.setOnInflateListener { _, _ -> @@ -149,7 +148,7 @@ class MainActivity : QkThemedActivity(), MainView { recyclerView.layoutManager = LinearLayoutManager(this) // Don't allow clicks to pass through the drawer layout - drawer.clicks().subscribe() + drawer.clicks().autoDisposable(scope()).subscribe() // Set the theme color tint to the recyclerView, progressbar, and FAB theme diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index e3bcb3e1..f4df70ba 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -21,7 +21,6 @@ package com.moez.QKSMS.feature.main import androidx.recyclerview.widget.ItemTouchHelper import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.extensions.removeAccents @@ -43,7 +42,8 @@ import com.moez.QKSMS.model.SyncLog import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.SyncRepository 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.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt index 4131b87b..7f2d794a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt @@ -30,12 +30,12 @@ import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.QkDialog -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkThemedActivity import com.moez.QKSMS.common.util.extensions.animateLayoutChanges import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.widget.PreferenceView -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt index 4bfbeb44..6639d4f7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -23,12 +23,12 @@ import android.media.RingtoneManager import android.net.Uri import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.extensions.mapNotNull import com.moez.QKSMS.repository.ConversationRepository 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.Flowable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index eb70e508..a3475822 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -19,11 +19,11 @@ package com.moez.QKSMS.feature.plus import com.moez.QKSMS.common.Navigator -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.manager.AnalyticsManager -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.plusAssign import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt index f3dadd6c..d29c2068 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt @@ -21,7 +21,6 @@ package com.moez.QKSMS.feature.qkreply import android.telephony.SmsMessage import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.compat.SubscriptionManagerCompat import com.moez.QKSMS.extensions.asObservable @@ -33,7 +32,8 @@ import com.moez.QKSMS.model.Message import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.MessageRepository import com.moez.QKSMS.util.ActiveSubscriptionObservable -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index 92bf7dfb..529c21a6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -19,12 +19,12 @@ package com.moez.QKSMS.feature.scheduled import com.moez.QKSMS.common.Navigator -import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.interactor.SendScheduledMessage import com.moez.QKSMS.repository.ScheduledMessageRepository -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index ffa8f1dd..0b19f744 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -45,7 +45,8 @@ import com.moez.QKSMS.feature.themepicker.ThemePickerController import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.repository.SyncRepository 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.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index 71364159..208059a4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -30,7 +30,8 @@ import com.moez.QKSMS.interactor.SyncMessages import com.moez.QKSMS.repository.SyncRepository import com.moez.QKSMS.util.NightModeManager 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.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import timber.log.Timber diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt index ab231f71..9ebc9b68 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt @@ -21,7 +21,8 @@ package com.moez.QKSMS.feature.settings.about import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import javax.inject.Inject class AboutPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt index a93174cb..8121ad44 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt @@ -29,7 +29,8 @@ import com.moez.QKSMS.common.util.extensions.animateLayoutChanges import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setTint import com.moez.QKSMS.injection.appComponent -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.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt index 1883e097..f895b5ae 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt @@ -23,7 +23,8 @@ import androidx.annotation.DrawableRes import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkPresenter 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.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt index 66ad9b6e..546380e8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt @@ -25,7 +25,8 @@ import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.manager.WidgetManager 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.rxkotlin.Observables import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject