From ba2707e7b481f224538a1be5c4a0551b5435fc99 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 10 Sep 2025 19:59:48 -0400 Subject: [PATCH] Changes the name of the nav to avoid confusing the auto import --- .../amethyst/ui/navigation/navs/EmptyNav.kt | 2 +- .../amethyst/ui/navigation/navs/INav.kt | 2 +- .../amethyst/ui/navigation/navs/Nav.kt | 16 ++++++++-------- .../amethyst/ui/navigation/navs/ObservableNav.kt | 12 ++++++------ .../loggedIn/chats/rooms/twopane/TwoPaneNav.kt | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/EmptyNav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/EmptyNav.kt index 8e3324ae6..ed2cef42d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/EmptyNav.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/EmptyNav.kt @@ -30,7 +30,7 @@ import kotlin.reflect.KClass @Stable object EmptyNav : INav { - override val scope: CoroutineScope get() = TODO("Not yet implemented") + override val navigationScope: CoroutineScope get() = TODO("Not yet implemented") override val drawerState = DrawerState(DrawerValue.Closed) override fun closeDrawer() = runBlocking { drawerState.close() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/INav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/INav.kt index aefcb060c..17daf99e6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/INav.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/INav.kt @@ -28,7 +28,7 @@ import kotlin.reflect.KClass @Stable interface INav { - val scope: CoroutineScope + val navigationScope: CoroutineScope val drawerState: DrawerState fun closeDrawer() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/Nav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/Nav.kt index fa3b50e99..0336d03e8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/Nav.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/Nav.kt @@ -34,20 +34,20 @@ import kotlin.reflect.KClass @Stable class Nav( val controller: NavHostController, - override val scope: CoroutineScope, + override val navigationScope: CoroutineScope, ) : INav { override val drawerState = DrawerState(DrawerValue.Closed) override fun closeDrawer() { - scope.launch { drawerState.close() } + navigationScope.launch { drawerState.close() } } override fun openDrawer() { - scope.launch { drawerState.open() } + navigationScope.launch { drawerState.open() } } override fun nav(route: Route) { - scope.launch { + navigationScope.launch { if (getRouteWithArguments(controller) != route) { controller.navigate(route) } @@ -55,7 +55,7 @@ class Nav( } override fun nav(computeRoute: suspend () -> Route?) { - scope.launch { + navigationScope.launch { val route = computeRoute() if (route != null && getRouteWithArguments(controller) != route) { controller.navigate(route) @@ -64,7 +64,7 @@ class Nav( } override fun newStack(route: Route) { - scope.launch { + navigationScope.launch { controller.navigate(route) { popUpTo(route) { inclusive = true @@ -75,7 +75,7 @@ class Nav( } override fun popBack() { - scope.launch { + navigationScope.launch { controller.navigateUp() } } @@ -85,7 +85,7 @@ class Nav( route: Route, klass: KClass, ) { - scope.launch { + navigationScope.launch { controller.navigate(route) { popUpTo(klass) { inclusive = true } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt index c1ecb0199..03bfae269 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt @@ -28,7 +28,7 @@ import kotlin.reflect.KClass class ObservableNav( val sourceNav: INav, - override val scope: CoroutineScope, + override val navigationScope: CoroutineScope, val onBeforeNavigate: () -> Unit, ) : INav { override val drawerState: DrawerState = sourceNav.drawerState @@ -42,28 +42,28 @@ class ObservableNav( } override fun nav(route: Route) { - scope.launch { + navigationScope.launch { onBeforeNavigate() } sourceNav.nav(route) } override fun nav(computeRoute: suspend () -> Route?) { - scope.launch { + navigationScope.launch { onBeforeNavigate() } sourceNav.nav(computeRoute) } override fun newStack(route: Route) { - scope.launch { + navigationScope.launch { onBeforeNavigate() } sourceNav.newStack(route) } override fun popBack() { - scope.launch { + navigationScope.launch { onBeforeNavigate() } sourceNav.popBack() @@ -73,7 +73,7 @@ class ObservableNav( route: Route, upToClass: KClass, ) { - scope.launch { + navigationScope.launch { onBeforeNavigate() } sourceNav.popUpTo(route, upToClass) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt index 214a74fc5..e0a3c12da 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt @@ -30,7 +30,7 @@ import kotlin.reflect.KClass class TwoPaneNav( val nav: INav, - override val scope: CoroutineScope, + override val navigationScope: CoroutineScope, ) : INav { override val drawerState: DrawerState = nav.drawerState @@ -45,7 +45,7 @@ class TwoPaneNav( } override fun nav(computeRoute: suspend () -> Route?) { - scope.launch { + navigationScope.launch { val route = computeRoute() if (route != null) { if (route is Route.Room || route is Route.PublicChatChannel) {