-
Notifications
You must be signed in to change notification settings - Fork 5
refactor: standardize intro sheets #1314
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.
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
Open
+401
−523
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e8c55b6
fix: align timed sheet behavior
pwltr 80d5521
refactor: share sheet intro image width
pwltr 4666ef2
chore: prepare sheet intro pr
pwltr 9b299cf
chore: rename changelog fragment
pwltr 9c79f4d
fix: preserve quickpay intro test tag
pwltr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 151 additions & 0 deletions
151
app/src/main/java/to/bitkit/ui/components/SheetIntro.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| package to.bitkit.ui.components | ||
|
|
||
| import androidx.annotation.DrawableRes | ||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.heightIn | ||
| import androidx.compose.foundation.layout.navigationBarsPadding | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.platform.testTag | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.text.AnnotatedString | ||
| import androidx.compose.ui.unit.dp | ||
| import to.bitkit.ui.scaffold.SheetTopBar | ||
| import to.bitkit.ui.shared.util.gradientBackground | ||
| import to.bitkit.ui.theme.Colors | ||
|
|
||
| /** Width fraction used by intro sheet artwork. */ | ||
| const val SHEET_INTRO_IMAGE_WIDTH_FRACTION = 0.8f | ||
|
|
||
| @Composable | ||
| @Suppress("LongParameterList") | ||
| fun SheetIntro( | ||
| navTitle: String, | ||
| title: AnnotatedString, | ||
| description: AnnotatedString, | ||
| @DrawableRes image: Int, | ||
| continueText: String, | ||
| onContinue: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| continueLoading: Boolean = false, | ||
| cancelText: String? = null, | ||
| onCancel: (() -> Unit)? = null, | ||
| testTag: String = "SheetIntro", | ||
| cancelTestTag: String = "${testTag}Cancel", | ||
| continueTestTag: String = "${testTag}Continue", | ||
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .fillMaxSize() | ||
| .gradientBackground() | ||
| .navigationBarsPadding() | ||
| .testTag(testTag) | ||
| ) { | ||
| SheetTopBar(navTitle) | ||
|
|
||
| Column( | ||
| modifier = Modifier.padding(horizontal = 32.dp), | ||
| ) { | ||
| Box( | ||
| contentAlignment = Alignment.BottomCenter, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .weight(1f) | ||
| ) { | ||
| Image( | ||
| painter = painterResource(image), | ||
| contentDescription = null, | ||
| contentScale = ContentScale.Fit, | ||
| modifier = Modifier | ||
| .fillMaxWidth(SHEET_INTRO_IMAGE_WIDTH_FRACTION) | ||
| .heightIn(max = 320.dp) | ||
| .testTag("${testTag}Image") | ||
| ) | ||
| } | ||
|
|
||
| VerticalSpacer(32.dp) | ||
| Display( | ||
| text = title, | ||
| color = Colors.White, | ||
| modifier = Modifier.testTag("${testTag}Title") | ||
| ) | ||
| VerticalSpacer(8.dp) | ||
| BodyM( | ||
| text = description, | ||
| color = Colors.White64, | ||
| modifier = Modifier.testTag("${testTag}Description") | ||
| ) | ||
| VerticalSpacer(32.dp) | ||
|
|
||
| SheetIntroButtons( | ||
| continueText = continueText, | ||
| onContinue = onContinue, | ||
| continueLoading = continueLoading, | ||
| cancelText = cancelText, | ||
|
pwltr marked this conversation as resolved.
|
||
| onCancel = onCancel, | ||
| testTag = "${testTag}Buttons", | ||
| cancelTestTag = cancelTestTag, | ||
| continueTestTag = continueTestTag, | ||
| ) | ||
| VerticalSpacer(16.dp) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| @Suppress("LongParameterList") | ||
| private fun SheetIntroButtons( | ||
| continueText: String, | ||
| onContinue: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| continueLoading: Boolean = false, | ||
| cancelText: String? = null, | ||
| onCancel: (() -> Unit)? = null, | ||
| testTag: String = "SheetIntroButtons", | ||
| cancelTestTag: String = "SheetIntroCancel", | ||
| continueTestTag: String = "SheetIntroContinue", | ||
| ) { | ||
| if (cancelText == null || onCancel == null) { | ||
|
ovitrif marked this conversation as resolved.
|
||
| PrimaryButton( | ||
| text = continueText, | ||
| onClick = onContinue, | ||
| isLoading = continueLoading, | ||
| modifier = modifier.testTag(continueTestTag) | ||
| ) | ||
| return | ||
| } | ||
|
|
||
| Row( | ||
| horizontalArrangement = Arrangement.spacedBy(16.dp), | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .testTag(testTag) | ||
| ) { | ||
| SecondaryButton( | ||
| text = cancelText, | ||
| fullWidth = false, | ||
| onClick = onCancel, | ||
| modifier = Modifier | ||
| .weight(1f) | ||
| .testTag(cancelTestTag) | ||
| ) | ||
| PrimaryButton( | ||
| text = continueText, | ||
| fullWidth = false, | ||
| onClick = onContinue, | ||
| isLoading = continueLoading, | ||
| modifier = Modifier | ||
| .weight(1f) | ||
| .testTag(continueTestTag) | ||
| ) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.