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

refactor: shared -> core

Browse source
This commit is contained in:
Cilly Leang 2026-04-02 01:57:08 +11:00
parent 104a77b27e
commit c912723c78
Signed by: cilly
GPG key ID: 6500251E087653C9
112 changed files with 133 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ui/build.gradle.kts
View file

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

2
ui/maps/build.gradle.kts
View file

@ -49,7 +49,7 @@ kotlin {
implementation(libs.compose.material3)
implementation(libs.compose.ui)
implementation(projects.shared)
implementation(projects.core)
implementation(projects.ui.shared)
}
}

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapLibreMaps.kt
View file

@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import kotlinx.serialization.json.JsonObject
import moe.lava.banksia.Constants
import moe.lava.banksia.core.Constants
import moe.lava.banksia.ui.map.mappers.routeColorExpression
import moe.lava.banksia.ui.platform.BanksiaTheme
import org.maplibre.compose.camera.CameraPosition

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/Maps.kt
View file

@ -4,11 +4,11 @@ import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import moe.lava.banksia.core.util.Point
import moe.lava.banksia.ui.map.mappers.asFeatures
import moe.lava.banksia.ui.map.mappers.toPosition
import moe.lava.banksia.ui.map.util.Marker
import moe.lava.banksia.ui.platform.BanksiaTheme
import moe.lava.banksia.util.Point
internal val MELBOURNE = Point(-37.8136, 144.9631)
internal val MELBOURNE_POS = MELBOURNE.toPosition()

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapsPositionState.kt
View file

@ -7,7 +7,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.launch
import moe.lava.banksia.util.Point
import moe.lava.banksia.core.util.Point
class MapsPositionState internal constructor(
private val scope: CoroutineScope

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Marker.kt
View file

@ -1,7 +1,7 @@
package moe.lava.banksia.ui.map.mappers
import kotlinx.serialization.Serializable
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.ui.map.util.Marker
import org.maplibre.compose.sources.GeoJsonData
import org.maplibre.spatialk.geojson.FeatureCollection

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Position.kt
View file

@ -1,6 +1,6 @@
package moe.lava.banksia.ui.map.mappers
import moe.lava.banksia.util.Point
import moe.lava.banksia.core.util.Point
import org.maplibre.spatialk.geojson.Position
internal fun Point.toPosition() = Position(lng, lat)

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/RouteType.kt
View file

@ -1,7 +1,7 @@
package moe.lava.banksia.ui.map.mappers
import androidx.compose.runtime.Composable
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.ui.extensions.getUIProperties
import moe.lava.banksia.ui.platform.BanksiaTheme
import org.maplibre.compose.expressions.dsl.case

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPosition.kt
View file

@ -1,6 +1,6 @@
package moe.lava.banksia.ui.map.util
import moe.lava.banksia.util.Point
import moe.lava.banksia.core.util.Point
data class CameraPosition(
val centre: Point = Point(-37.8136, 144.9631),

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPositionBounds.kt
View file

@ -1,5 +1,5 @@
package moe.lava.banksia.ui.map.util
import moe.lava.banksia.util.Point
import moe.lava.banksia.core.util.Point
data class CameraPositionBounds(val northeast: Point, val southwest: Point)

4
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Marker.kt
View file

@ -1,8 +1,8 @@
package moe.lava.banksia.ui.map.util
import kotlinx.serialization.Serializable
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.util.Point
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.core.util.Point
@Serializable
sealed class Marker {

2
ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Polyline.kt
View file

@ -1,6 +1,6 @@
package moe.lava.banksia.ui.map.util
import androidx.compose.ui.graphics.Color
import moe.lava.banksia.util.Point
import moe.lava.banksia.core.util.Point
data class Polyline(val points: List<Point>, val colour: Color)

2
ui/shared/build.gradle.kts
View file

@ -35,7 +35,7 @@ kotlin {
implementation(libs.compose.ui)
implementation(libs.compose.ui.tooling.preview)
implementation(projects.shared)
implementation(projects.core)
}
}
}

8
ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/components/RouteIcon.kt
View file

@ -11,10 +11,10 @@ import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.model.RouteType.MetroBus
import moe.lava.banksia.model.RouteType.MetroTrain
import moe.lava.banksia.model.RouteType.MetroTram
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.core.model.RouteType.MetroBus
import moe.lava.banksia.core.model.RouteType.MetroTrain
import moe.lava.banksia.core.model.RouteType.MetroTram
import moe.lava.banksia.ui.extensions.getUIProperties
import org.jetbrains.compose.resources.painterResource

2
ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/extensions/RouteType.kt
View file

@ -1,8 +1,8 @@
package moe.lava.banksia.ui.extensions
import androidx.compose.ui.graphics.Color
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.data.ptv.structures.PtvRouteType
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.resources.Res
import moe.lava.banksia.resources.bus
import moe.lava.banksia.resources.bus_background

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

@ -3,7 +3,6 @@ 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.coreDiModule
import moe.lava.banksia.ui.di.AppModule
import moe.lava.banksia.ui.screens.map.MapScreen
import org.koin.compose.KoinMultiplatformApplication
@ -14,7 +13,7 @@ import org.koin.dsl.koinConfiguration
@Composable
fun App() {
KoinMultiplatformApplication(config = koinConfiguration {
modules(coreDiModule, AppModule)
modules(AppModule)
}) {
MapScreen()
}

2
ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/RouteInfoPanel.kt
View file

@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.ui.components.RouteIcon
sealed class RouteInfoPanelEvent : InfoPanelEvent()

2
ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/TripInfoPanel.kt
View file

@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.ui.components.RouteIcon
sealed class TripInfoPanelEvent : InfoPanelEvent()

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

@ -18,9 +18,14 @@ import kotlinx.datetime.toInstant
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.core.model.Route
import moe.lava.banksia.core.model.RouteType
import moe.lava.banksia.core.util.BoxedValue
import moe.lava.banksia.core.util.BoxedValue.Companion.box
import moe.lava.banksia.core.util.LoopFlow.Companion.waitUntilSubscribed
import moe.lava.banksia.core.util.Point
import moe.lava.banksia.core.util.log
import moe.lava.banksia.data.ptv.PtvService
import moe.lava.banksia.model.Route
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.ui.layout.info.InfoPanelEvent
import moe.lava.banksia.ui.layout.info.InfoPanelState
import moe.lava.banksia.ui.layout.info.RouteInfoPanelState
@ -31,11 +36,6 @@ import moe.lava.banksia.ui.map.util.CameraPositionBounds
import moe.lava.banksia.ui.map.util.Marker
import moe.lava.banksia.ui.state.MapState
import moe.lava.banksia.ui.state.SearchState
import moe.lava.banksia.util.BoxedValue
import moe.lava.banksia.util.BoxedValue.Companion.box
import moe.lava.banksia.util.LoopFlow.Companion.waitUntilSubscribed
import moe.lava.banksia.util.Point
import moe.lava.banksia.util.log
import kotlin.time.Clock
import kotlin.time.Duration.Companion.minutes

2
ui/src/commonMain/kotlin/moe/lava/banksia/ui/state/SearchState.kt
View file

@ -1,6 +1,6 @@
package moe.lava.banksia.ui.state
import moe.lava.banksia.model.RouteType
import moe.lava.banksia.core.model.RouteType
data class SearchState(
val entries: List<SearchEntry> = listOf(),