fix: restore back button

Author: jvsena42

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -547,6 +547,7 @@ private fun RootNavHost(
                         navController.navigateToTransferFunding()
                         settingsViewModel.setHasSeenTransferIntro(true)
                     },
+                    onBackClick = {},
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsIntro> {
@@ -890,7 +891,8 @@ private fun NavGraphBuilder.profile(
             onContinue = {
                 settingsViewModel.setHasSeenProfileIntro(true)
                 navController.navigate(Routes.CreateProfile)
-            }
+            },
+            onBackClick = { navController.popBackStack() }
         )
     }
     composableWithDefaultTransitions<Routes.CreateProfile> {
@@ -910,6 +912,9 @@ private fun NavGraphBuilder.shop(
             onContinue = {
                 settingsViewModel.setHasSeenShopIntro(true)
                 navController.navigate(Routes.ShopDiscover)
+            },
+            onBackClick = {
+                navController.popBackStack()
             }
         )
     }
@@ -1300,7 +1305,8 @@ private fun NavGraphBuilder.widgets(
             onContinue = {
                 settingsViewModel.setHasSeenWidgetsIntro(true)
                 navController.navigate(Routes.AddWidget)
-            }
+            },
+            onBackClick = {},
         )
     }
     composableWithDefaultTransitions<Routes.AddWidget> {
@@ -1316,6 +1322,7 @@ private fun NavGraphBuilder.widgets(
                 }
             },
             fiatSymbol = LocalCurrencies.current.currencySymbol,
+            onBackCLick = { navController.popBackStack() }
         )
     }
     composableWithDefaultTransitions<Routes.CalculatorPreview> {

app/src/main/java/to/bitkit/ui/screens/profile/ProfileIntroScreen.kt

@@ -26,11 +26,12 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun ProfileIntroScreen(
     onContinue: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.slashtags__profile),
-            onBackClick = null,
+            onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
 
@@ -68,7 +69,8 @@ fun ProfileIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         ProfileIntroScreen(
-            onContinue = {}
+            onContinue = {},
+            onBackClick = {}
         )
     }
 }

app/src/main/java/to/bitkit/ui/screens/shop/ShopIntroScreen.kt

@@ -26,11 +26,12 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun ShopIntroScreen(
     onContinue: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = "",
-            onBackClick = null,
+            onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
 
@@ -66,7 +67,8 @@ fun ShopIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         ShopIntroScreen(
-            onContinue = {}
+            onContinue = {},
+            onBackClick = {},
         )
     }
 }

app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt

@@ -33,6 +33,7 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun TransferIntroScreen(
     onContinueClick: () -> Unit = {},
+    onBackClick: () -> Unit,
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,
@@ -51,7 +52,7 @@ fun TransferIntroScreen(
         )
         AppTopBar(
             titleText = null,
-            onBackClick = null,
+            onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
         Column(
@@ -79,6 +80,6 @@ fun TransferIntroScreen(
 @Composable
 private fun Preview() {
     AppThemeSurface {
-        TransferIntroScreen()
+        TransferIntroScreen(onBackClick = {})
     }
 }

app/src/main/java/to/bitkit/ui/screens/widgets/AddWidgetsScreen.kt

@@ -19,12 +19,13 @@ import to.bitkit.ui.theme.AppThemeSurface
 @Composable
 fun AddWidgetsScreen(
     onWidgetSelected: (WidgetType) -> Unit,
+    onBackCLick: () -> Unit,
     fiatSymbol: String,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.widgets__add),
-            onBackClick = null,
+            onBackClick = onBackCLick,
             actions = { DrawerNavIcon() },
         )
 
@@ -99,7 +100,8 @@ private fun Preview() {
     AppThemeSurface {
         AddWidgetsScreen(
             onWidgetSelected = {},
-            fiatSymbol = "$"
+            fiatSymbol = "$",
+            onBackCLick = {}
         )
     }
 }

app/src/main/java/to/bitkit/ui/screens/widgets/WidgetsIntroScreen.kt

@@ -27,11 +27,12 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun WidgetsIntroScreen(
     onContinue: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = "",
-            onBackClick = null,
+            onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
 
@@ -68,7 +69,8 @@ fun WidgetsIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         WidgetsIntroScreen(
-            onContinue = {}
+            onContinue = {},
+            onBackClick = {}
         )
     }
 }

app/src/main/java/to/bitkit/ui/settings/pin/ChangePinResultScreen.kt

@@ -34,15 +34,19 @@ fun ChangePinResultScreen(
         onOkClick = {
             navController.popBackStack<Routes.SecuritySettings>(inclusive = false)
         },
+        onBackClick = {
+            navController.popBackStack()
+        }
     )
 }
 
 @Composable
 private fun ChangePinResultContent(
     onOkClick: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     ScreenColumn {
-        AppTopBar(stringResource(R.string.security__cp_changed_title), onBackClick = null)
+        AppTopBar(stringResource(R.string.security__cp_changed_title), onBackClick = onBackClick)
         Column(
             modifier = Modifier.padding(horizontal = 16.dp)
         ) {
@@ -81,6 +85,7 @@ private fun Preview() {
     AppThemeSurface {
         ChangePinResultContent(
             onOkClick = {},
+            onBackClick = {},
         )
     }
 }