Migrate ReflexGame UI to Compose and StateFlow#18
Merged
Conversation
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.
Summary
This PR migrates the app from XML/View-based UI to Jetpack Compose, moves UI state observation from LiveData to Flow/StateFlow, and aligns theming/state structure with Compose-first practices while preserving the existing look/behavior.
High-level changes
MainScreen.kt(grid, HUD, button, and game-over title).MainScreenRoute(viewModel)that collects state withcollectAsStateWithLifecycle, while keepingMainScreen(...)stateless and previewable.@Previewfor the main screen.MainUiStatetoMainScreenStatefor naming consistency.SquareStateinto the new UI state file and removed oldui/modelstate files.MainViewModelfromLiveDatatoMutableStateFlow/StateFlow._uiState.value = _uiState.value.copy(...)updates.onSquareTouchedacross the codebase.DateUtils.formatElapsedTime(...)theme/Color.kttheme/Theme.kttheme/Spacing.kttheme/Type.ktactivity_main.xmlanditem_square.xmlcolors.xmlanddimens.xmlthemes.xmlfor Compose usage (kept app theme + status bar color only).Event,EventObserver) and old adapter (SquaresAdapter).buildFeatures.compose = truekotlinentry to the version catalog and referenced it from the Compose plugin2.3.10MainViewModelFactoryto validatemodelClassbefore casting.Validation
./gradlew :app:assembleDebug./gradlew :app:lintDebugBoth pass locally.