Merge pull request #145 from niscy-eudiw/main

minor cleanup
eu-digital-identity-wallet · Jul 8, 2024 · 0438f63 · 0438f63
2 parents 96e1fd6 + fe091a4
commit 0438f63
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 53 deletions.
diff --git a/...re/src/main/java/eu/europa/ec/issuancefeature/ui/document/code/DocumentOfferCodeScreen.kt b/...re/src/main/java/eu/europa/ec/issuancefeature/ui/document/code/DocumentOfferCodeScreen.kt
@@ -69,23 +69,6 @@ fun DocumentOfferCodeScreen(
     }
 }
 
-private fun handleNavigationEffect(
-    navigationEffect: Effect.Navigation,
-    navController: NavController
-) {
-    when (navigationEffect) {
-        is Effect.Navigation.SwitchScreen -> {
-            navController.navigate(navigationEffect.screenRoute) {
-                popUpTo(IssuanceScreens.DocumentOfferCode.screenRoute) {
-                    inclusive = true
-                }
-            }
-        }
-
-        is Effect.Navigation.Pop -> navController.popBackStack()
-    }
-}
-
 @Composable
 private fun Content(
     context: Context,
@@ -130,7 +113,7 @@ private fun Content(
 }
 
 @Composable
-fun CodeFieldLayout(
+private fun CodeFieldLayout(
     state: State,
     onPinInput: (String) -> Unit,
 ) {
@@ -143,4 +126,21 @@ fun CodeFieldLayout(
         pinWidth = 46.dp,
         focusOnCreate = true,
     )
+}
+
+private fun handleNavigationEffect(
+    navigationEffect: Effect.Navigation,
+    navController: NavController
+) {
+    when (navigationEffect) {
+        is Effect.Navigation.SwitchScreen -> {
+            navController.navigate(navigationEffect.screenRoute) {
+                popUpTo(IssuanceScreens.DocumentOfferCode.screenRoute) {
+                    inclusive = true
+                }
+            }
+        }
+
+        is Effect.Navigation.Pop -> navController.popBackStack()
+    }
 }
diff --git a/...ature/src/main/java/eu/europa/ec/issuancefeature/ui/document/offer/DocumentOfferScreen.kt b/...ature/src/main/java/eu/europa/ec/issuancefeature/ui/document/offer/DocumentOfferScreen.kt
@@ -139,41 +139,6 @@ fun DocumentOfferScreen(
     }
 }
 
-private fun handleNavigationEffect(
-    context: Context,
-    navigationEffect: Effect.Navigation,
-    navController: NavController
-) {
-    when (navigationEffect) {
-        is Effect.Navigation.SwitchScreen -> {
-            navController.navigate(navigationEffect.screenRoute) {
-                if (navigationEffect.shouldPopToSelf) {
-                    popUpTo(IssuanceScreens.DocumentOffer.screenRoute) {
-                        inclusive = true
-                    }
-                }
-            }
-        }
-
-        is Effect.Navigation.PopBackStackUpTo -> {
-            navController.popBackStack(
-                route = navigationEffect.screenRoute,
-                inclusive = navigationEffect.inclusive
-            )
-        }
-
-        is Effect.Navigation.DeepLink -> {
-            context.cacheDeepLink(navigationEffect.link)
-            navController.popBackStack(
-                route = DashboardScreens.Dashboard.screenRoute,
-                inclusive = false
-            )
-        }
-
-        is Effect.Navigation.Pop -> navController.popBackStack()
-    }
-}
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun Content(
@@ -310,4 +275,39 @@ private fun StickyBottomSection(
             Text(text = stringResource(id = R.string.issuance_document_offer_secondary_button_text))
         }
     }
+}
+
+private fun handleNavigationEffect(
+    context: Context,
+    navigationEffect: Effect.Navigation,
+    navController: NavController
+) {
+    when (navigationEffect) {
+        is Effect.Navigation.SwitchScreen -> {
+            navController.navigate(navigationEffect.screenRoute) {
+                if (navigationEffect.shouldPopToSelf) {
+                    popUpTo(IssuanceScreens.DocumentOffer.screenRoute) {
+                        inclusive = true
+                    }
+                }
+            }
+        }
+
+        is Effect.Navigation.PopBackStackUpTo -> {
+            navController.popBackStack(
+                route = navigationEffect.screenRoute,
+                inclusive = navigationEffect.inclusive
+            )
+        }
+
+        is Effect.Navigation.DeepLink -> {
+            context.cacheDeepLink(navigationEffect.link)
+            navController.popBackStack(
+                route = DashboardScreens.Dashboard.screenRoute,
+                inclusive = false
+            )
+        }
+
+        is Effect.Navigation.Pop -> navController.popBackStack()
+    }
 }