highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-28 11:56:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changes the name of the nav to avoid confusing the auto import

Browse Source
This commit is contained in:
Vitor Pamplona
2025-09-10 19:59:48 -04:00
parent f9590055b0
commit ba2707e7b4
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/EmptyNav.kt
View File

@@ -30,7 +30,7 @@ import kotlin.reflect.KClass
@Stable @Stable
object EmptyNav : INav { 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 val drawerState = DrawerState(DrawerValue.Closed)
override fun closeDrawer() = runBlocking { drawerState.close() } override fun closeDrawer() = runBlocking { drawerState.close() }

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/INav.kt
View File

@@ -28,7 +28,7 @@ import kotlin.reflect.KClass
@Stable @Stable
interface INav { interface INav {
val scope: CoroutineScope val navigationScope: CoroutineScope
val drawerState: DrawerState val drawerState: DrawerState
fun closeDrawer() fun closeDrawer()

16
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/Nav.kt
View File

@@ -34,20 +34,20 @@ import kotlin.reflect.KClass
@Stable @Stable
class Nav( class Nav(
val controller: NavHostController, val controller: NavHostController,
override val scope: CoroutineScope, override val navigationScope: CoroutineScope,
) : INav { ) : INav {
override val drawerState = DrawerState(DrawerValue.Closed) override val drawerState = DrawerState(DrawerValue.Closed)
override fun closeDrawer() { override fun closeDrawer() {
scope.launch { drawerState.close() } navigationScope.launch { drawerState.close() }
} }
override fun openDrawer() { override fun openDrawer() {
scope.launch { drawerState.open() } navigationScope.launch { drawerState.open() }
} }
override fun nav(route: Route) { override fun nav(route: Route) {
scope.launch { navigationScope.launch {
if (getRouteWithArguments(controller) != route) { if (getRouteWithArguments(controller) != route) {
controller.navigate(route) controller.navigate(route)
} }
@@ -55,7 +55,7 @@ class Nav(
} }
override fun nav(computeRoute: suspend () -> Route?) { override fun nav(computeRoute: suspend () -> Route?) {
scope.launch { navigationScope.launch {
val route = computeRoute() val route = computeRoute()
if (route != null && getRouteWithArguments(controller) != route) { if (route != null && getRouteWithArguments(controller) != route) {
controller.navigate(route) controller.navigate(route)
@@ -64,7 +64,7 @@ class Nav(
} }
override fun newStack(route: Route) { override fun newStack(route: Route) {
scope.launch { navigationScope.launch {
controller.navigate(route) { controller.navigate(route) {
popUpTo(route) { popUpTo(route) {
inclusive = true inclusive = true
@@ -75,7 +75,7 @@ class Nav(
} }
override fun popBack() { override fun popBack() {
scope.launch { navigationScope.launch {
controller.navigateUp() controller.navigateUp()
} }
} }
@@ -85,7 +85,7 @@ class Nav(
route: Route, route: Route,
klass: KClass<T>, klass: KClass<T>,
) { ) {
scope.launch { navigationScope.launch {
controller.navigate(route) { controller.navigate(route) {
popUpTo<T>(klass) { inclusive = true } popUpTo<T>(klass) { inclusive = true }
} }

12
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt
View File

@@ -28,7 +28,7 @@ import kotlin.reflect.KClass
class ObservableNav( class ObservableNav(
val sourceNav: INav, val sourceNav: INav,
override val scope: CoroutineScope, override val navigationScope: CoroutineScope,
val onBeforeNavigate: () -> Unit, val onBeforeNavigate: () -> Unit,
) : INav { ) : INav {
override val drawerState: DrawerState = sourceNav.drawerState override val drawerState: DrawerState = sourceNav.drawerState
@@ -42,28 +42,28 @@ class ObservableNav(
} }
override fun nav(route: Route) { override fun nav(route: Route) {
scope.launch { navigationScope.launch {
onBeforeNavigate() onBeforeNavigate()
} }
sourceNav.nav(route) sourceNav.nav(route)
} }
override fun nav(computeRoute: suspend () -> Route?) { override fun nav(computeRoute: suspend () -> Route?) {
scope.launch { navigationScope.launch {
onBeforeNavigate() onBeforeNavigate()
} }
sourceNav.nav(computeRoute) sourceNav.nav(computeRoute)
} }
override fun newStack(route: Route) { override fun newStack(route: Route) {
scope.launch { navigationScope.launch {
onBeforeNavigate() onBeforeNavigate()
} }
sourceNav.newStack(route) sourceNav.newStack(route)
} }
override fun popBack() { override fun popBack() {
scope.launch { navigationScope.launch {
onBeforeNavigate() onBeforeNavigate()
} }
sourceNav.popBack() sourceNav.popBack()
@@ -73,7 +73,7 @@ class ObservableNav(
route: Route, route: Route,
upToClass: KClass<T>, upToClass: KClass<T>,
) { ) {
scope.launch { navigationScope.launch {
onBeforeNavigate() onBeforeNavigate()
} }
sourceNav.popUpTo(route, upToClass) sourceNav.popUpTo(route, upToClass)

4
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt
View File

@@ -30,7 +30,7 @@ import kotlin.reflect.KClass
class TwoPaneNav( class TwoPaneNav(
val nav: INav, val nav: INav,
override val scope: CoroutineScope, override val navigationScope: CoroutineScope,
) : INav { ) : INav {
override val drawerState: DrawerState = nav.drawerState override val drawerState: DrawerState = nav.drawerState
@@ -45,7 +45,7 @@ class TwoPaneNav(
} }
override fun nav(computeRoute: suspend () -> Route?) { override fun nav(computeRoute: suspend () -> Route?) {
scope.launch { navigationScope.launch {
val route = computeRoute() val route = computeRoute()
if (route != null) { if (route != null) {
if (route is Route.Room || route is Route.PublicChatChannel) { if (route is Route.Room || route is Route.PublicChatChannel) {