Remove support for rxLifecycle2.

2021-07-03 21:40:43 +02:00
parent fc1fee3e17
commit 94c817bbd9
15 changed files with 8 additions and 337 deletions
@@ -31,9 +31,6 @@ implementation 'com.bluelinelabs:conductor-viewpager:3.1.0'
 // ViewPager2 Adapter:
 implementation 'com.bluelinelabs:conductor-viewpager2:3.1.0'

-// RxJava2 lifecycle support:
-implementation 'com.bluelinelabs:conductor-rxlifecycle2:3.1.0'
-
 // RxJava2 Autodispose support:
 implementation 'com.bluelinelabs:conductor-autodispose:3.1.0'

@@ -1,25 +0,0 @@
-apply from: rootProject.file('dependencies.gradle')
-
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode Integer.parseInt(project.VERSION_CODE)
-        versionName project.VERSION_NAME
-    }
-}
-
-dependencies {
-    api rootProject.ext.rxJava2
-    api rootProject.ext.rxLifecycle2
-    api rootProject.ext.rxLifecycleAndroid2
-
-    implementation project(':conductor')
-}
-
-ext.artifactId = 'conductor-rxlifecycle2'
-apply from: rootProject.file('gradle/publish.gradle')
@@ -1,3 +0,0 @@
-POM_NAME=Conductor RxLifecycle2 Extensions
-POM_ARTIFACT_ID=conductor-rxlifecycle2
-POM_PACKAGING=aar
@@ -1,3 +0,0 @@
-<manifest package="com.bluelinelabs.conductor.rxlifecycle2">
-    <application />
-</manifest>
@@ -1,14 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-public enum ControllerEvent {
-
-    CREATE,
-    CONTEXT_AVAILABLE,
-    CREATE_VIEW,
-    ATTACH,
-    DETACH,
-    DESTROY_VIEW,
-    CONTEXT_UNAVAILABLE,
-    DESTROY
-
-}
@@ -1,71 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import android.view.View;
-
-import com.bluelinelabs.conductor.Controller;
-import com.trello.rxlifecycle2.OutsideLifecycleException;
-
-import io.reactivex.subjects.BehaviorSubject;
-
-public class ControllerLifecycleSubjectHelper {
-    private ControllerLifecycleSubjectHelper() {
-    }
-
-    public static BehaviorSubject<ControllerEvent> create(Controller controller) {
-        ControllerEvent initialState;
-        if (controller.isBeingDestroyed() || controller.isDestroyed()) {
-            throw new OutsideLifecycleException("Cannot bind to Controller lifecycle when outside of it.");
-        } else if (controller.isAttached()) {
-            initialState = ControllerEvent.ATTACH;
-        } else if (controller.getView() != null) {
-            initialState = ControllerEvent.CREATE_VIEW;
-        } else if (controller.getActivity() != null) {
-            initialState = ControllerEvent.CONTEXT_AVAILABLE;
-        } else {
-            initialState = ControllerEvent.CREATE;
-        }
-
-        final BehaviorSubject<ControllerEvent> subject = BehaviorSubject.createDefault(initialState);
-
-        controller.addLifecycleListener(new Controller.LifecycleListener() {
-            @Override
-            public void preContextAvailable(@NonNull Controller controller) {
-                subject.onNext(ControllerEvent.CONTEXT_AVAILABLE);
-            }
-
-            @Override
-            public void preCreateView(@NonNull Controller controller) {
-                subject.onNext(ControllerEvent.CREATE_VIEW);
-            }
-
-            @Override
-            public void preAttach(@NonNull Controller controller, @NonNull View view) {
-                subject.onNext(ControllerEvent.ATTACH);
-            }
-
-            @Override
-            public void preDetach(@NonNull Controller controller, @NonNull View view) {
-                subject.onNext(ControllerEvent.DETACH);
-            }
-
-            @Override
-            public void preDestroyView(@NonNull Controller controller, @NonNull View view) {
-                subject.onNext(ControllerEvent.DESTROY_VIEW);
-            }
-
-            @Override
-            public void preContextUnavailable(@NonNull Controller controller, @NonNull Context context) {
-                subject.onNext(ControllerEvent.CONTEXT_UNAVAILABLE);
-            }
-
-            @Override
-            public void preDestroy(@NonNull Controller controller) {
-                subject.onNext(ControllerEvent.DESTROY);
-            }
-        });
-
-        return subject;
-    }
-}
@@ -1,49 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-import android.os.Bundle;
-import androidx.annotation.CheckResult;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.bluelinelabs.conductor.Controller;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
-
-/**
- * A base {@link Controller} that can be used to expose lifecycle events using RxJava
- */
-public abstract class RxController extends Controller implements LifecycleProvider<ControllerEvent> {
-    private final BehaviorSubject<ControllerEvent> lifecycleSubject;
-
-    public RxController(){
-        this(null);
-    }
-
-    public RxController(@Nullable Bundle args) {
-        super(args);
-        lifecycleSubject = ControllerLifecycleSubjectHelper.create(this);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<ControllerEvent> lifecycle() {
-        return lifecycleSubject.hide();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ControllerEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxControllerLifecycle.bindController(lifecycleSubject);
-    }
-}
@@ -1,43 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-import androidx.annotation.NonNull;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.OutsideLifecycleException;
-import com.trello.rxlifecycle2.RxLifecycle;
-import io.reactivex.Observable;
-import io.reactivex.functions.Function;
-
-public class RxControllerLifecycle {
-
-    /**
-     * Binds the given source to a Controller lifecycle. This is the Controller version of
-     * {@link com.trello.rxlifecycle2.android.RxLifecycleAndroid#bindFragment(Observable)}.
-     *
-     * @param lifecycle the lifecycle sequence of a Controller
-     * @return a reusable {@link io.reactivex.ObservableTransformer} that unsubscribes the source during the Controller lifecycle
-     */
-    public static <T> LifecycleTransformer<T> bindController(@NonNull final Observable<ControllerEvent> lifecycle) {
-        return RxLifecycle.bind(lifecycle, CONTROLLER_LIFECYCLE);
-    }
-
-    private static final Function<ControllerEvent, ControllerEvent> CONTROLLER_LIFECYCLE =
-        new Function<ControllerEvent, ControllerEvent>() {
-            @Override
-            public ControllerEvent apply(ControllerEvent lastEvent) {
-                switch (lastEvent) {
-                    case CREATE:
-                        return ControllerEvent.DESTROY;
-                    case CONTEXT_AVAILABLE:
-                        return ControllerEvent.CONTEXT_UNAVAILABLE;
-                    case ATTACH:
-                        return ControllerEvent.DETACH;
-                    case CREATE_VIEW:
-                        return ControllerEvent.DESTROY_VIEW;
-                    case DETACH:
-                        return ControllerEvent.DESTROY;
-                    default:
-                        throw new OutsideLifecycleException("Cannot bind to Controller lifecycle when outside of it.");
-                }
-            }
-        };
-}
@@ -58,7 +58,6 @@ dependencies {
    implementation project(':conductor')
    implementation project(':conductor-modules:viewpager')
    implementation project(':conductor-modules:viewpager2')
-    implementation project(':conductor-modules:rxlifecycle2')
    implementation project(':conductor-modules:autodispose')
    implementation project(':conductor-modules:arch-components-lifecycle')
    implementation project(':conductor-modules:androidx-transition')
@@ -2,10 +2,10 @@ package com.bluelinelabs.conductor.demo.controllers

 import android.graphics.PorterDuff
 import android.os.Bundle
-import android.support.annotation.DrawableRes
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.GridLayoutManager
@@ -17,7 +17,9 @@ import com.bluelinelabs.conductor.demo.databinding.RowHomeBinding
 import com.bluelinelabs.conductor.demo.util.viewBinding

 class ExternalModulesController : BaseController(R.layout.controller_additional_modules) {
-  private val binding: ControllerAdditionalModulesBinding by viewBinding(ControllerAdditionalModulesBinding::bind)
+  private val binding: ControllerAdditionalModulesBinding by viewBinding(
+    ControllerAdditionalModulesBinding::bind
+  )

  override val title = "External Module Demos"

@@ -40,11 +42,6 @@ class ExternalModulesController : BaseController(R.layout.controller_additional_
          .pushChangeHandler(FadeChangeHandler())
          .popChangeHandler(FadeChangeHandler())
      )
-      ModuleModel.RX_LIFECYCLE_2 -> router.pushController(
-        with(RxLifecycle2Controller())
-          .pushChangeHandler(FadeChangeHandler())
-          .popChangeHandler(FadeChangeHandler())
-      )
      ModuleModel.ARCH_LIFECYCLE -> router.pushController(
        with(ArchLifecycleController())
          .pushChangeHandler(FadeChangeHandler())
@@ -56,7 +53,6 @@ class ExternalModulesController : BaseController(R.layout.controller_additional_

 private enum class ModuleModel(val title: String, @ColorRes val color: Int) {
  AUTODISPOSE("Autodispose", R.color.purple_300),
-  RX_LIFECYCLE_2("Rx Lifecycle 2", R.color.blue_grey_300),
  ARCH_LIFECYCLE("Arch Components Lifecycle", R.color.orange_300);
 }

@@ -83,7 +79,10 @@ private class AdditionalModulesAdapter(
  ) : RecyclerView.ViewHolder(binding.root) {
    fun bind(item: ModuleModel) {
      binding.title.text = item.title
-      binding.dot.drawable.setColorFilter(ContextCompat.getColor(itemView.context, item.color), PorterDuff.Mode.SRC_ATOP)
+      binding.dot.drawable.setColorFilter(
+        ContextCompat.getColor(itemView.context, item.color),
+        PorterDuff.Mode.SRC_ATOP
+      )
      itemView.setOnClickListener { modelClickListener(item) }
    }
  }
@@ -1,110 +0,0 @@
-package com.bluelinelabs.conductor.demo.controllers
-
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.bluelinelabs.conductor.RouterTransaction.Companion.with
-import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
-import com.bluelinelabs.conductor.demo.R
-import com.bluelinelabs.conductor.demo.ToolbarProvider
-import com.bluelinelabs.conductor.demo.controllers.base.watchForLeaks
-import com.bluelinelabs.conductor.demo.databinding.ControllerLifecycleBinding
-import com.bluelinelabs.conductor.rxlifecycle2.ControllerEvent
-import com.bluelinelabs.conductor.rxlifecycle2.RxController
-import io.reactivex.Observable
-import java.util.concurrent.TimeUnit
-
-// Shamelessly borrowed from the official RxLifecycle demo by Trello and adapted for Conductor Controllers
-// instead of Activities or Fragments.
-class RxLifecycle2Controller : RxController() {
-
-  init {
-    watchForLeaks()
-
-    // suppress is safe because of bindUntilEvent
-    @Suppress("CheckResult")
-    Observable.interval(1, TimeUnit.SECONDS)
-      .doOnDispose { Log.i(TAG, "Disposing from constructor") }
-      .compose(bindUntilEvent(ControllerEvent.DESTROY))
-      .subscribe { num: Long ->
-        Log.i(TAG, "Started in constructor, running until onDestroy(): $num")
-      }
-  }
-
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup,
-    savedViewState: Bundle?
-  ): View {
-    Log.i(TAG, "onCreateView() called")
-    val binding = ControllerLifecycleBinding.inflate(inflater, container, false)
-    binding.title.text = binding.root.resources.getString(R.string.rxlifecycle_title, TAG)
-
-    binding.nextReleaseView.setOnClickListener {
-      retainViewMode = RetainViewMode.RELEASE_DETACH
-      router.pushController(
-        with(TextController("Logcat should now report that the observables from onAttach() and onViewBound() have been disposed of, while the constructor observable is still running."))
-          .pushChangeHandler(HorizontalChangeHandler())
-          .popChangeHandler(HorizontalChangeHandler())
-      )
-    }
-
-    binding.nextRetainView.setOnClickListener {
-      retainViewMode = RetainViewMode.RETAIN_DETACH
-      router.pushController(
-        with(TextController("Logcat should now report that the observables from onAttach() has been disposed of, while the constructor and onViewBound() observables are still running."))
-          .pushChangeHandler(HorizontalChangeHandler())
-          .popChangeHandler(HorizontalChangeHandler())
-      )
-    }
-
-    // suppress is safe because of bindUntilEvent
-    @Suppress("CheckResult")
-    Observable.interval(1, TimeUnit.SECONDS)
-      .doOnDispose { Log.i(TAG, "Disposing from onCreateView()") }
-      .compose(bindUntilEvent(ControllerEvent.DESTROY_VIEW))
-      .subscribe { num: Long ->
-        Log.i(TAG, "Started in onCreateView(), running until onDestroyView(): $num")
-      }
-
-    return binding.root
-  }
-
-  override fun onAttach(view: View) {
-    super.onAttach(view)
-    Log.i(TAG, "onAttach() called")
-
-    (activity as ToolbarProvider).toolbar.title = "RxLifecycle2 Demo"
-
-    // suppress is safe because of bindUntilEvent
-    @Suppress("CheckResult")
-    Observable.interval(1, TimeUnit.SECONDS)
-      .doOnDispose { Log.i(TAG, "Disposing from onAttach()") }
-      .compose(bindUntilEvent(ControllerEvent.DETACH))
-      .subscribe { num: Long ->
-        Log.i(TAG, "Started in onAttach(), running until onDetach(): $num")
-      }
-  }
-
-  override fun onDestroyView(view: View) {
-    super.onDestroyView(view)
-    Log.i(TAG, "onDestroyView() called")
-  }
-
-  override fun onDetach(view: View) {
-    super.onDetach(view)
-    Log.i(TAG, "onDetach() called")
-  }
-
-  public override fun onDestroy() {
-    super.onDestroy()
-    Log.i(TAG, "onDestroy() called")
-  }
-
-  companion object {
-    private const val TAG = "RxLifecycleController"
-  }
-
-}
@@ -30,7 +30,6 @@
    <!-- Drag Dismiss Demo -->
    <string name="drag_to_dismiss">Elastic scrolling view - scroll past bounds to dismiss.</string>

-    <!-- RxLifecycle Demo -->
    <string name="rxlifecycle_title">Watch tag %1$s on logcat for a demo.</string>
    <string name="next_controller_retain">Push Controller, retaining this View</string>
    <string name="next_controller_release">Push Controller, releasing this View</string>
@@ -5,7 +5,6 @@ ext {

    picassoVersion = '2.5.2'
    rxJava2Version = '2.1.14'
-    rxLifecycle2Version = '2.2.1'
    autodisposeVersion = '1.0.0'
    archComponentsVersion = '2.3.1'
    junitVersion = '4.12'
@@ -35,9 +34,6 @@ ext {

    rxJava2 = "io.reactivex.rxjava2:rxjava:$rxJava2Version"

-    rxLifecycle2 = "com.trello.rxlifecycle2:rxlifecycle:$rxLifecycle2Version"
-    rxLifecycleAndroid2 = "com.trello.rxlifecycle2:rxlifecycle-android:$rxLifecycle2Version"
-
    autodispose = "com.uber.autodispose:autodispose:$autodisposeVersion"
    autodisposeLifecycle = "com.uber.autodispose:autodispose-lifecycle:$autodisposeVersion"
    autodisposeKtx = "com.uber.autodispose:autodispose-ktx:$autodisposeVersion"
@@ -2,7 +2,6 @@ include ':conductor'
 include ':conductor-lint'
 include ':conductor-modules:viewpager'
 include ':conductor-modules:viewpager2'
-include ':conductor-modules:rxlifecycle2'
 include ':conductor-modules:autodispose'
 include ':conductor-modules:arch-components-lifecycle'
 include ':conductor-modules:androidx-transition'