Fix several UI issue (#1680)

- App entry authentication
- Update Lottie animation
- Fix button text centering
- Closes #1667
This commit is contained in:
Honza Rychnovský 2024-11-14 14:54:49 +01:00 committed by GitHub
parent 425052f1db
commit f59add8e3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 10 deletions

View File

@ -23,6 +23,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import co.electriccoin.zcash.ui.design.R import co.electriccoin.zcash.ui.design.R
import co.electriccoin.zcash.ui.design.newcomponent.PreviewScreens import co.electriccoin.zcash.ui.design.newcomponent.PreviewScreens
@ -82,7 +83,8 @@ fun ZashiButton(
Text( Text(
text = text, text = text,
style = ZashiTypography.textMd, style = ZashiTypography.textMd,
fontWeight = FontWeight.SemiBold fontWeight = FontWeight.SemiBold,
textAlign = TextAlign.Center
) )
} }

View File

@ -132,10 +132,10 @@ class MainActivity : FragmentActivity() {
// } // }
} }
override fun onResume() { override fun onStart() {
Twig.debug { "Activity state: Resume" } Twig.debug { "Activity state: Start" }
authenticationViewModel.runAuthenticationRequiredCheck() authenticationViewModel.runAuthenticationRequiredCheck()
super.onResume() super.onStart()
} }
override fun onStop() { override fun onStop() {

View File

@ -264,7 +264,7 @@ private fun SendConfirmationMainContent(
} }
} }
private const val TOP_BLANK_SPACE_RATIO = 0.2f private const val TOP_BLANK_SPACE_RATIO = 0.35f
@Composable @Composable
private fun SendingContent( private fun SendingContent(
@ -298,13 +298,11 @@ private fun SendingContent(
height = Dimension.wrapContent height = Dimension.wrapContent
} }
) { ) {
// TODO [#1667]: Change lottie animation once we have it
// TODO [#1667]: https://github.com/Electric-Coin-Company/zashi-android/issues/1667
val lottieRes: Int = val lottieRes: Int =
if (isSystemInDarkTheme()) { if (isSystemInDarkTheme()) {
co.electriccoin.zcash.ui.design.R.raw.lottie_loading_white R.raw.send_confirmation_sending_dark_v1
} else { } else {
co.electriccoin.zcash.ui.design.R.raw.lottie_loading R.raw.send_confirmation_sending_v1
} }
val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(lottieRes)) val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(lottieRes))
@ -314,7 +312,7 @@ private fun SendingContent(
) )
LottieAnimation( LottieAnimation(
modifier = Modifier.size(200.dp), modifier = Modifier.size(150.dp),
composition = composition, composition = composition,
progress = { progress }, progress = { progress },
maintainOriginalImageBounds = true maintainOriginalImageBounds = true

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long