From c912723c78921df9da8dd83e946dc206cbfc43c3 Mon Sep 17 00:00:00 2001 From: Cilly Leang Date: Thu, 2 Apr 2026 01:57:08 +1100 Subject: [PATCH] refactor: shared -> core --- .gitignore | 2 +- {shared => core}/build.gradle.kts | 2 +- {shared => core}/data/build.gradle.kts | 4 ++-- .../lava/banksia/core/data/DataDiModule.kt | 4 ++-- .../core/data/repositories/RouteRepository.kt | 0 .../core/data/repositories/StopRepository.kt | 0 .../data/repositories/StopTimeRepository.kt | 2 +- .../sources/route/RouteLocalDataSource.kt | 2 +- .../sources/route/RouteRemoteDataSource.kt | 2 +- .../data/sources/stop/StopLocalDataSource.kt | 2 +- .../data/sources/stop/StopRemoteDataSource.kt | 2 +- .../stoptime/StopTimeLocalDataSource.kt | 6 +++--- .../stoptime/StopTimeRemoteDataSource.kt | 2 +- .../data/sources/trip/TripRemoteDataSource.kt | 2 +- {shared => core}/room/build.gradle.kts | 2 +- .../1.json | 0 .../10.json | 0 .../11.json | 0 .../2.json | 0 .../3.json | 0 .../4.json | 0 .../5.json | 0 .../6.json | 0 .../7.json | 0 .../8.json | 0 .../9.json | 0 .../banksia/core/room/RoomDiModule.android.kt | 0 .../moe/lava/banksia/core/room/Database.kt | 0 .../lava/banksia/core/room/RoomDiModule.kt | 0 .../core/room/converter/RouteTypeConverter.kt | 2 +- .../core/room/converter/ShapePathConverter.kt | 4 ++-- .../lava/banksia/core/room/dao/RouteDao.kt | 0 .../lava/banksia/core/room/dao/ServiceDao.kt | 0 .../core/room/dao/ServiceExceptionDao.kt | 0 .../lava/banksia/core/room/dao/ShapeDao.kt | 0 .../moe/lava/banksia/core/room/dao/StopDao.kt | 0 .../lava/banksia/core/room/dao/StopTimeDao.kt | 0 .../moe/lava/banksia/core/room/dao/TripDao.kt | 0 .../core/room/dao/VersionMetadataDao.kt | 0 .../banksia/core/room/entity/RouteEntity.kt | 4 ++-- .../banksia/core/room/entity/ServiceEntity.kt | 6 +++--- .../room/entity/ServiceExceptionEntity.kt | 2 +- .../banksia/core/room/entity/ShapeEntity.kt | 4 ++-- .../banksia/core/room/entity/StopEntity.kt | 4 ++-- .../core/room/entity/StopTimeEntity.kt | 6 +++--- .../banksia/core/room/entity/TripEntity.kt | 2 +- .../core/room/entity/VersionMetadataEntity.kt | 2 +- .../banksia/core/room/RoomDiModule.ios.kt | 0 .../banksia/core/room/RoomDiModule.jvm.kt | 0 .../banksia/core}/util/Logging.android.kt | 2 +- .../lava/banksia/core}/Constants.kt.skeleton | 0 .../lava/banksia/core}/model/FutureTime.kt | 4 ++-- .../moe/lava/banksia/core}/model/Route.kt | 2 +- .../moe/lava/banksia/core}/model/RouteType.kt | 4 ++-- .../moe/lava/banksia/core}/model/Run.kt | 2 +- .../moe/lava/banksia/core}/model/Service.kt | 2 +- .../banksia/core}/model/ServiceException.kt | 2 +- .../moe/lava/banksia/core}/model/Shape.kt | 4 ++-- .../moe/lava/banksia/core}/model/Stop.kt | 4 ++-- .../moe/lava/banksia/core}/model/StopTime.kt | 2 +- .../lava/banksia/core}/model/StopTimeDated.kt | 2 +- .../moe/lava/banksia/core}/model/Trip.kt | 2 +- .../banksia/core}/model/VersionMetadata.kt | 2 +- .../moe/lava/banksia/core}/util/BoxedValue.kt | 2 +- .../moe/lava/banksia/core}/util/CacheMap.kt | 2 +- .../banksia/core}/util/DayOfWeekExtension.kt | 2 +- .../moe/lava/banksia/core}/util/Logging.kt | 2 +- .../moe/lava/banksia/core}/util/LoopFlow.kt | 2 +- .../moe/lava/banksia/core}/util/Point.kt | 2 +- .../moe/lava/banksia/data/ptv/PtvService.kt | 12 +++++------ .../data/ptv/structures/PtvDeparture.kt | 0 .../data/ptv/structures/PtvDirection.kt | 0 .../banksia/data/ptv/structures/PtvGeopath.kt | 0 .../banksia/data/ptv/structures/PtvRoute.kt | 2 +- .../data/ptv/structures/PtvRouteType.kt | 2 +- .../banksia/data/ptv/structures/PtvRun.kt | 0 .../banksia/data/ptv/structures/PtvStop.kt | 0 .../lava/banksia/core}/util/Logging.ios.kt | 2 +- .../lava/banksia/core}/util/Logging.jvm.kt | 2 +- server/build.gradle.kts | 5 ++--- server/gtfs/build.gradle.kts | 2 +- .../lava/banksia/server/gtfs/GtfsParser.kt | 20 +++++++++---------- .../server/gtfs/structures/GtfsStopTime.kt | 2 +- server/gtfs_rt/build.gradle.kts | 2 +- .../banksia/server/gtfsrt/GtfsrtArchiver.kt | 2 +- .../banksia/server/gtfsrt/GtfsrtService.kt | 6 +++--- .../server/gtfsrt/RealtimeVehiclePositions.kt | 2 +- .../moe/lava/banksia/server/Application.kt | 6 +++--- .../moe/lava/banksia/server/GtfsDataFixer.kt | 2 +- .../moe/lava/banksia/server/GtfsImporter.kt | 14 ++++++------- settings.gradle.kts | 6 +++--- .../moe/lava/banksia/di/CoreDiModule.kt | 5 ----- ui/build.gradle.kts | 4 ++-- ui/maps/build.gradle.kts | 2 +- .../moe/lava/banksia/ui/map/MapLibreMaps.kt | 2 +- .../kotlin/moe/lava/banksia/ui/map/Maps.kt | 2 +- .../lava/banksia/ui/map/MapsPositionState.kt | 2 +- .../moe/lava/banksia/ui/map/mappers/Marker.kt | 2 +- .../lava/banksia/ui/map/mappers/Position.kt | 2 +- .../lava/banksia/ui/map/mappers/RouteType.kt | 2 +- .../banksia/ui/map/util/CameraPosition.kt | 2 +- .../ui/map/util/CameraPositionBounds.kt | 2 +- .../moe/lava/banksia/ui/map/util/Marker.kt | 4 ++-- .../moe/lava/banksia/ui/map/util/Polyline.kt | 2 +- ui/shared/build.gradle.kts | 2 +- .../lava/banksia/ui/components/RouteIcon.kt | 8 ++++---- .../lava/banksia/ui/extensions/RouteType.kt | 2 +- .../kotlin/moe/lava/banksia/ui/App.kt | 3 +-- .../banksia/ui/layout/info/RouteInfoPanel.kt | 2 +- .../banksia/ui/layout/info/TripInfoPanel.kt | 2 +- .../ui/screens/map/MapScreenViewModel.kt | 14 ++++++------- .../moe/lava/banksia/ui/state/SearchState.kt | 2 +- 112 files changed, 133 insertions(+), 140 deletions(-) rename {shared => core}/build.gradle.kts (97%) rename {shared => core}/data/build.gradle.kts (93%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt (96%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/RouteRepository.kt (100%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopRepository.kt (100%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt (91%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt (91%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt (89%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt (92%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt (90%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt (84%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt (95%) rename {shared => core}/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt (91%) rename {shared => core}/room/build.gradle.kts (96%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/1.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/10.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/11.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/2.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/3.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/4.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/5.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/6.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/7.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/8.json (100%) rename {shared => core}/room/schemas/moe.lava.banksia.core.room.Database/9.json (100%) rename {shared => core}/room/src/androidMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.android.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/Database.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt (84%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt (93%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/RouteDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceExceptionDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ShapeDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopTimeDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/TripDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/VersionMetadataDao.kt (100%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt (80%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt (81%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt (92%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt (83%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt (92%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt (89%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt (97%) rename {shared => core}/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt (89%) rename {shared => core}/room/src/iosMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.ios.kt (100%) rename {shared => core}/room/src/jvmMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.jvm.kt (100%) rename {shared/src/androidMain/kotlin/moe/lava/banksia => core/src/androidMain/kotlin/moe/lava/banksia/core}/util/Logging.android.kt (87%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/Constants.kt.skeleton (100%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/FutureTime.kt (94%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/Route.kt (82%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/RouteType.kt (72%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/Run.kt (52%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/Service.kt (87%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/ServiceException.kt (84%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/Shape.kt (67%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/Stop.kt (77%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/StopTime.kt (88%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/StopTimeDated.kt (94%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/Trip.kt (89%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/model/VersionMetadata.kt (79%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/util/BoxedValue.kt (87%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/util/CacheMap.kt (97%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/util/DayOfWeekExtension.kt (96%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/util/Logging.kt (88%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/util/LoopFlow.kt (98%) rename {shared/src/commonMain/kotlin/moe/lava/banksia => core/src/commonMain/kotlin/moe/lava/banksia/core}/util/Point.kt (75%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt (97%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDeparture.kt (100%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDirection.kt (100%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvGeopath.kt (100%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt (94%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt (97%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRun.kt (100%) rename {shared => core}/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvStop.kt (100%) rename {shared/src/iosMain/kotlin/moe/lava/banksia => core/src/iosMain/kotlin/moe/lava/banksia/core}/util/Logging.ios.kt (83%) rename {shared/src/jvmMain/kotlin/moe/lava/banksia => core/src/jvmMain/kotlin/moe/lava/banksia/core}/util/Logging.jvm.kt (86%) delete mode 100644 shared/src/commonMain/kotlin/moe/lava/banksia/di/CoreDiModule.kt diff --git a/.gitignore b/.gitignore index 83f099d..975a370 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,6 @@ captures **/xcshareddata/WorkspaceSettings.xcsettings secrets.properties -shared/src/commonMain/kotlin/moe/lava/banksia/Constants.kt +/core/src/commonMain/kotlin/moe/lava/banksia/core/Constants.kt /data/ /data diff --git a/shared/build.gradle.kts b/core/build.gradle.kts similarity index 97% rename from shared/build.gradle.kts rename to core/build.gradle.kts index b4ed8ad..99f7156 100644 --- a/shared/build.gradle.kts +++ b/core/build.gradle.kts @@ -14,7 +14,7 @@ room { kotlin { android { - namespace = "moe.lava.banksia.shared" + namespace = "moe.lava.banksia.core" compileSdk = libs.versions.android.compileSdk.get().toInt() compilerOptions { diff --git a/shared/data/build.gradle.kts b/core/data/build.gradle.kts similarity index 93% rename from shared/data/build.gradle.kts rename to core/data/build.gradle.kts index 1d4b956..e0fea0c 100644 --- a/shared/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -42,8 +42,8 @@ kotlin { implementation(libs.kotlinx.serialization.json) implementation(libs.kotlinx.serialization.protobuf) - implementation(projects.shared) - implementation(projects.shared.room) + implementation(projects.core) + implementation(projects.core.room) } iosMain.dependencies { implementation(libs.ktor.client.darwin) diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt similarity index 96% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt index 86694cc..6529a92 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt @@ -7,7 +7,7 @@ import io.ktor.client.plugins.defaultRequest import io.ktor.client.plugins.plugin import io.ktor.serialization.kotlinx.json.json import kotlinx.serialization.json.Json -import moe.lava.banksia.Constants +import moe.lava.banksia.core.Constants import moe.lava.banksia.core.data.repositories.RouteRepository import moe.lava.banksia.core.data.repositories.StopRepository import moe.lava.banksia.core.data.repositories.StopTimeRepository @@ -18,8 +18,8 @@ import moe.lava.banksia.core.data.sources.stop.StopRemoteDataSource import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource import moe.lava.banksia.core.room.roomDiModule +import moe.lava.banksia.core.util.log import moe.lava.banksia.data.ptv.PtvService -import moe.lava.banksia.util.log import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/RouteRepository.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/RouteRepository.kt similarity index 100% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/RouteRepository.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/RouteRepository.kt diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopRepository.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopRepository.kt similarity index 100% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopRepository.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopRepository.kt diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt similarity index 91% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt index 50cc66a..34aa570 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt @@ -2,7 +2,7 @@ package moe.lava.banksia.core.data.repositories import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource -import moe.lava.banksia.model.StopTimeDated +import moe.lava.banksia.core.model.StopTimeDated class StopTimeRepository internal constructor( private val local: StopTimeLocalDataSource, diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt similarity index 91% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt index 79d432a..ca267c3 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt @@ -1,8 +1,8 @@ package moe.lava.banksia.core.data.sources.route +import moe.lava.banksia.core.model.Route import moe.lava.banksia.core.room.dao.RouteDao import moe.lava.banksia.core.room.entity.asEntity -import moe.lava.banksia.model.Route internal class RouteLocalDataSource(private val dao: RouteDao) { suspend fun get(id: String) = dao.get(id) diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt similarity index 89% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt index a111e82..bdcbfc1 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt @@ -3,7 +3,7 @@ package moe.lava.banksia.core.data.sources.route import io.ktor.client.HttpClient import io.ktor.client.call.body import io.ktor.client.request.get -import moe.lava.banksia.model.Route +import moe.lava.banksia.core.model.Route internal class RouteRemoteDataSource(val client: HttpClient) { suspend fun get(id: String) = client.get("routes/${id}").body() diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt similarity index 92% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt index c8b429b..8e0d8ab 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt @@ -1,9 +1,9 @@ package moe.lava.banksia.core.data.sources.stop +import moe.lava.banksia.core.model.Stop import moe.lava.banksia.core.room.dao.RouteDao import moe.lava.banksia.core.room.dao.StopDao import moe.lava.banksia.core.room.entity.asEntity -import moe.lava.banksia.model.Stop internal class StopLocalDataSource(private val dao: StopDao, private val routeDao: RouteDao) { suspend fun get(id: String) = dao.get(id) diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt similarity index 90% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt index c63f718..f39afd3 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt @@ -3,7 +3,7 @@ package moe.lava.banksia.core.data.sources.stop import io.ktor.client.HttpClient import io.ktor.client.call.body import io.ktor.client.request.get -import moe.lava.banksia.model.Stop +import moe.lava.banksia.core.model.Stop internal class StopRemoteDataSource(val client: HttpClient) { suspend fun get(id: String) = client.get("stops/${id}").body() diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt similarity index 84% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt index cf09cc0..c5ce4e7 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt @@ -3,10 +3,10 @@ package moe.lava.banksia.core.data.sources.stoptime import kotlinx.datetime.LocalDate import kotlinx.datetime.TimeZone import kotlinx.datetime.todayIn +import moe.lava.banksia.core.model.StopTimeDated +import moe.lava.banksia.core.model.atDate import moe.lava.banksia.core.room.dao.StopTimeDao -import moe.lava.banksia.model.StopTimeDated -import moe.lava.banksia.model.atDate -import moe.lava.banksia.util.serialise +import moe.lava.banksia.core.util.serialise import kotlin.time.Clock internal class StopTimeLocalDataSource( diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt similarity index 95% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt index ef841bb..0633a18 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt @@ -7,7 +7,7 @@ import io.ktor.client.request.parameter import kotlinx.datetime.LocalDate import kotlinx.datetime.TimeZone import kotlinx.datetime.todayIn -import moe.lava.banksia.model.StopTimeDated +import moe.lava.banksia.core.model.StopTimeDated import kotlin.time.Clock internal class StopTimeRemoteDataSource( diff --git a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt similarity index 91% rename from shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt rename to core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt index 2055414..d1067d8 100644 --- a/shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt +++ b/core/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt @@ -4,7 +4,7 @@ import io.ktor.client.HttpClient import kotlinx.datetime.DayOfWeek import kotlinx.datetime.TimeZone import kotlinx.datetime.todayIn -import moe.lava.banksia.model.Trip +import moe.lava.banksia.core.model.Trip import kotlin.time.Clock internal class TripRemoteDataSource( diff --git a/shared/room/build.gradle.kts b/core/room/build.gradle.kts similarity index 96% rename from shared/room/build.gradle.kts rename to core/room/build.gradle.kts index 7f0f5eb..31a7393 100644 --- a/shared/room/build.gradle.kts +++ b/core/room/build.gradle.kts @@ -41,7 +41,7 @@ kotlin { implementation(libs.room.runtime) implementation(libs.sqlite.bundled) - implementation(projects.shared) + implementation(projects.core) } } } diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/1.json b/core/room/schemas/moe.lava.banksia.core.room.Database/1.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/1.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/1.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/10.json b/core/room/schemas/moe.lava.banksia.core.room.Database/10.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/10.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/10.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/11.json b/core/room/schemas/moe.lava.banksia.core.room.Database/11.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/11.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/11.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/2.json b/core/room/schemas/moe.lava.banksia.core.room.Database/2.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/2.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/2.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/3.json b/core/room/schemas/moe.lava.banksia.core.room.Database/3.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/3.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/3.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/4.json b/core/room/schemas/moe.lava.banksia.core.room.Database/4.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/4.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/4.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/5.json b/core/room/schemas/moe.lava.banksia.core.room.Database/5.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/5.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/5.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/6.json b/core/room/schemas/moe.lava.banksia.core.room.Database/6.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/6.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/6.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/7.json b/core/room/schemas/moe.lava.banksia.core.room.Database/7.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/7.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/7.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/8.json b/core/room/schemas/moe.lava.banksia.core.room.Database/8.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/8.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/8.json diff --git a/shared/room/schemas/moe.lava.banksia.core.room.Database/9.json b/core/room/schemas/moe.lava.banksia.core.room.Database/9.json similarity index 100% rename from shared/room/schemas/moe.lava.banksia.core.room.Database/9.json rename to core/room/schemas/moe.lava.banksia.core.room.Database/9.json diff --git a/shared/room/src/androidMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.android.kt b/core/room/src/androidMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.android.kt similarity index 100% rename from shared/room/src/androidMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.android.kt rename to core/room/src/androidMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.android.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/Database.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/Database.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/Database.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/Database.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt similarity index 84% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt index f9da212..f588a66 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt @@ -1,7 +1,7 @@ package moe.lava.banksia.core.room.converter import androidx.room.TypeConverter -import moe.lava.banksia.model.RouteType +import moe.lava.banksia.core.model.RouteType object RouteTypeConverter { @TypeConverter diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt similarity index 93% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt index 5304c33..b914cff 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt @@ -1,8 +1,8 @@ package moe.lava.banksia.core.room.converter import androidx.room.TypeConverter -import moe.lava.banksia.model.ShapePath -import moe.lava.banksia.util.Point +import moe.lava.banksia.core.model.ShapePath +import moe.lava.banksia.core.util.Point object ShapePathConverter { @TypeConverter diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/RouteDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/RouteDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/RouteDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/RouteDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceExceptionDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceExceptionDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceExceptionDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceExceptionDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ShapeDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ShapeDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ShapeDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ShapeDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopTimeDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopTimeDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopTimeDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopTimeDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/TripDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/TripDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/TripDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/TripDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/VersionMetadataDao.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/VersionMetadataDao.kt similarity index 100% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/VersionMetadataDao.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/VersionMetadataDao.kt diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt similarity index 80% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt index 5c5d70f..8feda0b 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt @@ -2,8 +2,8 @@ package moe.lava.banksia.core.room.entity import androidx.room.Entity import androidx.room.PrimaryKey -import moe.lava.banksia.model.Route -import moe.lava.banksia.model.RouteType +import moe.lava.banksia.core.model.Route +import moe.lava.banksia.core.model.RouteType @Entity("Route") data class RouteEntity( diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt similarity index 81% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt index 054b016..4a1c8b7 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt @@ -4,9 +4,9 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey import kotlinx.datetime.LocalDate -import moe.lava.banksia.model.Service -import moe.lava.banksia.util.deserialiseDaysBitflag -import moe.lava.banksia.util.serialise +import moe.lava.banksia.core.model.Service +import moe.lava.banksia.core.util.deserialiseDaysBitflag +import moe.lava.banksia.core.util.serialise @Entity("Service") data class ServiceEntity( diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt similarity index 92% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt index 21bac2f..1ac45d3 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt @@ -3,7 +3,7 @@ package moe.lava.banksia.core.room.entity import androidx.room.ColumnInfo import androidx.room.Entity import kotlinx.datetime.LocalDate -import moe.lava.banksia.model.ServiceException +import moe.lava.banksia.core.model.ServiceException @Entity( "ServiceException", diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt similarity index 83% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt index 0010a7d..a19147d 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt @@ -3,9 +3,9 @@ package moe.lava.banksia.core.room.entity import androidx.room.Entity import androidx.room.PrimaryKey import androidx.room.TypeConverters +import moe.lava.banksia.core.model.Shape +import moe.lava.banksia.core.model.ShapePath import moe.lava.banksia.core.room.converter.ShapePathConverter -import moe.lava.banksia.model.Shape -import moe.lava.banksia.model.ShapePath @Entity("Shape") @TypeConverters(ShapePathConverter::class) diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt similarity index 92% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt index 9434f11..f59c5da 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt @@ -5,8 +5,8 @@ import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.ForeignKey.Companion.SET_NULL import androidx.room.PrimaryKey -import moe.lava.banksia.model.Stop -import moe.lava.banksia.util.Point +import moe.lava.banksia.core.model.Stop +import moe.lava.banksia.core.util.Point @Entity( "Stop", diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt similarity index 89% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt index f9aac97..d96036d 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt @@ -5,9 +5,9 @@ import androidx.room.ForeignKey import androidx.room.ForeignKey.Companion.CASCADE import androidx.room.Index import kotlinx.serialization.ExperimentalSerializationApi -import moe.lava.banksia.model.FutureTime -import moe.lava.banksia.model.FutureTime.Companion.asInt -import moe.lava.banksia.model.StopTime +import moe.lava.banksia.core.model.FutureTime +import moe.lava.banksia.core.model.FutureTime.Companion.asInt +import moe.lava.banksia.core.model.StopTime @Entity( "StopTime", diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt similarity index 97% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt index 28cce11..7928c60 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt @@ -6,7 +6,7 @@ import androidx.room.ForeignKey import androidx.room.ForeignKey.Companion.CASCADE import androidx.room.Index import androidx.room.PrimaryKey -import moe.lava.banksia.model.Trip +import moe.lava.banksia.core.model.Trip @Entity( "Trip", diff --git a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt similarity index 89% rename from shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt rename to core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt index a79998c..1e7cab9 100644 --- a/shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt +++ b/core/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt @@ -2,7 +2,7 @@ package moe.lava.banksia.core.room.entity import androidx.room.Entity import androidx.room.PrimaryKey -import moe.lava.banksia.model.VersionMetadata +import moe.lava.banksia.core.model.VersionMetadata @Entity( "VersionMetadata", diff --git a/shared/room/src/iosMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.ios.kt b/core/room/src/iosMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.ios.kt similarity index 100% rename from shared/room/src/iosMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.ios.kt rename to core/room/src/iosMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.ios.kt diff --git a/shared/room/src/jvmMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.jvm.kt b/core/room/src/jvmMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.jvm.kt similarity index 100% rename from shared/room/src/jvmMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.jvm.kt rename to core/room/src/jvmMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.jvm.kt diff --git a/shared/src/androidMain/kotlin/moe/lava/banksia/util/Logging.android.kt b/core/src/androidMain/kotlin/moe/lava/banksia/core/util/Logging.android.kt similarity index 87% rename from shared/src/androidMain/kotlin/moe/lava/banksia/util/Logging.android.kt rename to core/src/androidMain/kotlin/moe/lava/banksia/core/util/Logging.android.kt index 31c3072..e0b792e 100644 --- a/shared/src/androidMain/kotlin/moe/lava/banksia/util/Logging.android.kt +++ b/core/src/androidMain/kotlin/moe/lava/banksia/core/util/Logging.android.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util import android.util.Log diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/Constants.kt.skeleton b/core/src/commonMain/kotlin/moe/lava/banksia/core/Constants.kt.skeleton similarity index 100% rename from shared/src/commonMain/kotlin/moe/lava/banksia/Constants.kt.skeleton rename to core/src/commonMain/kotlin/moe/lava/banksia/core/Constants.kt.skeleton diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/FutureTime.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/FutureTime.kt similarity index 94% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/FutureTime.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/FutureTime.kt index 91c5c77..7c77309 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/FutureTime.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/FutureTime.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.datetime.DateTimeUnit import kotlinx.datetime.LocalDate @@ -12,7 +12,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -import moe.lava.banksia.model.FutureTime.Companion.asInt +import moe.lava.banksia.core.model.FutureTime.Companion.asInt @Serializable(FutureTimeSerialiser::class) data class FutureTime( diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Route.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Route.kt similarity index 82% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/Route.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/Route.kt index 9cfff0f..b2741f4 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Route.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Route.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/RouteType.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/RouteType.kt similarity index 72% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/RouteType.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/RouteType.kt index a51f132..86555a6 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/RouteType.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/RouteType.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.serialization.Serializable @@ -15,6 +15,6 @@ enum class RouteType(val value: Int) { ; companion object { - fun from(value: Int) = RouteType.entries.first { it.value == value } + fun from(value: Int) = entries.first { it.value == value } } } diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Run.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Run.kt similarity index 52% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/Run.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/Run.kt index 328a4b0..69799bf 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Run.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Run.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model data class Run( val ref: String, diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Service.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Service.kt similarity index 87% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/Service.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/Service.kt index a57fb82..8568397 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Service.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Service.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.datetime.DayOfWeek import kotlinx.datetime.LocalDate diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/ServiceException.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/ServiceException.kt similarity index 84% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/ServiceException.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/ServiceException.kt index 305ede4..ef2f918 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/ServiceException.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/ServiceException.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.datetime.LocalDate import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Shape.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Shape.kt similarity index 67% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/Shape.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/Shape.kt index 6299ca0..7b71427 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Shape.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Shape.kt @@ -1,7 +1,7 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.serialization.Serializable -import moe.lava.banksia.util.Point +import moe.lava.banksia.core.util.Point typealias ShapePath = List diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Stop.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Stop.kt similarity index 77% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/Stop.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/Stop.kt index e1060bb..73e6f02 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Stop.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Stop.kt @@ -1,7 +1,7 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.serialization.Serializable -import moe.lava.banksia.util.Point +import moe.lava.banksia.core.util.Point @Serializable data class Stop( diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/StopTime.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTime.kt similarity index 88% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/StopTime.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTime.kt index 682839d..70657dc 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/StopTime.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTime.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/StopTimeDated.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTimeDated.kt similarity index 94% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/StopTimeDated.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTimeDated.kt index 55288fa..1bd75c6 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/StopTimeDated.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/StopTimeDated.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Trip.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Trip.kt similarity index 89% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/Trip.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/Trip.kt index 81d3f8d..753f653 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/Trip.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/Trip.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/model/VersionMetadata.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/VersionMetadata.kt similarity index 79% rename from shared/src/commonMain/kotlin/moe/lava/banksia/model/VersionMetadata.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/model/VersionMetadata.kt index 1770b23..2ee4f28 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/model/VersionMetadata.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/model/VersionMetadata.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.model +package moe.lava.banksia.core.model import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/util/BoxedValue.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/BoxedValue.kt similarity index 87% rename from shared/src/commonMain/kotlin/moe/lava/banksia/util/BoxedValue.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/util/BoxedValue.kt index 3ff5702..f761518 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/util/BoxedValue.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/BoxedValue.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util /** Wraps an arbitrary value, such that equality checks are forced to be done by reference */ class BoxedValue(val value: T) { diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/util/CacheMap.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/CacheMap.kt similarity index 97% rename from shared/src/commonMain/kotlin/moe/lava/banksia/util/CacheMap.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/util/CacheMap.kt index e41cef6..22236c6 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/util/CacheMap.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/CacheMap.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/util/DayOfWeekExtension.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/DayOfWeekExtension.kt similarity index 96% rename from shared/src/commonMain/kotlin/moe/lava/banksia/util/DayOfWeekExtension.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/util/DayOfWeekExtension.kt index 87d3244..7feca0d 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/util/DayOfWeekExtension.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/DayOfWeekExtension.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util import kotlinx.datetime.DayOfWeek diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/util/Logging.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/Logging.kt similarity index 88% rename from shared/src/commonMain/kotlin/moe/lava/banksia/util/Logging.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/util/Logging.kt index 7f26800..9d5f55a 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/util/Logging.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/Logging.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util fun error(tag: String, throwable: Throwable) = error(tag, "", throwable) expect fun log(tag: String, msg: String) diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/util/LoopFlow.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/LoopFlow.kt similarity index 98% rename from shared/src/commonMain/kotlin/moe/lava/banksia/util/LoopFlow.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/util/LoopFlow.kt index ee3e826..ec21d62 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/util/LoopFlow.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/LoopFlow.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/util/Point.kt b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/Point.kt similarity index 75% rename from shared/src/commonMain/kotlin/moe/lava/banksia/util/Point.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/core/util/Point.kt index 4aae7d4..4db05e2 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/util/Point.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/core/util/Point.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt similarity index 97% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt index 77ab12d..54717a2 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt @@ -16,7 +16,12 @@ import io.ktor.serialization.kotlinx.json.json import kotlinx.coroutines.delay import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import moe.lava.banksia.Constants +import moe.lava.banksia.core.Constants +import moe.lava.banksia.core.model.RouteType +import moe.lava.banksia.core.util.LoopFlow.Companion.initWith +import moe.lava.banksia.core.util.error +import moe.lava.banksia.core.util.log +import moe.lava.banksia.core.util.loopFlow import moe.lava.banksia.data.ptv.structures.PtvDeparture import moe.lava.banksia.data.ptv.structures.PtvDirection import moe.lava.banksia.data.ptv.structures.PtvRoute @@ -24,11 +29,6 @@ import moe.lava.banksia.data.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType.Companion.asPtvType import moe.lava.banksia.data.ptv.structures.PtvRun import moe.lava.banksia.data.ptv.structures.PtvStop -import moe.lava.banksia.model.RouteType -import moe.lava.banksia.util.LoopFlow.Companion.initWith -import moe.lava.banksia.util.error -import moe.lava.banksia.util.log -import moe.lava.banksia.util.loopFlow import okio.ByteString.Companion.encodeUtf8 import kotlin.random.Random diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDeparture.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDeparture.kt similarity index 100% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDeparture.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDeparture.kt diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDirection.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDirection.kt similarity index 100% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDirection.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDirection.kt diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvGeopath.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvGeopath.kt similarity index 100% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvGeopath.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvGeopath.kt diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt similarity index 94% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt index 3178328..4aae762 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt @@ -2,7 +2,7 @@ package moe.lava.banksia.data.ptv.structures import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import moe.lava.banksia.model.RouteType +import moe.lava.banksia.core.model.RouteType @Serializable data class PtvRoute( diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt similarity index 97% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt index c9988bf..d8808f1 100644 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt +++ b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt @@ -7,7 +7,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -import moe.lava.banksia.model.RouteType +import moe.lava.banksia.core.model.RouteType object PtvRouteTypeSerialiser : KSerializer { override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor( diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRun.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRun.kt similarity index 100% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRun.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRun.kt diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvStop.kt b/core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvStop.kt similarity index 100% rename from shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvStop.kt rename to core/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvStop.kt diff --git a/shared/src/iosMain/kotlin/moe/lava/banksia/util/Logging.ios.kt b/core/src/iosMain/kotlin/moe/lava/banksia/core/util/Logging.ios.kt similarity index 83% rename from shared/src/iosMain/kotlin/moe/lava/banksia/util/Logging.ios.kt rename to core/src/iosMain/kotlin/moe/lava/banksia/core/util/Logging.ios.kt index b58b89a..014c1d2 100644 --- a/shared/src/iosMain/kotlin/moe/lava/banksia/util/Logging.ios.kt +++ b/core/src/iosMain/kotlin/moe/lava/banksia/core/util/Logging.ios.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util actual fun log(tag: String, msg: String) { TODO("Not yet implemented") diff --git a/shared/src/jvmMain/kotlin/moe/lava/banksia/util/Logging.jvm.kt b/core/src/jvmMain/kotlin/moe/lava/banksia/core/util/Logging.jvm.kt similarity index 86% rename from shared/src/jvmMain/kotlin/moe/lava/banksia/util/Logging.jvm.kt rename to core/src/jvmMain/kotlin/moe/lava/banksia/core/util/Logging.jvm.kt index 0a1ea10..de7fdaa 100644 --- a/shared/src/jvmMain/kotlin/moe/lava/banksia/util/Logging.jvm.kt +++ b/core/src/jvmMain/kotlin/moe/lava/banksia/core/util/Logging.jvm.kt @@ -1,4 +1,4 @@ -package moe.lava.banksia.util +package moe.lava.banksia.core.util actual fun log(tag: String, msg: String) { println("[$tag] $msg") diff --git a/server/build.gradle.kts b/server/build.gradle.kts index e982c8c..0883c85 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -19,7 +19,8 @@ kotlin { } dependencies { - implementation(projects.shared) + implementation(projects.core) + implementation(projects.core.room) implementation(projects.server.gtfs) implementation(projects.server.gtfsRt) @@ -39,6 +40,4 @@ dependencies { implementation(libs.sqlite.bundled) testImplementation(libs.ktor.server.tests) testImplementation(libs.kotlin.test.junit) - - implementation(projects.shared.room) } diff --git a/server/gtfs/build.gradle.kts b/server/gtfs/build.gradle.kts index e83e745..8f6d646 100644 --- a/server/gtfs/build.gradle.kts +++ b/server/gtfs/build.gradle.kts @@ -11,7 +11,7 @@ kotlin { } dependencies { - implementation(projects.shared) + implementation(projects.core) implementation(libs.kotlinx.serialization.csv) implementation(libs.kotlinx.datetime) implementation(libs.ktor.client.contentnegotiation) diff --git a/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/GtfsParser.kt b/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/GtfsParser.kt index 21e239c..e726a46 100644 --- a/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/GtfsParser.kt +++ b/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/GtfsParser.kt @@ -17,15 +17,16 @@ import kotlinx.datetime.LocalDate import kotlinx.serialization.decodeFromString import kotlinx.serialization.modules.EmptySerializersModule import kotlinx.serialization.serializer -import moe.lava.banksia.Constants -import moe.lava.banksia.model.Route -import moe.lava.banksia.model.RouteType -import moe.lava.banksia.model.Service -import moe.lava.banksia.model.ServiceException -import moe.lava.banksia.model.Shape -import moe.lava.banksia.model.Stop -import moe.lava.banksia.model.StopTime -import moe.lava.banksia.model.Trip +import moe.lava.banksia.core.Constants +import moe.lava.banksia.core.model.Route +import moe.lava.banksia.core.model.RouteType +import moe.lava.banksia.core.model.Service +import moe.lava.banksia.core.model.ServiceException +import moe.lava.banksia.core.model.Shape +import moe.lava.banksia.core.model.Stop +import moe.lava.banksia.core.model.StopTime +import moe.lava.banksia.core.model.Trip +import moe.lava.banksia.core.util.Point import moe.lava.banksia.server.gtfs.structures.GtfsRoute import moe.lava.banksia.server.gtfs.structures.GtfsService import moe.lava.banksia.server.gtfs.structures.GtfsServiceException @@ -33,7 +34,6 @@ import moe.lava.banksia.server.gtfs.structures.GtfsShape import moe.lava.banksia.server.gtfs.structures.GtfsStop import moe.lava.banksia.server.gtfs.structures.GtfsStopTime import moe.lava.banksia.server.gtfs.structures.GtfsTrip -import moe.lava.banksia.util.Point import java.io.File import java.util.zip.ZipFile import kotlin.time.ExperimentalTime diff --git a/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/structures/GtfsStopTime.kt b/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/structures/GtfsStopTime.kt index 76de3cd..33da78f 100644 --- a/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/structures/GtfsStopTime.kt +++ b/server/gtfs/src/main/kotlin/moe/lava/banksia/server/gtfs/structures/GtfsStopTime.kt @@ -1,7 +1,7 @@ package moe.lava.banksia.server.gtfs.structures import kotlinx.serialization.Serializable -import moe.lava.banksia.model.FutureTime +import moe.lava.banksia.core.model.FutureTime @Suppress("PropertyName") @Serializable diff --git a/server/gtfs_rt/build.gradle.kts b/server/gtfs_rt/build.gradle.kts index 934d8bc..2887e0b 100644 --- a/server/gtfs_rt/build.gradle.kts +++ b/server/gtfs_rt/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { } dependencies { - implementation(projects.shared) + implementation(projects.core) implementation(libs.okio) implementation(libs.koin.core) implementation(libs.ktor.client.core) diff --git a/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtArchiver.kt b/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtArchiver.kt index 30a9fd3..7b9229b 100644 --- a/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtArchiver.kt +++ b/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtArchiver.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime -import moe.lava.banksia.util.log +import moe.lava.banksia.core.util.log import java.io.File import kotlin.time.Instant diff --git a/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtService.kt b/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtService.kt index 8b30b2f..6f46ed7 100644 --- a/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtService.kt +++ b/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/GtfsrtService.kt @@ -15,9 +15,9 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.joinAll import kotlinx.coroutines.launch -import moe.lava.banksia.Constants -import moe.lava.banksia.util.LogScope -import moe.lava.banksia.util.log +import moe.lava.banksia.core.Constants +import moe.lava.banksia.core.util.LogScope +import moe.lava.banksia.core.util.log private val types = arrayOf( "metro/trip-updates", diff --git a/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/RealtimeVehiclePositions.kt b/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/RealtimeVehiclePositions.kt index abebe76..4466b91 100644 --- a/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/RealtimeVehiclePositions.kt +++ b/server/gtfs_rt/src/main/kotlin/moe/lava/banksia/server/gtfsrt/RealtimeVehiclePositions.kt @@ -1,7 +1,7 @@ package moe.lava.banksia.server.gtfsrt import com.google.transit.realtime.FeedMessage -import moe.lava.banksia.util.Point +import moe.lava.banksia.core.util.Point class RealtimeVehiclePositions(data: FeedMessage) : GtfsRealtime(data) { private val positions = mutableMapOf() diff --git a/server/src/main/kotlin/moe/lava/banksia/server/Application.kt b/server/src/main/kotlin/moe/lava/banksia/server/Application.kt index eb0de33..2fe7bf6 100644 --- a/server/src/main/kotlin/moe/lava/banksia/server/Application.kt +++ b/server/src/main/kotlin/moe/lava/banksia/server/Application.kt @@ -18,15 +18,15 @@ import kotlinx.coroutines.withContext import kotlinx.datetime.LocalDate import kotlinx.datetime.TimeZone import kotlinx.datetime.todayIn -import moe.lava.banksia.Constants +import moe.lava.banksia.core.Constants +import moe.lava.banksia.core.model.atDate import moe.lava.banksia.core.room.dao.RouteDao import moe.lava.banksia.core.room.dao.StopDao import moe.lava.banksia.core.room.dao.StopTimeDao import moe.lava.banksia.core.room.dao.VersionMetadataDao -import moe.lava.banksia.model.atDate +import moe.lava.banksia.core.util.serialise import moe.lava.banksia.server.di.ServerModules import moe.lava.banksia.server.gtfsrt.GtfsrtService -import moe.lava.banksia.util.serialise import org.koin.dsl.module import org.koin.ktor.ext.inject import org.koin.ktor.plugin.Koin diff --git a/server/src/main/kotlin/moe/lava/banksia/server/GtfsDataFixer.kt b/server/src/main/kotlin/moe/lava/banksia/server/GtfsDataFixer.kt index 10d6f11..b2620f4 100644 --- a/server/src/main/kotlin/moe/lava/banksia/server/GtfsDataFixer.kt +++ b/server/src/main/kotlin/moe/lava/banksia/server/GtfsDataFixer.kt @@ -2,7 +2,7 @@ package moe.lava.banksia.server import moe.lava.banksia.core.room.Database import moe.lava.banksia.core.room.entity.StopEntity -import moe.lava.banksia.util.log +import moe.lava.banksia.core.util.log import java.security.MessageDigest class GtfsDataFixer( diff --git a/server/src/main/kotlin/moe/lava/banksia/server/GtfsImporter.kt b/server/src/main/kotlin/moe/lava/banksia/server/GtfsImporter.kt index 060457a..a012da7 100644 --- a/server/src/main/kotlin/moe/lava/banksia/server/GtfsImporter.kt +++ b/server/src/main/kotlin/moe/lava/banksia/server/GtfsImporter.kt @@ -3,15 +3,15 @@ package moe.lava.banksia.server import androidx.room.immediateTransaction import androidx.room.useWriterConnection import io.ktor.util.logging.Logger +import moe.lava.banksia.core.model.Route +import moe.lava.banksia.core.model.Service +import moe.lava.banksia.core.model.ServiceException +import moe.lava.banksia.core.model.Shape +import moe.lava.banksia.core.model.Stop +import moe.lava.banksia.core.model.StopTime +import moe.lava.banksia.core.model.Trip import moe.lava.banksia.core.room.Database import moe.lava.banksia.core.room.entity.asEntity -import moe.lava.banksia.model.Route -import moe.lava.banksia.model.Service -import moe.lava.banksia.model.ServiceException -import moe.lava.banksia.model.Shape -import moe.lava.banksia.model.Stop -import moe.lava.banksia.model.StopTime -import moe.lava.banksia.model.Trip import moe.lava.banksia.server.gtfs.GtfsData import moe.lava.banksia.server.gtfs.GtfsParser import kotlin.time.Clock diff --git a/settings.gradle.kts b/settings.gradle.kts index 7096522..335422d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -35,9 +35,9 @@ include(":androidApp") include(":server") include(":server:gtfs") include(":server:gtfs_rt") -include(":shared") -include(":shared:data") -include(":shared:room") +include(":core") +include(":core:data") +include(":core:room") include(":ui") include(":ui:maps") include(":ui:shared") diff --git a/shared/src/commonMain/kotlin/moe/lava/banksia/di/CoreDiModule.kt b/shared/src/commonMain/kotlin/moe/lava/banksia/di/CoreDiModule.kt deleted file mode 100644 index 332929a..0000000 --- a/shared/src/commonMain/kotlin/moe/lava/banksia/di/CoreDiModule.kt +++ /dev/null @@ -1,5 +0,0 @@ -package moe.lava.banksia.di - -import org.koin.dsl.module - -val coreDiModule = module { } diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index b1ffe9b..018c8e6 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -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) } diff --git a/ui/maps/build.gradle.kts b/ui/maps/build.gradle.kts index 324b0b3..4e859d1 100644 --- a/ui/maps/build.gradle.kts +++ b/ui/maps/build.gradle.kts @@ -49,7 +49,7 @@ kotlin { implementation(libs.compose.material3) implementation(libs.compose.ui) - implementation(projects.shared) + implementation(projects.core) implementation(projects.ui.shared) } } diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapLibreMaps.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapLibreMaps.kt index 1df9cb1..a870653 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapLibreMaps.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapLibreMaps.kt @@ -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 diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/Maps.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/Maps.kt index 52b7250..92a9695 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/Maps.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/Maps.kt @@ -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() diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapsPositionState.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapsPositionState.kt index a9fe8b2..b3dab0a 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapsPositionState.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/MapsPositionState.kt @@ -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 diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Marker.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Marker.kt index 32a910c..3fe99c2 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Marker.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Marker.kt @@ -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 diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Position.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Position.kt index c137394..ed568c2 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Position.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/Position.kt @@ -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) diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/RouteType.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/RouteType.kt index 523e438..584c76f 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/RouteType.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/mappers/RouteType.kt @@ -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 diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPosition.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPosition.kt index 710cebb..aba2858 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPosition.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPosition.kt @@ -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), diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPositionBounds.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPositionBounds.kt index 4adf3b1..9381262 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPositionBounds.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/CameraPositionBounds.kt @@ -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) diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Marker.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Marker.kt index 9326b2a..ac33868 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Marker.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Marker.kt @@ -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 { diff --git a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Polyline.kt b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Polyline.kt index 146d74b..04b8dc6 100644 --- a/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Polyline.kt +++ b/ui/maps/src/commonMain/kotlin/moe/lava/banksia/ui/map/util/Polyline.kt @@ -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, val colour: Color) diff --git a/ui/shared/build.gradle.kts b/ui/shared/build.gradle.kts index c784fed..e379840 100644 --- a/ui/shared/build.gradle.kts +++ b/ui/shared/build.gradle.kts @@ -35,7 +35,7 @@ kotlin { implementation(libs.compose.ui) implementation(libs.compose.ui.tooling.preview) - implementation(projects.shared) + implementation(projects.core) } } } diff --git a/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/components/RouteIcon.kt b/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/components/RouteIcon.kt index e84d765..90914ae 100644 --- a/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/components/RouteIcon.kt +++ b/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/components/RouteIcon.kt @@ -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 diff --git a/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/extensions/RouteType.kt b/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/extensions/RouteType.kt index 992b910..805f572 100644 --- a/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/extensions/RouteType.kt +++ b/ui/shared/src/commonMain/kotlin/moe/lava/banksia/ui/extensions/RouteType.kt @@ -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 diff --git a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/App.kt b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/App.kt index 2d71fce..f74dc1a 100644 --- a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/App.kt +++ b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/App.kt @@ -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() } diff --git a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/RouteInfoPanel.kt b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/RouteInfoPanel.kt index 655caca..a1a97d3 100644 --- a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/RouteInfoPanel.kt +++ b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/RouteInfoPanel.kt @@ -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() diff --git a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/TripInfoPanel.kt b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/TripInfoPanel.kt index 7b7dcf9..29bdd37 100644 --- a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/TripInfoPanel.kt +++ b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/layout/info/TripInfoPanel.kt @@ -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() diff --git a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/screens/map/MapScreenViewModel.kt b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/screens/map/MapScreenViewModel.kt index bb45232..53600f4 100644 --- a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/screens/map/MapScreenViewModel.kt +++ b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/screens/map/MapScreenViewModel.kt @@ -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 diff --git a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/state/SearchState.kt b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/state/SearchState.kt index 05429cb..9f60514 100644 --- a/ui/src/commonMain/kotlin/moe/lava/banksia/ui/state/SearchState.kt +++ b/ui/src/commonMain/kotlin/moe/lava/banksia/ui/state/SearchState.kt @@ -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 = listOf(),