Inner navigation and other improvements

app/src/main/java/no/nordicsemi/android/common/test/MainActivity.kt

@@ -31,26 +31,237 @@
 
 package no.nordicsemi.android.common.test
 
+import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import no.nordicsemi.android.common.navigation.NavigationView
-import no.nordicsemi.android.common.test.main.MainDestination
-import no.nordicsemi.android.common.test.scanner.ScannerDestination
-import no.nordicsemi.android.common.test.simple.HelloDestination
+import kotlinx.coroutines.launch
+import no.nordicsemi.android.common.logger.view.LoggerAppBarIcon
+import no.nordicsemi.android.common.navigation.*
+import no.nordicsemi.android.common.navigation.viewmodel.SimpleNavigationViewModel
+import no.nordicsemi.android.common.test.main.MainDestinations
+import no.nordicsemi.android.common.test.scanner.Scanner
+import no.nordicsemi.android.common.test.simple.*
+import no.nordicsemi.android.common.test.tab.*
 import no.nordicsemi.android.common.theme.NordicActivity
 import no.nordicsemi.android.common.theme.NordicTheme
+import no.nordicsemi.android.common.theme.view.*
+
+data class Item(val title: String, val destinationId: DestinationId<Unit , *>, val icon: ImageVector)
+
+val Tabs = createSimpleDestination("tabs")
+val FirstTab = createSimpleDestination("first_tab")
+val SecondTab = createSimpleDestination("second_tab")
 
 @AndroidEntryPoint
 class MainActivity : NordicActivity() {
 
+    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        val menuItems = listOf(
+            Item("Main", Tabs, Icons.Filled.Verified),
+            Item("Settings", Settings, Icons.Filled.Settings),
+        )
+
+        val advancedMenuItems = listOf(
+            Item("Advanced Settings", Advanced, Icons.Filled.ImageSearch),
+        )
+
+        val tabs = listOf(
+            Item("Main", FirstTab, Icons.Filled.Verified),
+            Item("Inner Navigation", SecondTab, Icons.Filled.Navigation),
+            Item("Simple", ThirdTab, Icons.Filled.Album),
+        )
+
         setContent {
             NordicTheme {
-                NavigationView(MainDestination + ScannerDestination + HelloDestination)
+                val navigator: SimpleNavigationViewModel = hiltViewModel()
+
+                val drawerState = rememberDrawerState(DrawerValue.Closed)
+                val scope = rememberCoroutineScope()
+
+                ModalNavigationDrawer(
+                    drawerState = drawerState,
+                    drawerContent = {
+                        ModalDrawerSheet(
+                            modifier = Modifier
+                                .fillMaxHeight()
+                                .verticalScroll(rememberScrollState()),
+                        ) {
+                            NordicLogo(
+                                modifier = Modifier
+                                    .padding(NavigationDrawerTitleDefaults.ItemPadding)
+                                    .padding(vertical = 16.dp)
+                            )
+
+                            NavigationDrawerTitle(
+                                title = "Menu",
+                                modifier = Modifier.padding(NavigationDrawerTitleDefaults.ItemPadding)
+                            )
+
+                            NavigationDrawerItems(
+                                items = menuItems,
+                                navigator = navigator,
+                                onDismiss = { scope.launch { drawerState.close() } },
+                                modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding)
+                            )
+
+                            Divider(
+                                modifier = Modifier.padding(NavigationDrawerDividerDefaults.ItemPadding)
+                            )
+
+                            NavigationDrawerTitle(
+                                title = "Advanced",
+                                modifier = Modifier.padding(NavigationDrawerTitleDefaults.ItemPadding)
+                            )
+
+                            NavigationDrawerItems(
+                                items = advancedMenuItems,
+                                navigator = navigator,
+                                onDismiss = { scope.launch { drawerState.close() } },
+                                modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding)
+                            )
+
+                            NavigationDrawerItem(
+                                icon = { Icon(Icons.Filled.BrokenImage, contentDescription = null) },
+                                label = { Text("This does nothing") },
+                                selected = false,
+                                onClick = { },
+                                modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding)
+                            )
+                        }
+                    }
+                ) {
+                    val currentDestination by navigator.currentDestination().collectAsState()
+                    Log.w("AAA", "Current destination: $currentDestination")
+                    Scaffold(
+                        topBar = {
+                            NordicAppBar(
+                                text = stringResource(id = R.string.title_main),
+                                showBackButton = listOf(Hello, Scanner).contains(currentDestination),
+                                onNavigationButtonClick = { navigator.navigateUp() },
+                                onHamburgerButtonClick = {
+                                    scope.launch { drawerState.open() }
+                                },
+                                actions = {
+                                    val context = LocalContext.current
+                                    LoggerAppBarIcon(
+                                        onClick = {
+                                            Toast.makeText(
+                                                context,
+                                                "Logger clicked",
+                                                Toast.LENGTH_SHORT
+                                            ).show()
+                                        }
+                                    )
+                                },
+                            )
+                        },
+                        bottomBar = {
+                            // Show the Navigation Bar only in the Tabs destination.
+                            if (navigator.isInHierarchy(Tabs).collectAsState().value) {
+                                NavigationBar {
+                                    tabs.forEach { tab ->
+                                        val selected by navigator.isInHierarchy(tab.destinationId).collectAsState()
+                                        NavigationBarItem(
+                                            icon = { Icon(tab.icon, contentDescription = null) },
+                                            label = { Text(tab.title) },
+                                            selected = selected,
+                                            onClick = {
+                                                // Checking if the tab is not selected here
+                                                // is a workaround for an issue with how the navigation
+                                                // restores the previous stack when back button was used.
+                                                // See: https://issuetracker.google.com/issues/258237571
+                                                if (!selected) {
+                                                    navigator.navigateTo(tab.destinationId) {
+                                                        popUpToStartDestination {
+                                                            saveState = true
+                                                        }
+                                                        launchSingleTop = true
+                                                        restoreState = true
+                                                    }
+                                                }
+                                            }
+                                        )
+                                    }
+                                }
+                            }
+                        }
+                    ) { padding ->
+                        NavigationView(
+                            destinations = listOf(
+                                Tabs with ((FirstTab with MainDestinations) + (SecondTab with SecondDestinations) + ThirdDestination),
+                                SettingsDestination,
+                                AdvancedDestination,
+                            ),
+                            modifier = Modifier.padding(padding),
+                            backHandler = {
+                                // The back handler is called when user click the back button,
+                                // either the physical or any action that calls navigator.navigateUp().
+                                // The handler can handle it and return true (handled) or ignore,
+                                // to continue with a default behavior.
+                                drawerState.isOpen.also { if (it) scope.launch { drawerState.close() } }
+                            }
+                        )
+                    }
+                }
             }
         }
     }
+}
+
+@SuppressLint("ComposableNaming")
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun NavigationDrawerItems(
+    items: List<Item>,
+    navigator: Navigator,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    items.forEach { item ->
+        val selected by navigator.isInHierarchy(item.destinationId).collectAsState()
+        NavigationDrawerItem(
+            icon = { Icon(item.icon, contentDescription = null) },
+            label = { Text(item.title) },
+            selected = selected,
+            onClick = {
+                onDismiss()
+                // Checking if the tab is not selected here
+                // is a workaround for an issue with how the navigation
+                // restores the previous stack when back button was used.
+                // See: https://issuetracker.google.com/issues/258237571
+                if (!selected) {
+                    navigator.navigateTo(item.destinationId) {
+                        popUpToStartDestination {
+                            saveState = true
+                        }
+                        launchSingleTop = true
+                        restoreState = true
+                    }
+                }
+            },
+            modifier = modifier,
+        )
+    }
 }

app/src/main/java/no/nordicsemi/android/common/test/main/Main.kt

@@ -1,59 +1,40 @@
 package no.nordicsemi.android.common.test.main
 
-import android.widget.Toast
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import no.nordicsemi.android.common.logger.view.LoggerAppBarIcon
-import no.nordicsemi.android.common.navigation.*
-import no.nordicsemi.android.common.test.R
+import no.nordicsemi.android.common.navigation.createSimpleDestination
+import no.nordicsemi.android.common.navigation.defineDestination
 import no.nordicsemi.android.common.test.main.page.*
-import no.nordicsemi.android.common.theme.view.NordicAppBar
+import no.nordicsemi.android.common.test.scanner.ScannerDestination
+import no.nordicsemi.android.common.test.simple.HelloDestination
 import no.nordicsemi.android.common.theme.view.PagerView
 import no.nordicsemi.android.common.theme.view.PagerViewEntity
 
 /** This is the destination identifier. */
 val Main = createSimpleDestination("main")
 
 /**
- * List of destinations defined in the module.
- *
- * Optionally, this can define a local Router for routing navigation within the module.
+ * Here you define a View for the destination.
  */
-val MainDestination = defineDestination(Main) {
+private val MainDestination = defineDestination(Main) {
     MainScreen()
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+val MainDestinations = MainDestination + ScannerDestination + HelloDestination
+
 @Composable
 private fun MainScreen() {
-    Column {
-        NordicAppBar(
-            text = stringResource(id = R.string.title_main),
-            actions = {
-                val context = LocalContext.current
-                LoggerAppBarIcon(
-                    onClick = {
-                        Toast.makeText(context, "Logger clicked", Toast.LENGTH_SHORT).show()
-                    }
-                )
-            }
-        )
-        val pages = PagerViewEntity(listOf(
-            BasicsPage,
-            FontsPage,
-            WizardPage,
-            ConnectionPage,
-            WarningPage,
-        ))
-        PagerView(
-            viewEntity = pages,
-            contentPadding = PaddingValues(horizontal = 16.dp),
-            itemSpacing = 16.dp,
-        )
-    }
+    val pages = PagerViewEntity(listOf(
+        BasicsPage,
+        FontsPage,
+        WizardPage,
+        ConnectionPage,
+        WarningPage,
+    ))
+    PagerView(
+        viewEntity = pages,
+        contentPadding = PaddingValues(horizontal = 16.dp),
+        itemSpacing = 16.dp,
+    )
 }

app/src/main/java/no/nordicsemi/android/common/test/main/page/BasicViewsPage.kt

@@ -41,8 +41,8 @@ val BasicsPage = PagerViewItem("Basics") {
 
     BasicViewsScreen(
         device = device?.let { DeviceInfo(it) },
-        onOpenScanner = { vm.openScanner() },
         onOpenSimple = { vm.openSimple() },
+        onOpenScanner = { vm.openScanner() },
     )
 }
 
@@ -73,7 +73,7 @@ class BasicPageViewModel @Inject constructor(
     }
 
     fun openSimple() {
-        navigator.navigateTo(Hello)
+        navigator.navigateTo(Hello, 1)
     }
 }
 
@@ -89,8 +89,8 @@ data class DeviceInfo(
 @Composable
 private fun BasicViewsScreen(
     device: DeviceInfo?,
-    onOpenScanner: () -> Unit,
     onOpenSimple: () -> Unit,
+    onOpenScanner: () -> Unit,
 ) {
     Column(
         modifier = Modifier
@@ -99,10 +99,12 @@ private fun BasicViewsScreen(
         verticalArrangement = Arrangement.spacedBy(16.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        Button(
-            onClick = onOpenSimple
-        ) {
-            Text(text = stringResource(id = R.string.action_simple))
+        Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+            Button(
+                onClick = onOpenSimple
+            ) {
+                Text(text = stringResource(id = R.string.action_simple))
+            }
         }
 
         Button(
@@ -262,8 +264,8 @@ private fun ContentPreview() {
     NordicTheme {
         BasicViewsScreen(
             device = null,
-            onOpenScanner = {},
             onOpenSimple = {},
+            onOpenScanner = {},
         )
     }
 }