Produce VMs by koinViewModel - #325
Merged
Merged
Conversation
…rovidersViewModel to ViewModel using Koin
This reverts commit 6ba3fcd.
There was a problem hiding this comment.
Pull request overview
This PR migrates UI ViewModel creation from androidx.lifecycle.viewmodel.compose.viewModel() / AndroidViewModel to Koin’s koinViewModel() + ViewModel, and introduces feature-level Koin modules wired from MainApplication, aligning with the Compose Multiplatform direction in #233.
Changes:
- Replace
AndroidViewModelsubclasses with plainViewModeland injectApplicationvia constructor where needed. - Switch Compose screens to obtain ViewModels via
org.koin.compose.viewmodel.koinViewModel. - Add Koin modules per feature (
home/profile/settings/proxy/log/crash) and register them inMainApplication; centralize Koin dependencies viacommonand root Compose dependency wiring.
Reviewed changes
Copilot reviewed 43 out of 44 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/vm/OverrideSettingsViewModel.kt | Convert to ViewModel (note: currently injects unused Application). |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/vm/NetworkSettingsViewModel.kt | Convert to ViewModel and use injected Application for stores. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/vm/MetaFeatureSettingsViewModel.kt | Convert to ViewModel, replace stored context usage with injected Application. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/vm/AppSettingsViewModel.kt | Convert to ViewModel and update Application usages. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/vm/AccessControlViewModel.kt | Convert to ViewModel, replace context/service calls with injected Application. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/ui/OverrideSettingsScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/ui/NetworkSettingsScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/ui/MetaFeatureSettingsScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/ui/AppSettingsScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/ui/AccessControlScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/settings/src/main/kotlin/com/github/kr328/clash/settings/di/SettingsModule.kt | New Koin module registering settings ViewModels. |
| ui/settings/build.gradle.kts | Remove per-module Koin dependencies (now provided via common/root). |
| ui/proxy/src/main/kotlin/com/github/kr328/clash/proxy/vm/ProxyViewModel.kt | Convert to ViewModel and inject Application. |
| ui/proxy/src/main/kotlin/com/github/kr328/clash/proxy/ui/ProxyScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/proxy/src/main/kotlin/com/github/kr328/clash/proxy/di/ProxyModule.kt | New Koin module registering proxy ViewModel. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/vm/ProvidersViewModel.kt | Convert to ViewModel and inject Application. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/vm/PropertiesViewModel.kt | Convert to ViewModel and inject Application. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/vm/ProfilesViewModel.kt | Convert to ViewModel and inject Application. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/vm/NewProfileViewModel.kt | Convert to ViewModel and inject Application. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/vm/FilesViewModel.kt | Convert to ViewModel and inject Application. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/ui/ProvidersScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/ui/PropertiesScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/ui/ProfilesScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/ui/NewProfileScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/ui/FilesScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/profile/src/main/kotlin/com/github/kr328/clash/profile/di/ProfileModule.kt | New Koin module registering profile ViewModels. |
| ui/log/src/main/kotlin/com/github/kr328/clash/log/vm/LogsViewModel.kt | Convert to ViewModel and inject Application. |
| ui/log/src/main/kotlin/com/github/kr328/clash/log/vm/LogcatViewModel.kt | Convert to ViewModel and inject Application. |
| ui/log/src/main/kotlin/com/github/kr328/clash/log/ui/LogsScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/log/src/main/kotlin/com/github/kr328/clash/log/ui/LogcatScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/log/src/main/kotlin/com/github/kr328/clash/log/di/LogModule.kt | New Koin module registering log ViewModels. |
| ui/home/src/main/kotlin/com/github/kr328/clash/home/vm/HelpViewModel.kt | Convert to ViewModel and inject Application. |
| ui/home/src/main/kotlin/com/github/kr328/clash/home/ui/HelpScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/home/src/main/kotlin/com/github/kr328/clash/home/di/HomeModule.kt | Move to .di package and register HelpViewModel in Koin module. |
| ui/home/build.gradle.kts | Remove per-module Koin dependencies (now provided via common/root). |
| ui/crash/src/main/kotlin/com/github/kr328/clash/crash/vm/AppCrashedViewModel.kt | Convert to ViewModel and inject Application. |
| ui/crash/src/main/kotlin/com/github/kr328/clash/crash/ui/AppCrashedScreen.kt | Swap viewModel() for koinViewModel() when obtaining VM. |
| ui/crash/src/main/kotlin/com/github/kr328/clash/crash/di/CrashModule.kt | New Koin module registering crash ViewModel. |
| service/build.gradle.kts | Remove per-module Koin dependencies (now provided via common). |
| common/build.gradle.kts | Promote Koin BOM + core to api so downstream modules inherit versions/APIs. |
| build.gradle.kts | Add koin-compose-viewmodel to all Compose-enabled modules. |
| app/src/main/kotlin/com/github/kr328/clash/app/MainApplication.kt | Register newly added feature Koin modules during startKoin. |
| app/build.gradle.kts | Remove explicit Koin BOM dependency (version now comes transitively). |
💡 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.
Refs #233.