-
Notifications
You must be signed in to change notification settings - Fork 74
Migrate MedicalHistoryDiagnosisWithTreatment to jetpack compose
#5593
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7ae02bb
Extract `MedicalHistoryAnswerChip` to separate file
a2b1f62
Add `MedicalHistoryDiagnosisWithTreatment`
dc4c6f1
Use MedicalHistoryDiagnosisWithTreatment in screen
92579c9
Remove deprecated code
70ac1e4
Fix spacing
4ae1dd3
Reset treatment question when not visible
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
123 changes: 0 additions & 123 deletions
123
app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistoryDiagnosisWithTreatment.kt
This file was deleted.
Oops, something went wrong.
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
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
80 changes: 80 additions & 0 deletions
80
app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryAnswerChip.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,80 @@ | ||
| package org.simple.clinic.medicalhistory.ui | ||
|
|
||
| import androidx.compose.animation.animateColorAsState | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material.ChipDefaults | ||
| import androidx.compose.material.ExperimentalMaterialApi | ||
| import androidx.compose.material.FilterChip | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.dimensionResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import org.simple.clinic.R | ||
| import org.simple.clinic.medicalhistory.Answer | ||
|
|
||
| @Composable | ||
| fun AnswerChipsGroup( | ||
| modifier: Modifier = Modifier, | ||
| selectedAnswer: Answer?, | ||
| onSelectionChange: (Answer) -> Unit | ||
| ) { | ||
| Row( | ||
| modifier = modifier, | ||
| horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing_8)), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| MedicalHistoryAnswerChip( | ||
| label = stringResource(R.string.newmedicalhistory_yes), | ||
| selected = selectedAnswer == Answer.Yes, | ||
| onSelectionChange = { | ||
| onSelectionChange(Answer.Yes) | ||
| } | ||
| ) | ||
|
|
||
| MedicalHistoryAnswerChip( | ||
| label = stringResource(R.string.newmedicalhistory_no), | ||
| selected = selectedAnswer == Answer.No, | ||
| onSelectionChange = { | ||
| onSelectionChange(Answer.No) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @OptIn(ExperimentalMaterialApi::class) | ||
| @Composable | ||
| fun MedicalHistoryAnswerChip( | ||
| label: String, | ||
| selected: Boolean, | ||
| onSelectionChange: () -> Unit | ||
| ) { | ||
| val backgroundColor by animateColorAsState( | ||
| if (selected) MaterialTheme.colors.primary else MaterialTheme.colors.primaryVariant | ||
| ) | ||
| val textColor by animateColorAsState( | ||
| if (selected) MaterialTheme.colors.onPrimary else MaterialTheme.colors.primary | ||
| ) | ||
|
|
||
| FilterChip( | ||
| selected = selected, | ||
| colors = ChipDefaults.filterChipColors( | ||
| backgroundColor = backgroundColor, | ||
| ), | ||
| onClick = onSelectionChange, | ||
| ) { | ||
| Text( | ||
| modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.spacing_12)), | ||
| text = label, | ||
| style = MaterialTheme.typography.body2, | ||
| color = textColor, | ||
| textAlign = TextAlign.Center, | ||
| ) | ||
| } | ||
| } | ||
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.