cilly/Banksia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: split up room into a module, and move client module

Browse source
This commit is contained in:
Cilly Leang 2026-04-01 22:48:04 +11:00
parent c55e3a3232
commit 104a77b27e
Signed by: cilly
GPG key ID: 6500251E087653C9
60 changed files with 220 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ui/build.gradle.kts
View file

@ -67,8 +67,8 @@ kotlin {
implementation(libs.moko.geo.compose)
implementation(libs.ui.backhandler)
implementation(projects.client)
implementation(projects.shared)
implementation(projects.shared.data)
implementation(projects.ui.maps)
implementation(projects.ui.shared)
}

4
ui/src/commonMain/kotlin/moe/lava/banksia/ui/App.kt
View file

@ -3,7 +3,7 @@ package moe.lava.banksia.ui
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.ui.ExperimentalComposeUiApi
import moe.lava.banksia.di.CommonModules
import moe.lava.banksia.di.coreDiModule
import moe.lava.banksia.ui.di.AppModule
import moe.lava.banksia.ui.screens.map.MapScreen
import org.koin.compose.KoinMultiplatformApplication
@ -14,7 +14,7 @@ import org.koin.dsl.koinConfiguration
@Composable
fun App() {
KoinMultiplatformApplication(config = koinConfiguration {
modules(CommonModules, AppModule)
modules(coreDiModule, AppModule)
}) {
MapScreen()
}

5
ui/src/commonMain/kotlin/moe/lava/banksia/ui/di/AppModule.kt
View file

@ -1,12 +1,13 @@
package moe.lava.banksia.ui.di
import moe.lava.banksia.client.di.ClientModule
import moe.lava.banksia.core.data.dataDiModule
import moe.lava.banksia.ui.screens.map.MapScreenViewModel
import org.koin.core.module.dsl.viewModelOf
import org.koin.dsl.module
val AppModule = module {
includes(ClientModule)
includes(dataDiModule)
// ViewModel
viewModelOf(::MapScreenViewModel)
}

6
ui/src/commonMain/kotlin/moe/lava/banksia/ui/screens/map/MapScreenViewModel.kt
View file

@ -15,9 +15,9 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toInstant
import moe.lava.banksia.client.repository.RouteRepository
import moe.lava.banksia.client.repository.StopRepository
import moe.lava.banksia.client.repository.StopTimeRepository
import moe.lava.banksia.core.data.repositories.RouteRepository
import moe.lava.banksia.core.data.repositories.StopRepository
import moe.lava.banksia.core.data.repositories.StopTimeRepository
import moe.lava.banksia.data.ptv.PtvService
import moe.lava.banksia.model.Route
import moe.lava.banksia.model.RouteType