From 036319503ddbec8d856f2de1c420a0934cc890f3 Mon Sep 17 00:00:00 2001 From: DevSrSouza Date: Sat, 23 Mar 2024 11:27:51 -0300 Subject: [PATCH 1/2] Make BackHandler a internal public api --- .../kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt | 4 +++- .../voyager/navigator/internal/NavigatorBackHandler.kt | 4 +++- .../cafe/adriel/voyager/navigator/internal/Actuals.web.kt | 4 +++- .../kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt | 4 +++- .../cafe.adriel.voyager.navigator.internal/Actuals.uikit.kt | 5 +++-- .../cafe.adriel.voyager.navigator.internal/Actuals.macos.kt | 4 +++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/voyager-navigator/src/androidMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt b/voyager-navigator/src/androidMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt index 72894e09..0ac5d4fc 100644 --- a/voyager-navigator/src/androidMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt +++ b/voyager-navigator/src/androidMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt @@ -2,6 +2,8 @@ package cafe.adriel.voyager.navigator.internal import androidx.activity.compose.BackHandler import androidx.compose.runtime.Composable +import cafe.adriel.voyager.core.annotation.InternalVoyagerApi +@InternalVoyagerApi @Composable -internal actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) = BackHandler(enabled, onBack) +public actual fun BackHandler(enabled: Boolean, onBack: () -> Unit): Unit = BackHandler(enabled, onBack) diff --git a/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/internal/NavigatorBackHandler.kt b/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/internal/NavigatorBackHandler.kt index 6eca94e9..ce0467a1 100644 --- a/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/internal/NavigatorBackHandler.kt +++ b/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/internal/NavigatorBackHandler.kt @@ -1,11 +1,13 @@ package cafe.adriel.voyager.navigator.internal import androidx.compose.runtime.Composable +import cafe.adriel.voyager.core.annotation.InternalVoyagerApi import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.OnBackPressed +@InternalVoyagerApi @Composable -internal expect fun BackHandler(enabled: Boolean, onBack: () -> Unit) +public expect fun BackHandler(enabled: Boolean, onBack: () -> Unit) @Composable internal fun NavigatorBackHandler( diff --git a/voyager-navigator/src/commonWebMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.web.kt b/voyager-navigator/src/commonWebMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.web.kt index 4b686e2e..51b0101d 100644 --- a/voyager-navigator/src/commonWebMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.web.kt +++ b/voyager-navigator/src/commonWebMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.web.kt @@ -1,6 +1,8 @@ package cafe.adriel.voyager.navigator.internal import androidx.compose.runtime.Composable +import cafe.adriel.voyager.core.annotation.InternalVoyagerApi +@InternalVoyagerApi @Composable -internal actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) = Unit +public actual fun BackHandler(enabled: Boolean, onBack: () -> Unit): Unit = Unit diff --git a/voyager-navigator/src/desktopMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt b/voyager-navigator/src/desktopMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt index 4b686e2e..51b0101d 100644 --- a/voyager-navigator/src/desktopMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt +++ b/voyager-navigator/src/desktopMain/kotlin/cafe/adriel/voyager/navigator/internal/Actuals.kt @@ -1,6 +1,8 @@ package cafe.adriel.voyager.navigator.internal import androidx.compose.runtime.Composable +import cafe.adriel.voyager.core.annotation.InternalVoyagerApi +@InternalVoyagerApi @Composable -internal actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) = Unit +public actual fun BackHandler(enabled: Boolean, onBack: () -> Unit): Unit = Unit diff --git a/voyager-navigator/src/iosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.uikit.kt b/voyager-navigator/src/iosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.uikit.kt index 908fe0d3..51b0101d 100644 --- a/voyager-navigator/src/iosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.uikit.kt +++ b/voyager-navigator/src/iosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.uikit.kt @@ -1,7 +1,8 @@ package cafe.adriel.voyager.navigator.internal import androidx.compose.runtime.Composable +import cafe.adriel.voyager.core.annotation.InternalVoyagerApi -// TODO: use ios backstack +@InternalVoyagerApi @Composable -internal actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) = Unit +public actual fun BackHandler(enabled: Boolean, onBack: () -> Unit): Unit = Unit diff --git a/voyager-navigator/src/macosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.macos.kt b/voyager-navigator/src/macosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.macos.kt index 4b686e2e..51b0101d 100644 --- a/voyager-navigator/src/macosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.macos.kt +++ b/voyager-navigator/src/macosMain/kotlin/cafe.adriel.voyager.navigator.internal/Actuals.macos.kt @@ -1,6 +1,8 @@ package cafe.adriel.voyager.navigator.internal import androidx.compose.runtime.Composable +import cafe.adriel.voyager.core.annotation.InternalVoyagerApi +@InternalVoyagerApi @Composable -internal actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) = Unit +public actual fun BackHandler(enabled: Boolean, onBack: () -> Unit): Unit = Unit From a63f13adba09f74ac32ebc279511e44028b42535 Mon Sep 17 00:00:00 2001 From: DevSrSouza Date: Sun, 24 Mar 2024 18:17:01 -0300 Subject: [PATCH 2/2] update api dump --- voyager-navigator/api/android/voyager-navigator.api | 3 +++ voyager-navigator/api/desktop/voyager-navigator.api | 3 +++ 2 files changed, 6 insertions(+) diff --git a/voyager-navigator/api/android/voyager-navigator.api b/voyager-navigator/api/android/voyager-navigator.api index 8a12aedd..e92b643c 100644 --- a/voyager-navigator/api/android/voyager-navigator.api +++ b/voyager-navigator/api/android/voyager-navigator.api @@ -77,6 +77,9 @@ public final class cafe/adriel/voyager/navigator/VoyagerNavigatorSaverException public fun (Ljava/lang/String;)V } +public final class cafe/adriel/voyager/navigator/internal/ActualsKt { +} + public abstract interface class cafe/adriel/voyager/navigator/lifecycle/NavigatorDisposable { public abstract fun onDispose (Lcafe/adriel/voyager/navigator/Navigator;)V } diff --git a/voyager-navigator/api/desktop/voyager-navigator.api b/voyager-navigator/api/desktop/voyager-navigator.api index f7f26b2e..c7d0d4e0 100644 --- a/voyager-navigator/api/desktop/voyager-navigator.api +++ b/voyager-navigator/api/desktop/voyager-navigator.api @@ -68,6 +68,9 @@ public final class cafe/adriel/voyager/navigator/NavigatorSaverKt { public static final fun getLocalNavigatorSaver ()Landroidx/compose/runtime/ProvidableCompositionLocal; } +public final class cafe/adriel/voyager/navigator/internal/ActualsKt { +} + public abstract interface class cafe/adriel/voyager/navigator/lifecycle/NavigatorDisposable { public abstract fun onDispose (Lcafe/adriel/voyager/navigator/Navigator;)V }