Feat: Add back button in settings screens

thunderbiscuit · Mar 21, 2023 · 81e1067 · 81e1067
1 parent b473c22
commit 81e1067
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 33 deletions.
diff --git a/app/src/main/java/com/goldenraven/padawanwallet/ui/settings/AboutScreen.kt b/app/src/main/java/com/goldenraven/padawanwallet/ui/settings/AboutScreen.kt
@@ -7,10 +7,7 @@ package com.goldenraven.padawanwallet.ui.settings
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.*
@@ -20,25 +17,23 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
 import com.goldenraven.padawanwallet.R
 import com.goldenraven.padawanwallet.theme.*
+import com.goldenraven.padawanwallet.ui.PadawanAppBar
 
 @Composable
-internal fun AboutScreen() {
+internal fun AboutScreen(
+    navController: NavHostController
+) {
     val scrollState = rememberScrollState()
     Column(
         Modifier
             .verticalScroll(state = scrollState)
             .background(padawan_theme_background_secondary)
             .padding(bottom = 12.dp)
     ) {
-        Text(
-            text = "About Padawan",
-            style = PadawanTypography.headlineSmall,
-            color = padawan_theme_text_headline,
-            modifier = Modifier
-                .padding(top = 48.dp, start = 24.dp, end = 24.dp, bottom = 32.dp)
-        )
+        PadawanAppBar(navController = navController, title = "About Padawan")
         Text(
             text = stringResource(R.string.about_text),
             modifier = Modifier.padding(start = 24.dp, end = 24.dp),

diff --git a/app/src/main/java/com/goldenraven/padawanwallet/ui/settings/RecoveryPhraseScreen.kt b/app/src/main/java/com/goldenraven/padawanwallet/ui/settings/RecoveryPhraseScreen.kt
@@ -16,15 +16,17 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
 import com.goldenraven.padawanwallet.data.WalletRepository
-import com.goldenraven.padawanwallet.theme.PadawanTypography
 import com.goldenraven.padawanwallet.theme.padawan_theme_background_secondary
-import com.goldenraven.padawanwallet.theme.padawan_theme_text_headline
+import com.goldenraven.padawanwallet.ui.PadawanAppBar
 import com.goldenraven.padawanwallet.ui.standardBorder
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-internal fun RecoveryPhraseScreen() {
+internal fun RecoveryPhraseScreen(
+    navController: NavHostController
+) {
     val scrollState = rememberScrollState()
     val seedPhrase: String = WalletRepository.getMnemonic()
     val wordList: List<String> = seedPhrase.split(" ")
@@ -35,13 +37,7 @@ internal fun RecoveryPhraseScreen() {
             .fillMaxSize()
             .verticalScroll(state = scrollState)
     ){
-        Text(
-            text = "Your wallet recovery phrase",
-            style = PadawanTypography.headlineSmall,
-            color = padawan_theme_text_headline,
-            modifier = Modifier
-                .padding(top = 48.dp, start = 24.dp, end = 24.dp, bottom = 32.dp)
-        )
+        PadawanAppBar(navController = navController, title = "Your wallet recovery phrase")
         wordList.forEachIndexed { index, item ->
             Row(
                 horizontalArrangement = Arrangement.Center,

diff --git a/app/src/main/java/com/goldenraven/padawanwallet/ui/settings/SendCoinsBackScreen.kt b/app/src/main/java/com/goldenraven/padawanwallet/ui/settings/SendCoinsBackScreen.kt
@@ -31,13 +31,17 @@ import androidx.compose.ui.text.PlaceholderVerticalAlign
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.navigation.NavHostController
 import com.goldenraven.padawanwallet.R
 import com.goldenraven.padawanwallet.theme.*
+import com.goldenraven.padawanwallet.ui.PadawanAppBar
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 @Composable
-internal fun SendCoinsBackScreen() {
+internal fun SendCoinsBackScreen(
+    navController: NavHostController
+) {
     val scrollState = rememberScrollState()
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -68,13 +72,7 @@ internal fun SendCoinsBackScreen() {
                 .background(padawan_theme_background_secondary)
                 .padding(padding)
         ) {
-            Text(
-                text = "Send your coins back to us!",
-                style = PadawanTypography.headlineSmall,
-                color = padawan_theme_text_headline,
-                modifier = Modifier
-                    .padding(top = 48.dp, start = 24.dp, end = 24.dp, bottom = 32.dp)
-            )
+            PadawanAppBar(navController = navController, title = "Send your coins back to us!")
             Image(
                 painterResource(R.drawable.return_sats_faucet_address),
                 contentDescription = "Return sats faucet address image",

diff --git a/app/src/main/java/com/goldenraven/padawanwallet/ui/wallet/WalletNavigation.kt b/app/src/main/java/com/goldenraven/padawanwallet/ui/wallet/WalletNavigation.kt
@@ -269,7 +269,7 @@ fun WalletNavigation(
             popExitTransition = {
                 slideOutOfContainer(AnimatedContentScope.SlideDirection.Down, animationSpec = tween(animationDuration))
             }
-        ) { AboutScreen() }
+        ) { AboutScreen(navController = navControllerWalletNavigation) }
 
 
         // Recovery phrase
@@ -287,7 +287,7 @@ fun WalletNavigation(
             popExitTransition = {
                 slideOutOfContainer(AnimatedContentScope.SlideDirection.Down, animationSpec = tween(animationDuration))
             }
-        ) { RecoveryPhraseScreen() }
+        ) { RecoveryPhraseScreen(navController = navControllerWalletNavigation) }
 
 
         // Send coins back
@@ -305,6 +305,6 @@ fun WalletNavigation(
             popExitTransition = {
                 slideOutOfContainer(AnimatedContentScope.SlideDirection.Down, animationSpec = tween(animationDuration))
             }
-        ) { SendCoinsBackScreen() }
+        ) { SendCoinsBackScreen(navController = navControllerWalletNavigation) }
     }
 }