-
Notifications
You must be signed in to change notification settings - Fork 191
Support DSU update. #260
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
dingdang66686
wants to merge
1
commit into
VegaBobo:master
Choose a base branch
from
dingdang66686:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Support DSU update. #260
Changes from all commits
Commits
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
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
97 changes: 97 additions & 0 deletions
97
...main/java/vegabobo/dsusideloader/ui/cards/installation/content/DsuInstalledCardContent.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,97 @@ | ||||||
| package vegabobo.dsusideloader.ui.cards.installation.content | ||||||
|
|
||||||
| import androidx.compose.animation.AnimatedVisibility | ||||||
| import androidx.compose.foundation.interaction.MutableInteractionSource | ||||||
| import androidx.compose.foundation.layout.Column | ||||||
| import androidx.compose.foundation.layout.Row | ||||||
| import androidx.compose.foundation.layout.Spacer | ||||||
| import androidx.compose.foundation.layout.fillMaxWidth | ||||||
| import androidx.compose.foundation.layout.padding | ||||||
| import androidx.compose.material3.MaterialTheme | ||||||
| import androidx.compose.material3.Text | ||||||
| import androidx.compose.runtime.Composable | ||||||
| import androidx.compose.ui.Alignment | ||||||
| import androidx.compose.ui.Modifier | ||||||
| import androidx.compose.ui.res.stringResource | ||||||
| import androidx.compose.ui.unit.dp | ||||||
| import vegabobo.dsusideloader.R | ||||||
| import vegabobo.dsusideloader.ui.components.FileSelectionBox | ||||||
| import vegabobo.dsusideloader.ui.components.buttons.ErrorButton | ||||||
| import vegabobo.dsusideloader.ui.components.buttons.PrimaryButton | ||||||
| import vegabobo.dsusideloader.ui.components.buttons.SecondaryButton | ||||||
| import vegabobo.dsusideloader.ui.screen.home.InstallationCardState | ||||||
|
|
||||||
| @Composable | ||||||
| fun DsuInstalledCardContent( | ||||||
| textFieldInteraction: MutableInteractionSource, | ||||||
| uiState: InstallationCardState, | ||||||
| onClickClear: () -> Unit, | ||||||
| onClickInstall: () -> Unit, | ||||||
| onClickRebootToDynOS: () -> Unit, | ||||||
| onClickDiscardDsu: () -> Unit, | ||||||
| ) { | ||||||
| // Message indicating DSU is already installed | ||||||
| Text( | ||||||
| text = stringResource(R.string.dsu_already_installed), | ||||||
| style = MaterialTheme.typography.bodyLarge, | ||||||
| color = MaterialTheme.colorScheme.primary, | ||||||
| modifier = Modifier.padding(bottom = 8.dp), | ||||||
| ) | ||||||
|
|
||||||
| // File selection box (same as NotInstallingCardContent) | ||||||
| FileSelectionBox( | ||||||
| textFieldInteraction = textFieldInteraction, | ||||||
| isEnabled = uiState.isTextFieldEnabled, | ||||||
| isError = uiState.isError, | ||||||
| isReadOnly = true, | ||||||
| textFieldValue = uiState.text, | ||||||
| textFieldTitle = stringResource(id = R.string.select_gsi_info), | ||||||
| ) | ||||||
| Spacer(modifier = Modifier.padding(top = 10.dp)) | ||||||
|
|
||||||
| // Install/Clear buttons row | ||||||
| Row( | ||||||
| verticalAlignment = Alignment.CenterVertically, | ||||||
| modifier = Modifier.fillMaxWidth(), | ||||||
| ) { | ||||||
| AnimatedVisibility(visible = uiState.isError) { | ||||||
| Text( | ||||||
| text = stringResource(id = R.string.file_unsupported), | ||||||
| modifier = Modifier.padding(start = 2.dp), | ||||||
| color = MaterialTheme.colorScheme.error, | ||||||
| ) | ||||||
| } | ||||||
| Spacer(modifier = Modifier.weight(1F)) | ||||||
| if (uiState.isInstallable) { | ||||||
| SecondaryButton( | ||||||
| text = stringResource(R.string.clear), | ||||||
| onClick = onClickClear, | ||||||
| ) | ||||||
| Spacer(modifier = Modifier.padding(end = 6.dp)) | ||||||
| } | ||||||
| PrimaryButton( | ||||||
| text = stringResource(R.string.install), | ||||||
|
||||||
| text = stringResource(R.string.install), | |
| text = stringResource(R.string.update), |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When DSU is installed and preserve userdata is disabled (preserveSelected = false), the userdata size input field is shown. However, the isSelected property of userDataCard is not being considered. In the normal flow (when DSU is not installed), users must explicitly enable the userdata size option via a toggle before they can input a size. This inconsistency could lead to confusion. Consider whether the isSelected check should also apply to the preserve userdata scenario, or if the current behavior is intentional for updating scenarios.