Make NavigationEvent generic, too

magellan-legacy/src/main/java/com/wealthfront/magellan/HistoryRewriterExtensions.kt

@@ -1,3 +1,4 @@
+import android.view.View
 import com.wealthfront.magellan.HistoryRewriter
 import com.wealthfront.magellan.NavigationType
 import com.wealthfront.magellan.init.getDefaultTransition
@@ -8,7 +9,7 @@ import java.util.ArrayDeque
 import java.util.Deque
 
 internal fun HistoryRewriter.rewriteHistoryWithNavigationEvents(
-  oldBackStack: Deque<NavigationEvent>,
+  oldBackStack: Deque<NavigationEvent<View>>,
   magellanTransition: MagellanTransition? = null,
   navigationType: NavigationType? = null
 ) {

magellan-legacy/src/main/java/com/wealthfront/magellan/Navigator.kt

@@ -23,11 +23,11 @@ import java.util.Deque
 @OpenForMocking
 public class Navigator internal constructor(
   container: () -> ScreenContainer,
-) : Navigator, LifecycleAwareComponent() {
+) : Navigator<View>, LifecycleAwareComponent() {
 
   private val delegate by lifecycle(NavigationDelegate(container))
 
-  override val backStack: List<NavigationEvent>
+  override val backStack: List<NavigationEvent<View>>
     get() = delegate.backStack.toList()
 
   internal var currentNavigableProvider: CurrentNavigableProvider? = null
@@ -43,13 +43,13 @@ public class Navigator internal constructor(
     }
   }
 
-  public fun navigate(backStackOperation: (Deque<NavigationEvent>) -> NavigationEvent) {
+  public fun navigate(backStackOperation: (Deque<NavigationEvent<View>>) -> NavigationEvent<View>) {
     navigate(FORWARD, backStackOperation)
   }
 
   public fun navigate(
     direction: Direction,
-    backStackOperation: (Deque<NavigationEvent>) -> NavigationEvent
+    backStackOperation: (Deque<NavigationEvent<View>>) -> NavigationEvent<View>
   ) {
     delegate.navigate(direction, backStackOperation)
   }

magellan-library/src/main/java/com/wealthfront/magellan/core/Displayable.kt

@@ -1,7 +1,5 @@
 package com.wealthfront.magellan.core
 
-import android.view.View
-
 public interface Displayable<ViewType : Any> {
 
   public val view: ViewType?

magellan-library/src/main/java/com/wealthfront/magellan/navigation/LinearNavigator.kt

@@ -13,11 +13,11 @@ import java.util.Deque
 @OpenForMocking
 public class LinearNavigator internal constructor(
   container: () -> ScreenContainer
-) : Navigator, LifecycleAwareComponent() {
+) : Navigator<View>, LifecycleAwareComponent() {
 
   private val delegate by lifecycle(NavigationDelegate(container))
 
-  override val backStack: List<NavigationEvent>
+  override val backStack: List<NavigationEvent<View>>
     get() = delegate.backStack.toList()
 
   public fun goTo(navigable: Navigable<View>, overrideMagellanTransition: MagellanTransition? = null) {
@@ -30,7 +30,7 @@ public class LinearNavigator internal constructor(
 
   public fun navigate(
     direction: Direction,
-    backStackOperation: (Deque<NavigationEvent>) -> NavigationEvent
+    backStackOperation: (Deque<NavigationEvent<View>>) -> NavigationEvent<View>
   ) {
     delegate.navigate(direction, backStackOperation)
   }

magellan-library/src/main/java/com/wealthfront/magellan/navigation/NavigationDelegate.kt

@@ -29,7 +29,7 @@ public class NavigationDelegate(
 
   private var containerView: ScreenContainer? = null
   private val navigationPropagator = NavigationPropagator
-  public val backStack: Deque<NavigationEvent> = ArrayDeque()
+  public val backStack: Deque<NavigationEvent<View>> = ArrayDeque()
 
   private val lifecycleLimiter by lifecycle(LifecycleLimiter())
 
@@ -97,7 +97,7 @@ public class NavigationDelegate(
 
   public fun navigate(
     direction: Direction,
-    backStackOperation: (Deque<NavigationEvent>) -> NavigationEvent
+    backStackOperation: (Deque<NavigationEvent<View>>) -> NavigationEvent<View>
   ) {
     containerView?.setInterceptTouchEvents(true)
     navigationPropagator.beforeNavigation()

magellan-library/src/main/java/com/wealthfront/magellan/navigation/NavigationEvent.kt

@@ -1,14 +1,13 @@
 package com.wealthfront.magellan.navigation
 
-import android.view.View
 import com.wealthfront.magellan.transitions.MagellanTransition
 import java.util.Deque
 
-public data class NavigationEvent(
-  val navigable: NavigableCompat<View>,
+public data class NavigationEvent<ViewType : Any>(
+  val navigable: NavigableCompat<ViewType>,
   val magellanTransition: MagellanTransition
 )
 
-internal fun Deque<NavigationEvent>.navigables(): List<NavigableCompat<View>> {
+internal fun <ViewType : Any> Deque<NavigationEvent<ViewType>>.navigables(): List<NavigableCompat<ViewType>> {
   return map { it.navigable }
 }

magellan-library/src/main/java/com/wealthfront/magellan/navigation/NavigationTraverser.kt

@@ -74,12 +74,12 @@ public class NavigationTraverser(private val root: NavigableCompat<*>) {
 public data class NavigationNode(val value: NavigableCompat<*>, var children: List<NavigationNode>) {
 
   val hasBackstack: Boolean
-    get() = (value as? LifecycleOwner)?.children?.mapNotNull { it as? Navigator }?.isNotEmpty()
+    get() = (value as? LifecycleOwner)?.children?.mapNotNull { it as? Navigator<*> }?.isNotEmpty()
       ?: false
 
-  public fun getBackstack(): Deque<NavigationEvent> {
-    val backStackDeepCopy = ArrayDeque<NavigationEvent>()
-    (value as LifecycleOwner).children.mapNotNull { it as? Navigator }.first().backStack.toList()
+  public fun getBackstack(): Deque<NavigationEvent<*>> {
+    val backStackDeepCopy = ArrayDeque<NavigationEvent<*>>()
+    (value as LifecycleOwner).children.mapNotNull { it as? Navigator<*> }.first().backStack.toList()
       .toCollection(backStackDeepCopy)
     return backStackDeepCopy
   }

magellan-library/src/main/java/com/wealthfront/magellan/navigation/Navigator.kt

@@ -1,8 +1,8 @@
 package com.wealthfront.magellan.navigation
 
-public interface Navigator {
+public interface Navigator<ViewType : Any> {
 
-  public val backStack: List<NavigationEvent>
+  public val backStack: List<NavigationEvent<ViewType>>
 
   public fun goBack(): Boolean
 }