Unify MihomoScaffold for all screens#159
Merged
Merged
Conversation
Goooler
force-pushed
the
unify-scaffold
branch
2 times, most recently
from
1e373b5 to
d1e39ab
Compare
There was a problem hiding this comment.
Pull request overview
This PR standardizes screen layout by routing snackbar presentation and top app bar customization through MihomoScaffold, removing per-screen Box + SnackbarHost overlays and aligning screens on a single scaffold pattern.
Changes:
- Extend
MihomoScaffoldwithtopBarandsnackbarHostStatesupport (with a defaultSnackbarHostwhen a state is provided). - Update multiple screens to pass
SnackbarHostStateintoMihomoScaffold/SettingsCommonScreeninstead of renderingSnackbarHostmanually. - Minor cleanup/reordering (e.g., annotation order in editable text screens, removal of now-unneeded imports/wrappers).
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| app/src/main/kotlin/com/github/kr328/clash/ui/component/SettingsCommonScreen.kt | Switch from snackbarHost slot to snackbarHostState passthrough into MihomoScaffold. |
| app/src/main/kotlin/com/github/kr328/clash/ui/component/MihomoScaffold.kt | Add topBar slot + snackbarHostState and provide a default SnackbarHost implementation. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/NetworkSettingsScreen.kt | Use snackbarHostState on SettingsCommonScreen instead of an inline SnackbarHost. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/EditableTextMapScreen.kt | Minor annotation ordering cleanup around @OptIn / @Composable. |
| app/src/main/kotlin/com/github/kr328/clash/settings/ui/EditableTextListScreen.kt | Minor annotation ordering cleanup around @OptIn / @Composable. |
| app/src/main/kotlin/com/github/kr328/clash/profile/ui/ProvidersScreen.kt | Remove Box + SnackbarHost; pass snackbarHostState into MihomoScaffold. |
| app/src/main/kotlin/com/github/kr328/clash/profile/ui/ProfilesScreen.kt | Remove Box + SnackbarHost; pass snackbarHostState into MihomoScaffold. |
| app/src/main/kotlin/com/github/kr328/clash/profile/ui/NewProfileScreen.kt | Remove Box + SnackbarHost; pass snackbarHostState into MihomoScaffold. |
| app/src/main/kotlin/com/github/kr328/clash/main/ui/MainScreen.kt | Wrap main content in MihomoScaffold (no top bar) and use scaffold padding for insets/snackbars. |
| app/src/main/kotlin/com/github/kr328/clash/log/ui/LogcatScreen.kt | Replace custom snackbar host slot with snackbarHostState passed into MihomoScaffold. |
| app/src/main/kotlin/com/github/kr328/clash/crash/ui/AppCrashedScreen.kt | Remove now-unnecessary opt-in on the top-level screen function (kept where needed). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 16 out of 16 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 16 out of 16 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
No description provided.