Add locally parameter to pop (#1)

* Add same parameter to pop then in push * update minor version * api dump
mirego · Mar 15, 2024 · e05b668 · e05b668
1 parent 711a722
commit e05b668
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,4 +4,4 @@ android.enableJetifier=true
 android.useAndroidX=true
 kotlin.native.cacheKind=none
 kotlin.mpp.stability.nowarn=true
-version=0.1.1-SNAPSHOT
+version=0.2.0
diff --git a/navigation/common/api/navigation.api b/navigation/common/api/navigation.api
@@ -5,7 +5,7 @@ public class com/mirego/pilot/navigation/DefaultPilotNavigationManager : com/mir
 	public fun currentRoutes ()Ljava/util/List;
 	public fun findRoute (Ljava/lang/String;)Lcom/mirego/pilot/navigation/PilotNavigationRoute;
 	public fun handleAction (Ljava/lang/Object;)V
-	public fun pop ()V
+	public fun pop (Z)V
 	public fun popToId (Ljava/lang/String;Z)V
 	public fun popToName (Ljava/lang/String;Z)V
 	public fun popToRoot ()V
@@ -43,7 +43,8 @@ public abstract class com/mirego/pilot/navigation/PilotNavigationManager {
 	public final fun getActionListener ()Lcom/mirego/pilot/navigation/PilotActionNavigationListener;
 	public final fun getListener ()Lcom/mirego/pilot/navigation/PilotNavigationListener;
 	public abstract fun handleAction (Ljava/lang/Object;)V
-	public abstract fun pop ()V
+	public abstract fun pop (Z)V
+	public static synthetic fun pop$default (Lcom/mirego/pilot/navigation/PilotNavigationManager;ZILjava/lang/Object;)V
 	public abstract fun popToId (Ljava/lang/String;Z)V
 	public abstract fun popToName (Ljava/lang/String;Z)V
 	public abstract fun popToRoot ()V

diff --git a/...common/src/commonMain/kotlin/com/mirego/pilot/navigation/DefaultPilotNavigationManager.kt b/...common/src/commonMain/kotlin/com/mirego/pilot/navigation/DefaultPilotNavigationManager.kt
@@ -29,7 +29,11 @@ public open class DefaultPilotNavigationManager<ROUTE : PilotNavigationRoute, AC
         }
     }
 
-    override fun pop() {
+    override fun pop(locally: Boolean) {
+        if (!locally && parentNavigationManager != null) {
+            parentNavigationManager.pop(locally = locally)
+            return
+        }
         internalPop(callListener = true)
     }
 

diff --git a/...gation/common/src/commonMain/kotlin/com/mirego/pilot/navigation/PilotNavigationManager.kt b/...gation/common/src/commonMain/kotlin/com/mirego/pilot/navigation/PilotNavigationManager.kt
@@ -6,7 +6,7 @@ public abstract class PilotNavigationManager<ROUTE : PilotNavigationRoute, ACTIO
     public abstract fun <T : ROUTE> findRoute(uniqueId: String): T?
 
     public abstract fun push(route: ROUTE, locally: Boolean = false)
-    public abstract fun pop()
+    public abstract fun pop(locally: Boolean = false)
     public abstract fun popToId(uniqueId: String, inclusive: Boolean)
     public abstract fun popToName(name: String, inclusive: Boolean)
     public abstract fun popToRoot()