ppn/wgtunnel-android
3
0
Fork 0
mirror of https://github.com/wgtunnel/android.git synced 2026-06-02 00:29:08 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: koin refactor param bug

Browse Source
This commit is contained in:
Zane Schepke
2025-12-25 12:47:25 -05:00
parent 0cf39fed68
commit 0bf52ad378
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
+21 -20
View File
@@ -123,6 +123,7 @@ import de.raphaelebner.roomdatabasebackup.core.RoomBackup
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import org.koin.android.ext.android.inject
import org.koin.androidx.compose.koinViewModel
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import xyz.teamgravity.pin_lock_compose.PinManager
@@ -432,24 +433,24 @@ class MainActivity : AppCompatActivity() {
entry<Route.Tunnels> { TunnelsScreen() }
entry<Route.Sort> { SortScreen() }
entry<Route.TunnelSettings> { key ->
val viewModel by
viewModel<TunnelViewModel> {
parametersOf(key.id)
}
val viewModel: TunnelViewModel =
koinViewModel(
parameters = { parametersOf(key.id) }
)
TunnelSettingsScreen(viewModel)
}
entry<Route.SplitTunnel> { key ->
val viewModel by
viewModel<SplitTunnelViewModel> {
parametersOf(key.id)
}
val viewModel: SplitTunnelViewModel =
koinViewModel(
parameters = { parametersOf(key.id) }
)
SplitTunnelScreen(viewModel)
}
entry<Route.Config> { key ->
val viewModel by
viewModel<ConfigViewModel> {
parametersOf(key.id)
}
val viewModel: ConfigViewModel =
koinViewModel(
parameters = { parametersOf(key.id) }
)
ConfigScreen(viewModel)
}
entry<Route.LocationDisclosure> {
@@ -474,17 +475,17 @@ class MainActivity : AppCompatActivity() {
}
entry<Route.Dns> { DnsSettingsScreen() }
entry<Route.ConfigGlobal> { key ->
val viewModel by
viewModel<ConfigViewModel> {
parametersOf(key.id)
}
val viewModel: ConfigViewModel =
koinViewModel(
parameters = { parametersOf(key.id) }
)
ConfigScreen(viewModel)
}
entry<Route.SplitTunnelGlobal> { key ->
val viewModel by
viewModel<SplitTunnelViewModel> {
parametersOf(key.id)
}
val viewModel: SplitTunnelViewModel =
koinViewModel(
parameters = { parametersOf(key.id) }
)
SplitTunnelScreen(viewModel)
}
entry<Route.LockdownSettings> {
app/src/main/java/com/zaneschepke/wireguardautotunnel/di/AppModule.kt
+3 -3
View File
@@ -76,7 +76,7 @@ val appModule = module {
single { NetworkUtils(get(named(Dispatcher.IO))) }
viewModelOf(::AutoTunnelViewModel)
viewModelOf(::ConfigViewModel)
viewModel { (id: Int) -> ConfigViewModel(get(), get(), get(), id) }
viewModelOf(::DnsViewModel)
viewModelOf(::LicenseViewModel)
viewModelOf(::LockdownViewModel)
@@ -85,7 +85,7 @@ val appModule = module {
viewModelOf(::ProxySettingsViewModel)
viewModelOf(::SettingsViewModel)
viewModelOf(::SharedAppViewModel)
viewModelOf(::SplitTunnelViewModel)
viewModel { (id: Int) -> SplitTunnelViewModel(get(), get(), get(), id) }
viewModel { SupportViewModel(get(), get(named(Dispatcher.MAIN)), get()) }
viewModelOf(::TunnelViewModel)
viewModel { (id: Int) -> TunnelViewModel(get(), get(), id) }
}