Update CI for Krail

.github/workflows/ci.yml

@@ -1,10 +1,10 @@
-name: Android CI
+name: Krail App CI
 
 on:
   push:
-    branches: [ commonMain ]
+    branches: [ main ]
   pull_request:
-    branches: [ commonMain ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -40,15 +40,15 @@ jobs:
       - name: Firebase (Release) - Google Services.json file
         env:
           DATA: ${{ secrets.FIREBASE_GOOGLE_SERVICES_JSON_RELEASE }}
-        run: echo $DATA | base64 -di > android-app/google-services.json
+        run: echo $DATA | base64 -di > composeApp/src/androidMain/google-services.json
 
       - name: Firebase (Debug) - Google Services.json file
         env:
           DATA: ${{ secrets.FIREBASE_GOOGLE_SERVICES_JSON_DEBUG }}
-        run: echo $DATA | base64 -di > android-app/src/debug/google-services.json
+        run: echo $DATA | base64 -di > composeApp/src/androidDebug/google-services.json
 
-      - name: Detekt Checks
-        run: ./gradlew detekt
+#      - name: Detekt Checks
+#        run: ./gradlew detekt
 
       - name: Build Debug
         run: ./gradlew assembleDebug test

feature/trip-planner/ui/build.gradle.kts

@@ -42,20 +42,6 @@ kotlin {
                 implementation(libs.kotlinx.serialization.json)
                 implementation(libs.navigation.compose)
                 implementation(libs.lifecycle.viewmodel.compose)
-
-                // TODO - remove once DI added - start
-/*
-                implementation(libs.ktor.client.core)
-                implementation(libs.ktor.client.cio)
-                implementation(libs.ktor.client.auth)
-                implementation(libs.ktor.client.content.negotiation)
-                implementation(libs.ktor.client.logging)
-                implementation(libs.ktor.serialization.kotlinx.json)
-                implementation(libs.kotlinx.datetime)
-                implementation(libs.slf4j.simple) // Logging
-*/
-                // TODO - remove once DI added - end
-
                 api(libs.di.koinComposeViewmodel)
             }
         }

feature/trip-planner/ui/src/commonMain/kotlin/xyz/ksharma/krail/trip/planner/ui/timetable/business/TripResponseMapper.kt

@@ -4,9 +4,11 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import xyz.ksharma.krail.core.datetime.DateTimeHelper.calculateTimeDifference
 import xyz.ksharma.krail.core.datetime.DateTimeHelper.calculateTimeDifferenceFromNow
+import xyz.ksharma.krail.core.datetime.DateTimeHelper.formatTo12HourTime
 import xyz.ksharma.krail.core.datetime.DateTimeHelper.toFormattedDurationTimeString
 import xyz.ksharma.krail.core.datetime.DateTimeHelper.toGenericFormattedTimeString
 import xyz.ksharma.krail.core.datetime.DateTimeHelper.toHHMM
+import xyz.ksharma.krail.core.datetime.DateTimeHelper.utcToAEST
 import xyz.ksharma.krail.core.datetime.DateTimeHelper.utcToLocalDateTimeAEST
 import xyz.ksharma.krail.trip.planner.network.api.model.TripResponse
 import xyz.ksharma.krail.trip.planner.ui.state.TransportMode
@@ -66,7 +68,7 @@ internal fun TripResponse.buildJourneyList(): ImmutableList<TimeTableState.Journ
                 legs = legsList,
                 totalUniqueServiceAlerts = legs.flatMap { leg -> leg.infos.orEmpty() }.toSet().size,
             ).also {
-                //println("\tJourneyId: ${it.journeyId}")
+                println("\tJourneyId: ${it.journeyId}")
             }
         } else {
             null
@@ -246,7 +248,7 @@ private fun TripResponse.StopSequence.toUiModel(): TimeTableState.JourneyCardInf
     }
 }
 
-/*internal fun TripResponse.logForUnderstandingData() {
+internal fun TripResponse.logForUnderstandingData() {
     println("Journeys: ${journeys?.size}")
     journeys?.mapIndexed { jindex, j ->
         println("JOURNEY #${jindex + 1}")
@@ -277,12 +279,12 @@ private fun TripResponse.StopSequence.toUiModel(): TimeTableState.JourneyCardInf
             )
         }
     }
-}*/
+}
 
 /**
  * Prints the stops for legs when interchange required.
  */
-/*private fun List<TripResponse.StopSequence>.interchangeStopsList() = this.mapNotNull {
+private fun List<TripResponse.StopSequence>.interchangeStopsList() = this.mapNotNull {
     // TODO - figure role of ARR vs DEP time
     val timeArr = it.arrivalTimeEstimated?.utcToAEST()
         ?.formatTo12HourTime() ?: it.arrivalTimePlanned?.utcToAEST()?.formatTo12HourTime()
@@ -296,7 +298,7 @@ private fun TripResponse.StopSequence.toUiModel(): TimeTableState.JourneyCardInf
         "\n\t\t\t\t Stop: ${it.name}," +
             " depTime: ${timeArr ?: depTime}"
     }
-}*/
+}
 
 private fun String.fromUTCToDisplayTimeString() = this.utcToLocalDateTimeAEST().toHHMM()