Added the optional id parameter to the navigateTo function. Added the getNavInfoById function.

Johann Blake · Johann Blake · commit eba641712f65 · 2021-04-08T20:41:59.000+02:00
diff --git a/README.md b/README.md
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,13 +43,13 @@ android {
 dependencies {
 
     def lifecycle_version = "2.4.0-alpha01"
-    def activity_version = "1.3.0-alpha05"
+    def activity_version = "1.3.0-alpha06"
     def retrofit_version = "2.9.0"
     def paging_version = "3.0.0-beta03"
 
     implementation 'androidx.core:core-ktx:1.6.0-alpha01'
     implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
-    implementation 'com.google.android.material:material:1.4.0-alpha01'
+    implementation 'com.google.android.material:material:1.4.0-alpha02'
     implementation "androidx.activity:activity-ktx:$activity_version"
     implementation "androidx.activity:activity-compose:$activity_version"
     implementation "androidx.compose.ui:ui:$compose_version"
@@ -60,7 +60,7 @@ dependencies {
     implementation "androidx.compose.foundation:foundation:$compose_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04'
     implementation project(':navigation')
 
     // Retrofit
diff --git a/app/src/main/java/dev/wirespec/adoptme/ui/nav/NavDrawerUI.kt b/app/src/main/java/dev/wirespec/adoptme/ui/nav/NavDrawerUI.kt
@@ -67,6 +67,7 @@ fun NavDrawer(
             Column(
                 modifier = modifier
                     .background(AppTheme.appColorTheme.materialColors.surface)
+                    .requiredWidth(200.dp)
                     .fillMaxHeight()
                     .padding(20.dp)
                     .verticalScroll(navDrawerScrollState)
@@ -180,7 +181,7 @@ fun NavDrawer(
                 NavMenuItem(
                     menuId = NavMenuConstants.MenuDummyPaymentMethod,
                     icon = Icons.Filled.Payment,
-                    title = "Payment Method",
+                    title = "Payment",
                     screen = Screens.Dummy,
                     dstArgs = "Payment method stuff goes here...",
                     selected = currentMenuId == NavMenuConstants.MenuDummyPaymentMethod,
@@ -189,7 +190,7 @@ fun NavDrawer(
                 NavMenuItem(
                     menuId = NavMenuConstants.MenuDummyAnimalCategories,
                     icon = Icons.Filled.Pets,
-                    title = "Animal Categories",
+                    title = "Categories",
                     screen = Screens.Dummy,
                     dstArgs = "Animal categories go here...",
                     selected = currentMenuId == NavMenuConstants.MenuDummyAnimalCategories,
@@ -225,7 +226,7 @@ fun NavDrawer(
                 NavMenuItem(
                     menuId = NavMenuConstants.MenuDummyVerification,
                     icon = Icons.Filled.VerifiedUser,
-                    title = "Verification Program",
+                    title = "Verification",
                     screen = Screens.Dummy,
                     dstArgs = "Verification stuff goes here...",
                     selected = currentMenuId == NavMenuConstants.MenuDummyVerification,
@@ -261,6 +262,7 @@ fun NavDrawer(
             }
 
             Image(
+                modifier = Modifier.fillMaxHeight(),
                 painter = painterResource(id = R.drawable.nav_drawer_bg),
                 contentDescription = null,
                 contentScale = ContentScale.FillHeight
diff --git a/app/src/main/java/dev/wirespec/adoptme/ui/nav/NavDrawerViewModel.kt b/app/src/main/java/dev/wirespec/adoptme/ui/nav/NavDrawerViewModel.kt
@@ -16,7 +16,7 @@ class NavDrawerViewModel : ViewModel() {
 
     init {
         NavigationManager.observeScreenChange {
-            if  (NavigationManager.totalScreensDisplayed == 1) {
+            if (NavigationManager.totalScreensDisplayed == 1) {
                 _currentMenuId.value = NavMenuConstants.MenuHome
             }
         }
@@ -28,7 +28,7 @@ class NavDrawerViewModel : ViewModel() {
         if (screen == Screens.PetsList) {
             NavigationManager.navigateToHomeScreen()
         } else {
-            NavigationManager.navigateTo(screen = screen,screenData = screenData)
+            NavigationManager.navigateTo(screen = screen, screenData = screenData)
         }
     }
 }
diff --git a/app/src/main/java/dev/wirespec/adoptme/ui/screens/dummy/DummyUI.kt b/app/src/main/java/dev/wirespec/adoptme/ui/screens/dummy/DummyUI.kt
@@ -85,7 +85,7 @@ fun Dummy(
                 colors = AppTheme.getButtonColors(),
                 elevation = ButtonDefaults.elevation(5.dp),
                 onClick = {
-                    NavigationManager.navigateTo(Screens.Dummy, screenData = "Dummy Screen")
+                    NavigationManager.navigateTo(screen = Screens.Dummy, screenData = "Dummy Screen")
                 }) {
                 Text(
                     text = "Navigate to another dummy screen",
diff --git a/app/src/main/java/dev/wirespec/adoptme/ui/screens/petdetails/PetDetailsUI.kt b/app/src/main/java/dev/wirespec/adoptme/ui/screens/petdetails/PetDetailsUI.kt
@@ -43,7 +43,7 @@ fun PetDetailsHandler(navInfo: NavigationInfo, modifier: Modifier = Modifier) {
         pet = navInfo.screenData as PetListItemInfo,
         scrollState = vm.scrollState, // Once LazyColumn supports maintaining the scroll state, replace this with vm.listState
         onAdoptClick = {
-            NavigationManager.navigateTo(Screens.Dummy, screenData = "How to adopt")
+            NavigationManager.navigateTo(screen = Screens.Dummy, screenData = "How to adopt")
         },
         onBackButtonClick = {
             NavigationManager.goBack()
diff --git a/app/src/main/java/dev/wirespec/adoptme/ui/screens/petslist/PetsListUI.kt b/app/src/main/java/dev/wirespec/adoptme/ui/screens/petslist/PetsListUI.kt
@@ -67,7 +67,7 @@ fun PetsListHandler(navInfo: NavigationInfo, modifier: Modifier = Modifier) {
         scrollState = vm.scrollState,
         modifier = modifier,
         onItemClick = { petInfo ->
-            NavigationManager.navigateTo(Screens.PetDetails, petInfo)
+            NavigationManager.navigateTo(screen = Screens.PetDetails, screenData = petInfo)
         },
         onToolbarMenuClick = {
             coroutineScope.launch {
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_version = '1.0.0-beta03'
+        compose_version = '1.0.0-beta04'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha12'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Feb 21 13:23:59 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/navigation/src/main/java/dev/wirespec/navigation/NavigationInfo.kt b/navigation/src/main/java/dev/wirespec/navigation/NavigationInfo.kt
@@ -9,6 +9,12 @@ import androidx.lifecycle.ViewModel
  * navigation stack is assigned an instance of NavigationInfo.
  */
 data class NavigationInfo(
+
+    /**
+     * A unique id that can be used to identify this item in the navigation stack. This is optional.
+     */
+    var id: Any? = null,
+
     /**
      * The type of screen that is being displayed.
      */
diff --git a/navigation/src/main/java/dev/wirespec/navigation/NavigationManager.kt b/navigation/src/main/java/dev/wirespec/navigation/NavigationManager.kt
@@ -154,13 +154,14 @@ class NavigationManager {
          * hidden placeholder screen is placed after it.
          * @param screen The type of screen that is being navigated to.
          * @param screenData Data that can be passed on to the destination screen.
+         * @param id A unique id to identify this item in the navigation stack.
          */
-        fun navigateTo(screen: Any, screenData: Any? = null) {
-
+        fun navigateTo(screen: Any, screenData: Any? = null, id: Any? = null) {
             val stackScreen = navStack.last()
             val screenInfo = screens.first { it.screen == screen }
 
             stackScreen.apply {
+                this.id = id
                 this.screen = screen
                 this.screenData = screenData
 
@@ -248,5 +249,16 @@ class NavigationManager {
         fun getNavInfo(index: Int): NavigationInfo {
             return navStack[index]
         }
+
+        /**
+         * Returns the navigation information for the item in the navigation stack that
+         * matches the specified id.
+         */
+        fun getNavInfoById(id: String): NavigationInfo? {
+            if (id == null)
+                return null
+
+            return navStack.find { it.id == id }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class NavDrawerViewModel : ViewModel() {`
`16`	`16`
`17`	`17`	`init {`
`18`	`18`	`NavigationManager.observeScreenChange {`
`19`		`- if (NavigationManager.totalScreensDisplayed == 1) {`
	`19`	`+ if (NavigationManager.totalScreensDisplayed == 1) {`
`20`	`20`	`_currentMenuId.value = NavMenuConstants.MenuHome`
`21`	`21`	`}`
`22`	`22`	`}`
`@@ -28,7 +28,7 @@ class NavDrawerViewModel : ViewModel() {`
`28`	`28`	`if (screen == Screens.PetsList) {`
`29`	`29`	`NavigationManager.navigateToHomeScreen()`
`30`	`30`	`} else {`
`31`		`- NavigationManager.navigateTo(screen = screen,screenData = screenData)`
	`31`	`+ NavigationManager.navigateTo(screen = screen, screenData = screenData)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`