From 7ec83b103623a76165f3285a8a97ac876e168656 Mon Sep 17 00:00:00 2001 From: Karan Sharma <55722391+ksharma-xyz@users.noreply.github.com> Date: Tue, 3 Sep 2024 21:08:43 +1000 Subject: [PATCH] Add modules for sydney-trains feature --- .../java/xyz/ksharma/krail/MainActivity.kt | 2 +- .../database/api/build.gradle.kts | 2 +- .../database}/api/SydneyTrainsStaticDB.kt | 4 +-- .../{ => sydney/trains/database}/stoptimes.sq | 0 .../real/di}/RealSydneyTrainsStaticDb.kt | 6 +++-- .../database/real}/di/SydneyTrainsDbModule.kt | 5 ++-- .../xyz/ksharma/krail/database/stoptimes.sq | 27 ------------------- feature/sydney-trains/domain/build.gradle.kts | 7 +++++ feature/sydney-trains/model/build.gradle.kts | 7 +++++ feature/sydney-trains/ui/build.gradle.kts | 7 +++++ settings.gradle.kts | 3 +++ 11 files changed, 34 insertions(+), 36 deletions(-) rename feature/sydney-trains/database/api/src/main/kotlin/xyz/ksharma/krail/database/{ => sydney/trains/database}/api/SydneyTrainsStaticDB.kt (56%) rename feature/sydney-trains/database/api/src/main/sqldelight/xyz/ksharma/krail/{ => sydney/trains/database}/stoptimes.sq (100%) rename feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/{ => sydney/trains/database/real/di}/RealSydneyTrainsStaticDb.kt (87%) rename feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/{ => sydney/trains/database/real}/di/SydneyTrainsDbModule.kt (72%) delete mode 100644 feature/sydney-trains/database/real/src/main/sqldelight/xyz/ksharma/krail/database/stoptimes.sq create mode 100644 feature/sydney-trains/domain/build.gradle.kts create mode 100644 feature/sydney-trains/model/build.gradle.kts create mode 100644 feature/sydney-trains/ui/build.gradle.kts diff --git a/app/src/main/java/xyz/ksharma/krail/MainActivity.kt b/app/src/main/java/xyz/ksharma/krail/MainActivity.kt index a37bcdbe..e923b4bc 100644 --- a/app/src/main/java/xyz/ksharma/krail/MainActivity.kt +++ b/app/src/main/java/xyz/ksharma/krail/MainActivity.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import timber.log.Timber -import xyz.ksharma.krail.database.api.SydneyTrainsStaticDB +import xyz.ksharma.krail.database.sydney.trains.database.api.SydneyTrainsStaticDB import xyz.ksharma.krail.design.system.theme.StartTheme import javax.inject.Inject diff --git a/feature/sydney-trains/database/api/build.gradle.kts b/feature/sydney-trains/database/api/build.gradle.kts index 84fb66d0..a883a528 100644 --- a/feature/sydney-trains/database/api/build.gradle.kts +++ b/feature/sydney-trains/database/api/build.gradle.kts @@ -10,7 +10,7 @@ android { sqldelight { databases { create("KrailDB") { - packageName.set("xyz.ksharma.krail") + packageName.set("xyz.ksharma.krail.sydney_trains.database.api") } } } diff --git a/feature/sydney-trains/database/api/src/main/kotlin/xyz/ksharma/krail/database/api/SydneyTrainsStaticDB.kt b/feature/sydney-trains/database/api/src/main/kotlin/xyz/ksharma/krail/database/sydney/trains/database/api/SydneyTrainsStaticDB.kt similarity index 56% rename from feature/sydney-trains/database/api/src/main/kotlin/xyz/ksharma/krail/database/api/SydneyTrainsStaticDB.kt rename to feature/sydney-trains/database/api/src/main/kotlin/xyz/ksharma/krail/database/sydney/trains/database/api/SydneyTrainsStaticDB.kt index 96147921..527e5fc2 100644 --- a/feature/sydney-trains/database/api/src/main/kotlin/xyz/ksharma/krail/database/api/SydneyTrainsStaticDB.kt +++ b/feature/sydney-trains/database/api/src/main/kotlin/xyz/ksharma/krail/database/sydney/trains/database/api/SydneyTrainsStaticDB.kt @@ -1,6 +1,6 @@ -package xyz.ksharma.krail.database.api +package xyz.ksharma.krail.database.sydney.trains.database.api -import xyz.ksharma.krail.StopTimes +import xyz.ksharma.krail.sydney.trains.database.StopTimes interface SydneyTrainsStaticDB { diff --git a/feature/sydney-trains/database/api/src/main/sqldelight/xyz/ksharma/krail/stoptimes.sq b/feature/sydney-trains/database/api/src/main/sqldelight/xyz/ksharma/krail/sydney/trains/database/stoptimes.sq similarity index 100% rename from feature/sydney-trains/database/api/src/main/sqldelight/xyz/ksharma/krail/stoptimes.sq rename to feature/sydney-trains/database/api/src/main/sqldelight/xyz/ksharma/krail/sydney/trains/database/stoptimes.sq diff --git a/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/RealSydneyTrainsStaticDb.kt b/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/sydney/trains/database/real/di/RealSydneyTrainsStaticDb.kt similarity index 87% rename from feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/RealSydneyTrainsStaticDb.kt rename to feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/sydney/trains/database/real/di/RealSydneyTrainsStaticDb.kt index 53a3056a..e4107c6c 100644 --- a/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/RealSydneyTrainsStaticDb.kt +++ b/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/sydney/trains/database/real/di/RealSydneyTrainsStaticDb.kt @@ -1,4 +1,4 @@ -package xyz.ksharma.krail +package xyz.ksharma.krail.sydney.trains.database.real.di import android.content.Context import app.cash.sqldelight.driver.android.AndroidSqliteDriver @@ -7,9 +7,11 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred import kotlinx.coroutines.async -import xyz.ksharma.krail.database.api.SydneyTrainsStaticDB +import xyz.ksharma.krail.database.sydney.trains.database.api.SydneyTrainsStaticDB import xyz.ksharma.krail.di.AppDispatchers import xyz.ksharma.krail.di.Dispatcher +import xyz.ksharma.krail.sydney.trains.database.StopTimes +import xyz.ksharma.krail.sydney_trains.database.api.KrailDB import javax.inject.Inject import javax.inject.Singleton diff --git a/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/di/SydneyTrainsDbModule.kt b/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/sydney/trains/database/real/di/SydneyTrainsDbModule.kt similarity index 72% rename from feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/di/SydneyTrainsDbModule.kt rename to feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/sydney/trains/database/real/di/SydneyTrainsDbModule.kt index 1c387b02..e284d675 100644 --- a/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/di/SydneyTrainsDbModule.kt +++ b/feature/sydney-trains/database/real/src/main/kotlin/xyz/ksharma/krail/sydney/trains/database/real/di/SydneyTrainsDbModule.kt @@ -1,11 +1,10 @@ -package xyz.ksharma.krail.di +package xyz.ksharma.krail.sydney.trains.database.real.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import xyz.ksharma.krail.RealSydneyTrainsStaticDb -import xyz.ksharma.krail.database.api.SydneyTrainsStaticDB +import xyz.ksharma.krail.database.sydney.trains.database.api.SydneyTrainsStaticDB import javax.inject.Singleton @Module diff --git a/feature/sydney-trains/database/real/src/main/sqldelight/xyz/ksharma/krail/database/stoptimes.sq b/feature/sydney-trains/database/real/src/main/sqldelight/xyz/ksharma/krail/database/stoptimes.sq deleted file mode 100644 index 9564d2a3..00000000 --- a/feature/sydney-trains/database/real/src/main/sqldelight/xyz/ksharma/krail/database/stoptimes.sq +++ /dev/null @@ -1,27 +0,0 @@ -CREATE TABLE stopTimes ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - trip_id TEXT NOT NULL, - arrival_time TEXT, - departure_time TEXT, - stop_id TEXT, - stop_sequence INTEGER, - stop_headsign TEXT, - pickup_type INTEGER, - drop_off_type INTEGER -); - -insertIntoStopTime: -INSERT INTO stopTimes ( - trip_id, - arrival_time, - departure_time, - stop_id, - stop_sequence, - stop_headsign, - pickup_type, - drop_off_type -) -VALUES (?, ?, ?, ?, ?, ?, ?, ?); - -selectAll: -SELECT * FROM stopTimes; diff --git a/feature/sydney-trains/domain/build.gradle.kts b/feature/sydney-trains/domain/build.gradle.kts new file mode 100644 index 00000000..ab3e9827 --- /dev/null +++ b/feature/sydney-trains/domain/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + alias(libs.plugins.krail.android.library) +} + +android { + namespace = "xyz.ksharma.krail.sydney_trains.demain" +} diff --git a/feature/sydney-trains/model/build.gradle.kts b/feature/sydney-trains/model/build.gradle.kts new file mode 100644 index 00000000..8434ba09 --- /dev/null +++ b/feature/sydney-trains/model/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + alias(libs.plugins.krail.android.library) +} + +android { + namespace = "xyz.ksharma.krail.sydney_trains.model" +} diff --git a/feature/sydney-trains/ui/build.gradle.kts b/feature/sydney-trains/ui/build.gradle.kts new file mode 100644 index 00000000..2b0a07cb --- /dev/null +++ b/feature/sydney-trains/ui/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + alias(libs.plugins.krail.android.library) +} + +android { + namespace = "xyz.ksharma.krail.sydney_trains.ui" +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 7ff1ae48..2a585b33 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,5 +30,8 @@ include(":core:network") include(":core:utils") include(":feature:sydney-trains:database:api") include(":feature:sydney-trains:database:real") +include(":feature:sydney-trains:domain") +include(":feature:sydney-trains:model") include(":feature:sydney-trains:network:api") include(":feature:sydney-trains:network:real") +include(":feature:sydney-trains:ui")