mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Upgrade to latest Autodispose
This commit is contained in:
-166
@@ -1,166 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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.
|
||||
* <p>
|
||||
* <pre><code>
|
||||
* AutoDispose.autoDisposable(AndroidLifecycleScopeProvider.from(lifecycleOwner))
|
||||
* </code></pre>
|
||||
*/
|
||||
public final class AndroidLifecycleScopeProvider
|
||||
implements LifecycleScopeProvider<Lifecycle.Event> {
|
||||
|
||||
private static final Function<Lifecycle.Event, Lifecycle.Event> DEFAULT_CORRESPONDING_EVENTS =
|
||||
new Function<Lifecycle.Event, Lifecycle.Event>() {
|
||||
@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<Lifecycle.Event, Lifecycle.Event> 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<Lifecycle.Event, Lifecycle.Event> 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<Lifecycle.Event, Lifecycle.Event> boundaryResolver) {
|
||||
return new AndroidLifecycleScopeProvider(lifecycle, boundaryResolver);
|
||||
}
|
||||
|
||||
private final LifecycleEventsObservable lifecycleObservable;
|
||||
|
||||
private AndroidLifecycleScopeProvider(Lifecycle lifecycle,
|
||||
Function<Lifecycle.Event, Lifecycle.Event> boundaryResolver) {
|
||||
this.lifecycleObservable = new LifecycleEventsObservable(lifecycle);
|
||||
this.boundaryResolver = boundaryResolver;
|
||||
}
|
||||
|
||||
@Override public Observable<Lifecycle.Event> lifecycle() {
|
||||
return lifecycleObservable;
|
||||
}
|
||||
|
||||
@Override public Function<Lifecycle.Event, Lifecycle.Event> correspondingEvents() {
|
||||
return boundaryResolver;
|
||||
}
|
||||
|
||||
@Override public Lifecycle.Event peekLifecycle() {
|
||||
lifecycleObservable.backfillEvents();
|
||||
return lifecycleObservable.getValue();
|
||||
}
|
||||
|
||||
private static class UntilEventFunction implements Function<Lifecycle.Event, Lifecycle.Event> {
|
||||
private final Lifecycle.Event untilEvent;
|
||||
|
||||
UntilEventFunction(Lifecycle.Event untilEvent) {
|
||||
this.untilEvent = untilEvent;
|
||||
}
|
||||
|
||||
@Override public Lifecycle.Event apply(Lifecycle.Event event) throws Exception {
|
||||
return untilEvent;
|
||||
}
|
||||
}
|
||||
}
|
||||
-74
@@ -1,74 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
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<Event, Event>): 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<Event, Event>): LifecycleScopeProvider<*> =
|
||||
AndroidLifecycleScopeProvider.from(this, boundaryResolver)
|
||||
-124
@@ -1,124 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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<Event> {
|
||||
|
||||
private final Lifecycle lifecycle;
|
||||
private final BehaviorSubject<Event> 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<? super Event> 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<? super Event> observer;
|
||||
private final BehaviorSubject<Event> eventsObservable;
|
||||
|
||||
ArchLifecycleObserver(Lifecycle lifecycle, Observer<? super Event> observer,
|
||||
BehaviorSubject<Event> 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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.*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
-4
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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(
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user