fix #1629 : migrated MakeTransferFragment to compose #1630
Merged
Conversation
This file contains 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
PratyushSingh07
requested changes
May 18, 2024
| onDismissRequest = { | ||
| showBottomSheet = false | ||
| }, | ||
| dragHandle = { BottomSheetDefaults.DragHandle() }, |
There was a problem hiding this comment.
i think its the default value ?
Comment on lines
+161
to
+163
| var showBottomSheet by rememberSaveable { | ||
| mutableStateOf(showBottomSheet) | ||
| } |
There was a problem hiding this comment.
point of adding this here
| .width(100.dp) | ||
| .height(50.dp) | ||
| ) { | ||
| Text(text = "Cancel") |
There was a problem hiding this comment.
extract string res
| .width(100.dp) | ||
| .height(50.dp) | ||
| ) { | ||
| Text(text = "Confirm") |
Comment on lines
+194
to
+196
| style = TextStyle( | ||
| Color.Black, | ||
| MaterialTheme.typography.bodyMedium.fontSize |
There was a problem hiding this comment.
repetitive styles can be moved to MifosTextStyle.kt
Comment on lines
+335
to
+411
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewWithMakeTransferContentLoading() { | ||
| MakeTransferScreen( | ||
| uiState = MakeTransferState.Loading, | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewWithMakeTransferContentSuccess() { | ||
| MakeTransferScreen( | ||
| uiState = MakeTransferState.Success( | ||
| toClientId = 1234, | ||
| resultName = "John Doe", | ||
| externalId = "[email protected]", | ||
| transferAmount = 100.0, | ||
| showBottomSheet = true, | ||
| ), | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewMakeTransferContent() { | ||
| MakeTransferContent( | ||
| toClientId = 1234, | ||
| resultName = "John Doe", | ||
| externalId = "[email protected]", | ||
| transferAmount = 100.0, | ||
| makeTransfer = { _, _ -> }, | ||
| sheetState = null, | ||
| showBottomSheet = true | ||
| ) | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewMakeTransferBottomSheetContent() { | ||
| MakeTransferBottomSheetContent( | ||
| showBottomSheet = true, | ||
| toClientId = 1234, | ||
| resultName = "John Doe", | ||
| externalId = "[email protected]", | ||
| transferAmount = 100.0, | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewWithMakeTransferContentError() { | ||
| MakeTransferScreen( | ||
| uiState = MakeTransferState.Error("An error occurred"), | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } | ||
|
|
There was a problem hiding this comment.
use preview parameter annotation
AvneetSingh2001
suggested changes
May 18, 2024
Comment on lines
+87
to
+102
| val showBottomSheet = uiState.showBottomSheet | ||
| val toClientId = uiState.toClientId | ||
| val resultName = uiState.resultName | ||
| val externalId = uiState.externalId | ||
| val transferAmount = uiState.transferAmount | ||
| val showTransactionStatus = showTransactionStatus | ||
|
|
||
| MakeTransferBottomSheetContent( | ||
| showBottomSheet, | ||
| toClientId, | ||
| resultName, | ||
| externalId, | ||
| transferAmount, | ||
| showTransactionStatus, | ||
| makeTransfer = makeTransfer | ||
| ) |
There was a problem hiding this comment.
directly pass these values to the composable.
also always pass by naming the parameter, link showBottomSheet = uiState.showBottomSheet for functions for more good visibility of code.
Comment on lines
+335
to
+410
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewWithMakeTransferContentLoading() { | ||
| MakeTransferScreen( | ||
| uiState = MakeTransferState.Loading, | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewWithMakeTransferContentSuccess() { | ||
| MakeTransferScreen( | ||
| uiState = MakeTransferState.Success( | ||
| toClientId = 1234, | ||
| resultName = "John Doe", | ||
| externalId = "[email protected]", | ||
| transferAmount = 100.0, | ||
| showBottomSheet = true, | ||
| ), | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewMakeTransferContent() { | ||
| MakeTransferContent( | ||
| toClientId = 1234, | ||
| resultName = "John Doe", | ||
| externalId = "[email protected]", | ||
| transferAmount = 100.0, | ||
| makeTransfer = { _, _ -> }, | ||
| sheetState = null, | ||
| showBottomSheet = true | ||
| ) | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewMakeTransferBottomSheetContent() { | ||
| MakeTransferBottomSheetContent( | ||
| showBottomSheet = true, | ||
| toClientId = 1234, | ||
| resultName = "John Doe", | ||
| externalId = "[email protected]", | ||
| transferAmount = 100.0, | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewWithMakeTransferContentError() { | ||
| MakeTransferScreen( | ||
| uiState = MakeTransferState.Error("An error occurred"), | ||
| showTransactionStatus = ShowTransactionStatus( | ||
| showSuccessStatus = false, | ||
| showErrorStatus = false | ||
| ), | ||
| makeTransfer = { _, _ -> } | ||
| ) | ||
| } |
There was a problem hiding this comment.
you can use preview parameters
| .width(100.dp) | ||
| .height(50.dp) | ||
| ) { | ||
| Text(text = "Confirm") |
| .width(100.dp) | ||
| .height(50.dp) | ||
| ) { | ||
| Text(text = "Cancel") |
mifospay/src/main/java/org/mifospay/common/presenter/MakeTransferViewModel.kt
Outdated
Show resolved
Hide resolved
…o MakeTransferFragment_Migration
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue Fix
Fixes #1629
Screenshots
before migration:
after migration:
Description
Apply the
AndroidStyle.xmlstyle template to your code in Android Studio.Run the unit tests with
./gradlew checkto make sure you didn't break anythingIf you have multiple commits please combine them into one commit by squashing them.