Create :core:utils (#22)

core/data/build.gradle.kts

@@ -13,10 +13,11 @@ dependencies {
     implementation(projects.core.coroutinesExt)
     implementation(projects.core.network)
     implementation(projects.core.model)
+    implementation(projects.core.utils)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.kotlinx.serialization.json)
-    implementation("com.opencsv:opencsv:5.5.2")
+    implementation(libs.opencsv)
     implementation(libs.okhttp)
     implementation(libs.timber)
 

core/data/src/main/kotlin/xyz/ksharma/krail/data/ResponseExt.kt

@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import okhttp3.Response
 import timber.log.Timber
 import xyz.ksharma.krail.coroutines.ext.safeResult
-import xyz.ksharma.krail.network.files.toPath
+import xyz.ksharma.krail.utils.toPath
 import java.io.File
 import java.io.IOException
 import java.nio.file.Path

core/data/src/main/kotlin/xyz/ksharma/krail/data/repository/SydneyTrainsRepositoryImpl.kt

@@ -7,12 +7,9 @@ import kotlinx.coroutines.withContext
 import okhttp3.Response
 import timber.log.Timber
 import xyz.ksharma.krail.data.cacheZipResponse
-import xyz.ksharma.krail.data.gtfs_static.parser.AgencyParser.parseAgency
 import xyz.ksharma.krail.di.AppDispatchers
 import xyz.ksharma.krail.di.Dispatcher
-import xyz.ksharma.krail.model.sydneytrains.GTFSFeedFileNames
 import xyz.ksharma.krail.network.GtfsService
-import xyz.ksharma.krail.network.files.toPath
 import javax.inject.Inject
 
 class SydneyTrainsRepositoryImpl @Inject constructor(
@@ -27,18 +24,5 @@ class SydneyTrainsRepositoryImpl @Inject constructor(
         response.cacheZipResponse(dispatcher = ioDispatcher, context = context)
 
         // TODO - provide boolean response if files were cached successfully.
-        //val stopsList = context.toPath(GTFSFeedFileNames.STOPS.fileName).parseStops()
-        //Timber.d("stopsList: $stopsList")
-        //val tripsList = context.toPath(GTFSFeedFileNames.TRIPS.fileName).parseTrips()
-        //val stopTimesList = context.toPath(GTFSFeedFileNames.STOP_TIMES.fileName).parseStopTimes()
-        //Timber.d("stopTimesList: ${stopTimesList.size}") Huge data do not log.
-        //val routesList = context.toPath(GTFSFeedFileNames.ROUTES.fileName).parseRoutes()
-//        Timber.d("routesList: $routesList")
-        //val occupancyList = context.toPath(GTFSFeedFileNames.OCCUPANCIES.fileName).parseOccupancy()
-        //Timber.d("occupancyList: ${occupancyList.size}")
-        //val calendarList = context.toPath(GTFSFeedFileNames.CALENDAR.fileName).parseCalendar()
-        //Timber.d("calendarList: ${calendarList}")
-        val agencyList = context.toPath(GTFSFeedFileNames.AGENCY.fileName).parseAgency()
-        Timber.d("agencyList: $agencyList")
     }
 }

core/domain/build.gradle.kts

@@ -10,6 +10,7 @@ android {
 dependencies {
     api(projects.core.data)
     api(projects.core.model)
+    implementation(projects.core.utils)
 
     testImplementation(libs.junit)
     testImplementation(libs.turbine)

core/domain/src/main/kotlin/xyz/ksharma/krail/domain/DemoUseCase.kt

@@ -1,6 +1,12 @@
 package xyz.ksharma.krail.domain
 
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import timber.log.Timber
 import xyz.ksharma.krail.data.repository.SydneyTrainsRepository
+import xyz.ksharma.krail.domain.parser.AgencyParser.parseAgency
+import xyz.ksharma.krail.model.sydneytrains.GTFSFeedFileNames
+import xyz.ksharma.krail.utils.toPath
 import javax.inject.Inject
 
 /**
@@ -16,8 +22,23 @@ interface DemoUseCase {
 
 class DemoUseCaseImpl @Inject constructor(
     private val sydneyTrainsRepository: SydneyTrainsRepository,
+    @ApplicationContext private val context: Context,
 ) : DemoUseCase {
     override suspend operator fun invoke() {
         sydneyTrainsRepository.fetchStaticSydneyTrainsScheduleAndCache()
+
+        //val stopsList = context.toPath(GTFSFeedFileNames.STOPS.fileName).parseStops()
+        //Timber.d("stopsList: $stopsList")
+        //val tripsList = context.toPath(GTFSFeedFileNames.TRIPS.fileName).parseTrips()
+        //val stopTimesList = context.toPath(GTFSFeedFileNames.STOP_TIMES.fileName).parseStopTimes()
+        //Timber.d("stopTimesList: ${stopTimesList.size}") Huge data do not log.
+        //val routesList = context.toPath(GTFSFeedFileNames.ROUTES.fileName).parseRoutes()
+//        Timber.d("routesList: $routesList")
+        //val occupancyList = context.toPath(GTFSFeedFileNames.OCCUPANCIES.fileName).parseOccupancy()
+        //Timber.d("occupancyList: ${occupancyList.size}")
+        //val calendarList = context.toPath(GTFSFeedFileNames.CALENDAR.fileName).parseCalendar()
+        //Timber.d("calendarList: ${calendarList}")
+        val agencyList = context.toPath(GTFSFeedFileNames.AGENCY.fileName).parseAgency()
+        Timber.d("agencyList: $agencyList")
     }
 }

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/AgencyParser.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/AgencyParser.kt

@@ -1,4 +1,4 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
+package xyz.ksharma.krail.domain.parser
 
 import timber.log.Timber
 import xyz.ksharma.krail.model.gtfs_static.Agency

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/CalendarParser.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/CalendarParser.kt

@@ -1,4 +1,4 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
+package xyz.ksharma.krail.domain.parser
 
 import timber.log.Timber
 import xyz.ksharma.krail.model.gtfs_static.Calendar
@@ -48,11 +48,4 @@ object CalendarParser {
 
         return calendarList
     }
-
-    private fun Int.toWheelchairBoarding() = when (this) {
-        0 -> xyz.ksharma.krail.model.gtfs_realtime.proto.Stop.WheelchairBoarding.UNKNOWN
-        1 -> xyz.ksharma.krail.model.gtfs_realtime.proto.Stop.WheelchairBoarding.AVAILABLE
-        2 -> xyz.ksharma.krail.model.gtfs_realtime.proto.Stop.WheelchairBoarding.NOT_AVAILABLE
-        else -> null
-    }
 }

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/OccupancyParser.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/OccupancyParser.kt

@@ -1,4 +1,4 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
+package xyz.ksharma.krail.domain.parser
 
 import timber.log.Timber
 import xyz.ksharma.krail.model.gtfs_static.Occupancy
@@ -80,5 +80,4 @@ object OccupancyParser {
 
         return occupancyList
     }
-
 }

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/ParserExt.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/ParserExt.kt

@@ -1,3 +1,3 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
+package xyz.ksharma.krail.domain.parser
 
 internal fun List<String>.trimQuotes(): List<String> = this.map { it.trim('\"') }

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/RouteParser.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/RouteParser.kt

@@ -1,5 +1,4 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
-
+package xyz.ksharma.krail.domain.parser
 
 import timber.log.Timber
 import xyz.ksharma.krail.model.gtfs_static.Route

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/StopTimesParser.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/StopTimesParser.kt

@@ -1,4 +1,4 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
+package xyz.ksharma.krail.domain.parser
 
 import timber.log.Timber
 import xyz.ksharma.krail.model.gtfs_static.StopTimes
@@ -75,5 +75,4 @@ object StopTimesParser {
 
         return stopTimesList
     }
-
 }

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/StopsParser.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/StopsParser.kt

@@ -1,4 +1,4 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
+package xyz.ksharma.krail.domain.parser
 
 import timber.log.Timber
 import xyz.ksharma.krail.model.gtfs_static.Stop

core/data/src/main/kotlin/xyz/ksharma/krail/data/gtfs_static/parser/TripParser.kt → core/domain/src/main/kotlin/xyz/ksharma/krail/domain/parser/TripParser.kt

@@ -1,4 +1,4 @@
-package xyz.ksharma.krail.data.gtfs_static.parser
+package xyz.ksharma.krail.domain.parser
 
 import timber.log.Timber
 import xyz.ksharma.krail.model.gtfs_static.Trip

core/network/src/main/kotlin/xyz/ksharma/krail/network/GtfsServiceImpl.kt

@@ -1,10 +1,9 @@
 package xyz.ksharma.krail.network
 
-import android.content.ContentValues.TAG
-import android.util.Log
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
+import timber.log.Timber
 import xyz.ksharma.krail.network.di.NetworkModule.Companion.BASE_URL
 import xyz.ksharma.krail.network.interceptor.AuthInterceptor.Companion.API_KEY
 import javax.inject.Inject
@@ -24,7 +23,7 @@ class GtfsServiceImpl @Inject constructor(
 
         val response = okHttpClient.newCall(request).execute()
         // don't log it's entire response body,which is huge.
-         Log.d(TAG, "fetchSydneyTrains: ${response.body?.string()?.take(500)}")
+        Timber.d("fetchSydneyTrains: " + response.body?.string()?.take(500))
         return response
     }
 }

core/utils/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    alias(libs.plugins.krail.android.library)
+}
+
+android {
+    namespace = "xyz.ksharma.krail.utils"
+}

core/network/src/main/kotlin/xyz/ksharma/krail/network/files/PathExt.kt → core/utils/src/main/kotlin/xyz/ksharma/krail/utils/PathExt.kt

@@ -1,4 +1,4 @@
-package xyz.ksharma.krail.network.files
+package xyz.ksharma.krail.utils
 
 import android.content.Context
 import java.nio.file.Path

gradle/libs.versions.toml

@@ -17,6 +17,7 @@ hilt = "2.51.1"
 okhttpBom = "4.12.0"
 kotlinxSerializationJson = "1.7.0"
 ksp = "2.0.0-1.0.22"
+opencsv = "5.5.2"
 paparazzi = "1.3.2"
 wire = "5.0.0-alpha04"
 
@@ -33,6 +34,7 @@ activity-compose = { group = "androidx.activity", name = "activity-compose", ver
 lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "android-lifecycle" }
 lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "android-lifecycle" }
 lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "android-lifecycle" }
+opencsv = { module = "com.opencsv:opencsv", version.ref = "opencsv" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 
 #Compose

settings.gradle.kts

@@ -27,4 +27,5 @@ include(":core:domain")
 include(":core:design-system")
 include(":core:model")
 include(":core:network")
+include(":core:utils")
 include(":feature:feature1")