fixed onboarding screen issues (#657)

This commit is contained in:
Alex 2022-11-08 10:53:29 +01:00 committed by GitHub
parent bcacf93a04
commit bb2ec4d71d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions

View File

@ -19,6 +19,7 @@ import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
@ -29,6 +30,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.painterResource
@ -173,7 +175,7 @@ private fun BottomNav(
onCreateWallet: () -> Unit,
onImportWallet: () -> Unit
) {
Column {
Column(Modifier.background(MaterialTheme.colorScheme.surface)) {
if (currentStage == OnboardingStage.Wallet) {
WalletStageBottomNav(onCreateWallet = onCreateWallet, onImportWallet)
} else {
@ -262,23 +264,30 @@ private fun Wallet(paddingValues: PaddingValues) {
}
}
@Suppress("LongParameterList")
@Composable
private fun Content(
image: Painter,
imageContentDescription: String?,
headline: String,
body: String,
paddingValues: PaddingValues
paddingValues: PaddingValues,
imageScale: Float = 0.8f
) {
val scrollState = rememberScrollState()
Column(
Modifier
.fillMaxWidth()
.padding(ZcashTheme.paddings.padding)
.verticalScroll(scrollState)
) {
Column(Modifier.padding(bottom = paddingValues.calculateBottomPadding())) {
Image(image, imageContentDescription)
Column(
Modifier.padding(
start = ZcashTheme.paddings.padding,
end = ZcashTheme.paddings.padding,
bottom = paddingValues.calculateBottomPadding()
)
) {
Image(modifier = Modifier.scale(imageScale), painter = image, contentDescription = imageContentDescription)
Header(headline)
Body(body)
}