feat: Migrate LoginScreen and ProxySettings to Compose in purchasetester module #3025
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
…odule Migrate ConfigureScreen to Jetpack Compose - Add Compose theme system (Color, Type, Theme) - Create ConfigureActivity as Compose entry point - Add Compose dependencies to build config - Add test cases for ConfigureScreenViewModel
Refactor ConfigureScreenViewModelImpl to use a reactive flow-based approach: - Remove init block and loadData() method to eliminate side effects - Transform _state from MutableStateFlow to derived StateFlow using combine() - Add userEdits flow to track user modifications before persistence - Use SharingStarted.WhileSubscribed() for lazy, lifecycle-aware data loading - Extract subscription timeout as SUBSCRIPTION_TIMEOUT_MILLIS constant Benefits: - No side effects in constructor/init - Data loads only when UI observes the state - Better testability and lifecycle awareness - Automatic cleanup when no observers - Follows modern Android ViewModel best practices All existing tests pass without modifications.
…ecture Migrate LoginFragment to a fully Compose-based LoginScreen with type-safe navigation architecture, following the patterns established in ConfigureScreen. ## LoginScreen Implementation Created new Compose-based login screen with: - LoginScreenState: Sealed class for state management with Loading and Data states - LoginScreenViewModel: Reactive ViewModel using StateFlow with user edits pattern - LoginScreen: Composable UI matching original fragment_login.xml layout exactly - LoginScreenViewModelTest: Comprehensive unit tests (7 tests, all passing) Key features: - User ID input with automatic trimming - Login with user ID using Purchases.logInWith() - Continue as random user (handles both anonymous and logged-in states) - Reset SDK functionality with Purchases.close() - Type-safe event system for navigation and error handling - String resources for all UI text (localization-ready) ## Navigation Architecture Created type-safe Compose navigation: - PurchaseTesterScreen: Sealed class defining all navigation routes - PurchaseTesterNavHost: NavHost with hybrid Compose + Fragment navigation - Smooth transitions between Configure and Login screens - Proper back stack management with popUpTo configurations Navigation flows: - Configure → Login: Pure Compose navigation within ConfigureActivity - Login → Overview: Intent to MainActivity (Fragment-based, until migrated) - Login → Configure: Compose navigation with full stack clear - Logs/Proxy: Fallback to Fragment navigation (until migrated) ## Cleanup and Updates Deleted obsolete files: - LoginFragment.kt (2,768 bytes) - fragment_login.xml (4,217 bytes) Updated existing files: - ConfigureActivity: Now uses PurchaseTesterApp with NavHost - MainActivity: Removed LOGIN navigation case (handled by Compose) - OverviewFragment: Logout navigates to ConfigureActivity instead of LoginFragment - nav_graph.xml: Removed all LoginFragment references, changed startDestination - Constants.kt: Removed unused LOGIN constant ## Architecture Benefits - Type-safe navigation with sealed classes (compile-time safety) - Hybrid navigation allowing gradual migration of remaining screens - Pattern consistency across all Compose screens - Better testability with interface-based ViewModels - Modern reactive state management - Clean separation between Compose and Fragment screens ## Testing - All unit tests passing (7/7) - Build successful - Feature parity with original LoginFragment verified - Navigation flows tested and working correctly This migration establishes the navigation architecture pattern for remaining screen migrations and demonstrates best practices for Compose + Fragment hybrid navigation during incremental migration.
Implement new Compose-native ProxySettings bottom sheet to replace Fragment-based implementation for ConfigureScreen and
LoginScreen.
Changes:
- Add ProxySettingsViewModel with StateFlow and coroutines
- Add ProxySettingsSheet using Material3 ModalBottomSheet
- Update PurchaseTesterNavHost to show sheet as modal overlay
- Add comprehensive unit tests for ProxySettingsViewModel
- Improve error messages with exception class name for debugging
The old Fragment-based implementation remains untouched and continues to be used by OverviewFragment. It will be removed when
OverviewScreen is migrated to Compose in a future PR.
Technical details:
- Uses StateFlow instead of LiveData for reactive state management
- Coroutines with injectable dispatcher for testability
- No init block - explicit loadCurrentState() method
- Inline updateState function matching ConfigureScreenViewModel pattern
- Unit tests covering all state transitions
nimi0112
force-pushed
the
feature/compose-migrate-login-screen
branch
from
7255de6 to
60a222e
Compare
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Continue Compose migration: LoginScreen and ProxySettings (Part 2 of ConfigureScreen work)
1st PR: #2991
Checklist
purchases-iosand hybridsMotivation
Migrates LoginScreen and ProxySettings from Fragment-based UI to Jetpack Compose
Description
LoginScreen Migration:
LoginScreen.ktwith Material3 componentsLoginScreenViewModelusing StateFlow and coroutinesProxySettings Migration:
ProxySettingsSheet.ktas Material3 ModalBottomSheetProxySettingsViewModelwith StateFlow and injectable dispatcherImplementation Notes:
ui/screens/, Fragments in root packagesProxySettingsStateandProxyModeoutput.mp4
I could not fully test the proxy settings because I did not had a valid proxy. The implementation was verified with the available resources since the ViewModel and methods are unchanged. Any resources for end-to-end proxy testing would be appreciated.