From 3db05fb3b1346daccd3d49c902b8cc400e57547f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 28 May 2023 13:53:47 +0530 Subject: [PATCH] fix: remove dubious `return` --- .../android/ui/decorations/ClawNavigationBar.kt | 14 +++++++------- .../android/ui/decorations/ClawNavigationRail.kt | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt index 8434082e..662f0fc1 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt @@ -67,13 +67,13 @@ fun ClawNavigationBar( onClick = { if (isCurrentDestination) { navItem.listStateResetCallback() - return@NavigationBarItem - } - navController.graph.startDestinationRoute?.let { startDestination -> - navController.popBackStack(startDestination, false) - } - if (navItem.route != Destinations.startDestination.route) { - navController.navigate(navItem.route) + } else { + navController.graph.startDestinationRoute?.let { startDestination -> + navController.popBackStack(startDestination, false) + } + if (navItem.route != Destinations.startDestination.route) { + navController.navigate(navItem.route) + } } }, modifier = Modifier.testTag(navItem.label.uppercase()), diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationRail.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationRail.kt index 00fbaf49..5315b9d6 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationRail.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationRail.kt @@ -66,13 +66,13 @@ fun ClawNavigationRail( onClick = { if (isCurrentDestination) { navItem.listStateResetCallback() - return@NavigationRailItem - } - navController.graph.startDestinationRoute?.let { startDestination -> - navController.popBackStack(startDestination, false) - } - if (navItem.route != Destinations.startDestination.route) { - navController.navigate(navItem.route) + } else { + navController.graph.startDestinationRoute?.let { startDestination -> + navController.popBackStack(startDestination, false) + } + if (navItem.route != Destinations.startDestination.route) { + navController.navigate(navItem.route) + } } }, modifier = Modifier.testTag(navItem.label.uppercase()),