Updated NavigationEvents generic type to not have an upper bound on N…

…avigationIntent
chRyNaN · Feb 28, 2022 · b0938ea · b0938ea
1 parent f317aef
commit b0938ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/navigation-core/src/commonMain/kotlin/com.chrynan.navigation/NavigationEvent.kt b/navigation-core/src/commonMain/kotlin/com.chrynan.navigation/NavigationEvent.kt
@@ -8,13 +8,13 @@ package com.chrynan.navigation
  * @see [Navigator.navigate]
  * @see [NavigationHandler.onNavigate]
  */
-sealed class NavigationEvent<Intent : NavigationIntent> {
+sealed class NavigationEvent<NavigationValue> {
 
- class Back<Intent : NavigationIntent> internal constructor() : NavigationEvent<Intent>()
+ class Back<NavigationValue> internal constructor() : NavigationEvent<NavigationValue>()
 
- class Up<Intent : NavigationIntent> internal constructor() : NavigationEvent<Intent>()
+ class Up<NavigationValue> internal constructor() : NavigationEvent<NavigationValue>()
 
- data class To<Intent : NavigationIntent> internal constructor(val intent: Intent) : NavigationEvent<Intent>()
+ data class To<NavigationValue> internal constructor(val value: NavigationValue) : NavigationEvent<NavigationValue>()
 
  companion object
 }
diff --git a/navigation-core/src/commonMain/kotlin/com.chrynan.navigation/NavigationEventHandler.kt b/navigation-core/src/commonMain/kotlin/com.chrynan.navigation/NavigationEventHandler.kt
@@ -20,7 +20,7 @@ interface NavigationEventHandler<Intent : NavigationIntent, Scope : NavigationSc
  when (value) {
  is NavigationEvent.Back -> onGoBack()
  is NavigationEvent.Up -> onGoUp()
- is NavigationEvent.To -> onGoTo(intent = value.intent)
+ is NavigationEvent.To -> onGoTo(intent = value.value)
  }
 
  override fun Scope.canGoBack(): Boolean = false

diff --git a/navigation-core/src/commonMain/kotlin/com.chrynan.navigation/NavigationEventNavigator.kt b/navigation-core/src/commonMain/kotlin/com.chrynan.navigation/NavigationEventNavigator.kt
@@ -33,4 +33,4 @@ fun <Intent : NavigationIntent> NavigationEventNavigator<Intent>.goUp() =
  * A convenience function for calling [NavigationEventNavigator.navigate] with [NavigationEvent.To].
  */
 fun <Intent : NavigationIntent> NavigationEventNavigator<Intent>.goTo(intent: Intent) =
- navigate(event = NavigationEvent.To(intent = intent))
+ navigate(event = NavigationEvent.To(value = intent))