Skip to content

Add version and code to welcome screen #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2025
Merged

Add version and code to welcome screen #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5344a96
Add version and code to welcome screen
kcw-grunt Mar 31, 2025
ebc3bb9
reset padding
kcw-grunt Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions app/src/main/java/com/brainwallet/ui/screens/welcome/WelcomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import com.brainwallet.R
import com.brainwallet.navigation.OnNavigate
import com.brainwallet.navigation.Route
import com.brainwallet.navigation.UiEffect
import com.brainwallet.tools.util.BRConstants
import com.brainwallet.ui.composable.BorderedLargeButton
import com.brainwallet.ui.composable.BrainwalletButton
import com.brainwallet.ui.composable.DarkModeToggleButton
Expand Down Expand Up @@ -75,7 +76,8 @@ fun WelcomeScreen(
val halfLeadTrailPadding = leadTrailPadding / 2
val doubleLeadTrailPadding = leadTrailPadding * 2
val rowPadding = 8
val activeRowHeight = 70
val versionPadding = 12
val activeRowHeight = 58

val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.welcomeemoji20250212))
val progress by animateLottieCompositionAsState(
Expand All @@ -91,7 +93,7 @@ fun WelcomeScreen(
verticalArrangement = Arrangement.SpaceBetween
) {

Spacer(modifier = Modifier.weight(0.4f))
Spacer(modifier = Modifier.weight(0.2f))

Image(
painterResource(R.drawable.brainwallet_logotype_white),
Expand Down Expand Up @@ -125,15 +127,16 @@ fun WelcomeScreen(
modifier = Modifier
.fillMaxWidth()
.height(activeRowHeight.dp)
.padding(horizontal = halfLeadTrailPadding.dp)
.padding(horizontal = leadTrailPadding.dp)
.padding(vertical = rowPadding.dp),
horizontalArrangement = Arrangement.SpaceEvenly

) {
Spacer(modifier = Modifier.weight(0.1f))

BrainwalletButton(
modifier = Modifier.weight(0.9f),
modifier = Modifier
.weight(1f)
.fillMaxWidth(),
onClick = {
viewModel.onEvent(WelcomeEvent.OnLanguageSelectorButtonClick)
}
Expand All @@ -145,7 +148,7 @@ fun WelcomeScreen(
)
}

Spacer(modifier = Modifier.weight(0.2f))
Spacer(modifier = Modifier.weight(0.1f))

DarkModeToggleButton(
modifier = Modifier
Expand All @@ -157,10 +160,12 @@ fun WelcomeScreen(
}
)

Spacer(modifier = Modifier.weight(0.2f))
Spacer(modifier = Modifier.weight(0.1f))

BrainwalletButton(
modifier = Modifier.weight(0.9f),
modifier = Modifier
.weight(1f)
.fillMaxWidth(),
onClick = { viewModel.onEvent(WelcomeEvent.OnFiatButtonClick) }
) {
Text(
Expand All @@ -170,8 +175,6 @@ fun WelcomeScreen(
)
}

Spacer(modifier = Modifier.weight(0.1f))

}
// Ready Button
BorderedLargeButton(
Expand All @@ -180,7 +183,7 @@ fun WelcomeScreen(
},
shape = RoundedCornerShape(50),
modifier = Modifier
.padding(horizontal = halfLeadTrailPadding.dp)
.padding(horizontal = leadTrailPadding.dp)
.padding(vertical = rowPadding.dp)
.height(activeRowHeight.dp)

Expand All @@ -199,7 +202,7 @@ fun WelcomeScreen(
},
shape = RoundedCornerShape(50),
modifier = Modifier
.padding(horizontal = halfLeadTrailPadding.dp)
.padding(horizontal = leadTrailPadding.dp)
.padding(vertical = rowPadding.dp)
.height(activeRowHeight.dp)
.clip(RoundedCornerShape(50))
Expand All @@ -211,7 +214,12 @@ fun WelcomeScreen(
)
}

Spacer(modifier = Modifier.weight(0.5f))
Text( modifier = Modifier
.padding(vertical = versionPadding.dp),
text = BRConstants.APP_VERSION_NAME_CODE,
fontSize = 13.sp,
color = BrainwalletTheme.colors.content
)
}

//language selector
Expand Down