Interaktivna karta

.github/workflows/build.yml

@@ -38,7 +38,8 @@ jobs:
         id: updateSecrets
         run: |
           echo "Updating Secrets.kt"
-          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt    
+          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt 
+          echo '${{ secrets.GRADLE_LOCAL_PROPERTIES }}' > local.properties      
 
       - name: Build with Gradle
         run: ./gradlew buildRelease

.github/workflows/upload.yml

@@ -38,7 +38,8 @@ jobs:
         id: updateSecrets
         run: |
           echo "Updating Secrets.kt"
-          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt  
+          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt
+          echo '${{ secrets.GRADLE_LOCAL_PROPERTIES }}' > local.properties      
 
       - name: Build Release AAB
         id: buildRelease

app/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.google.services)
     alias(libs.plugins.crashlytics)
+    alias(libs.plugins.google.maps.secrets)
 }
 
 android {
@@ -16,8 +17,8 @@ android {
         applicationId = "com.am.stbus"
         minSdk = 23
         targetSdk = 36
-        versionCode = 84
-        versionName = "4.0.3"
+        versionCode = 85
+        versionName = "4.1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,21 +31,26 @@ android {
         }
         release {
             isMinifyEnabled = true
-            firebaseCrashlytics {
-                mappingFileUploadEnabled = true
-            }
+            isShrinkResources = true
             proguardFiles(
+                // Default file with automatically generated optimization rules.
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+
+            firebaseCrashlytics {
+                mappingFileUploadEnabled = true
+            }
         }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+        }
     }
     buildFeatures {
         buildConfig = true
@@ -53,11 +59,13 @@ android {
 }
 
 dependencies {
+    implementation(libs.gson)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.fonts)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
@@ -75,6 +83,9 @@ dependencies {
     implementation(libs.firebase.crashlytics)
     implementation(libs.firebase.analytics)
 
+    implementation(libs.maps.compose)
+    implementation(libs.microsoft.signal)
+
     implementation(platform(libs.koin.bom))
     implementation(libs.koin.android)
     implementation(libs.koin.compose)
@@ -113,4 +124,4 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
     testImplementation(kotlin("test"))
-}
+}

app/proguard-rules.pro

@@ -30,4 +30,6 @@
 -keep class **.R$*
 
 -keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
--keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+-keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder

app/src/main/AndroidManifest.xml

@@ -46,14 +46,13 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.SplitBus"
-        android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning"
-        tools:targetApi="m">
+        tools:ignore="GoogleAppIndexingWarning">
 
-        <!--
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/api_key" />
+            android:value="${MAPS_API_KEY}" />
+
+        <!--
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" /> &lt;!&ndash; Fixes crash for Android 9+ users &ndash;&gt;

app/src/main/java/com/am/stbus/common/Constants.kt

@@ -26,9 +26,9 @@ package com.am.stbus.common
 
 object Constants {
 
-    const val DB_VERSION = 1
+    const val DB_VERSION = 2
 
-    const val PROMET_URL = "http://www.promet-split.hr"
+    const val PROMET_URL = "https://www.promet-split.hr"
     const val PROMET_NOVOSTI_URL = "http://www.promet-split.hr/obavijesti"
     const val PROMET_API_URL = "https://api.promet-split.hr/Fleet/api/v1/"
     const val PROMET_ALL_LINES_URL = "$PROMET_URL/vozni-red/sve-linije/"
@@ -98,4 +98,4 @@ object InformationConstants {
                 "&maponly=1&language=hr&redirect_signup=https://secure.nextbike.net/gt/hr/split/registrirajse/\" " +
                 "width=\"100%\" height=\"400\" frameborder=\"0\"></iframe>"
 
-}
+}

app/src/main/java/com/am/stbus/common/di/AppModule.kt

@@ -25,9 +25,12 @@
 package com.am.stbus.common.di
 
 import androidx.room.Room
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.am.stbus.common.room.AppDatabase
-import com.am.stbus.data.ApiService
-import com.am.stbus.data.room.FavouriteItemDao
+import com.am.stbus.data.services.ApiService
+import com.am.stbus.data.services.room.FavouriteItemDao
+import com.am.stbus.data.services.room.TimetableDetailDataCachedDao
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 import retrofit2.Retrofit
@@ -38,16 +41,35 @@ val appModule = module {
         get<Retrofit>().create(ApiService::class.java)
     }
 
+    val MIGRATION_1_2 = object : Migration(1, 2) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            database.execSQL(
+                "CREATE TABLE IF NOT EXISTS `TimetableDetailDataCached` (" +
+                        "`websiteTitle` TEXT NOT NULL, " +
+                        "`timetableDetailData` TEXT NOT NULL, " +
+                        "`storedAt` TEXT NOT NULL, " +
+                        "PRIMARY KEY(`websiteTitle`))"
+            )
+        }
+    }
+
     single<AppDatabase> {
         Room.databaseBuilder(
             androidContext(),
             AppDatabase::class.java, "split-bus-db"
-        ).fallbackToDestructiveMigration(true).build()
+        )
+            .addMigrations(MIGRATION_1_2)
+            .fallbackToDestructiveMigration(dropAllTables = true)
+            .build()
     }
 
     single<FavouriteItemDao> {
         get<AppDatabase>().favouriteItemDao()
     }
 
+    single<TimetableDetailDataCachedDao> {
+        get<AppDatabase>().timetableDetailDataCachedDao()
+    }
+
 
-}
+}

app/src/main/java/com/am/stbus/common/di/NetworkModule.kt

@@ -2,6 +2,8 @@ package com.am.stbus.common.di
 
 import com.am.stbus.common.Constants.PROMET_API_URL
 import com.am.stbus.common.PROMET_KEY
+import com.microsoft.signalr.GsonHubProtocol
+import com.microsoft.signalr.HubConnectionBuilder
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -53,4 +55,17 @@ val networkModule = module {
             .build()
     }
 
+
+    single {
+
+        val gsonProtocol = GsonHubProtocol()
+
+        HubConnectionBuilder
+            .create("https://api.promet-split.hr/Fleet/hub/spatial")
+            .withHubProtocol(gsonProtocol)
+            .shouldSkipNegotiate(false)
+            .build()
+    }
+
+
 }

app/src/main/java/com/am/stbus/common/di/RepositoryModule.kt

@@ -37,7 +37,9 @@ val repositoryModule = module {
     }
 
     single {
-        TimetablesRepository()
+        TimetablesRepository(
+            timetableDetailDataCachedDao = get()
+        )
     }
 
 }

app/src/main/java/com/am/stbus/common/di/UseCaseModule.kt

@@ -26,26 +26,47 @@ package com.am.stbus.common.di
 
 import com.am.stbus.domain.usecases.FavouritesRoomDbUseCase
 import com.am.stbus.domain.usecases.GetBusStopArrivalsUseCase
-import com.am.stbus.domain.usecases.GetTimetableDetailDataUseCase
+import com.am.stbus.domain.usecases.gmaps.GetLiveVehiclesFromHubConnection
+import com.am.stbus.domain.usecases.gmaps.GetLiveVehiclesUseCase
+import com.am.stbus.domain.usecases.timetables.GetLocalTimetableDetailDataUseCase
+import com.am.stbus.domain.usecases.timetables.GetRemoteTimetableDetailDataUseCase
 import org.koin.dsl.module
 
 val useCaseModule = module {
 
+    single {
+        FavouritesRoomDbUseCase(
+            favouriteItemDao = get()
+        )
+    }
+
     single {
         GetBusStopArrivalsUseCase(
             prometApiRepository = get()
         )
     }
 
     single {
-        GetTimetableDetailDataUseCase(
+        GetLiveVehiclesUseCase(
+            prometApiRepository = get()
+        )
+    }
+
+    single {
+        GetLiveVehiclesFromHubConnection(
+            hubConnection = get()
+        )
+    }
+
+    single {
+        GetLocalTimetableDetailDataUseCase(
             timetablesRepository = get()
         )
     }
 
     single {
-        FavouritesRoomDbUseCase(
-            favouriteItemDao = get()
+        GetRemoteTimetableDetailDataUseCase(
+            timetablesRepository = get()
         )
     }
 

app/src/main/java/com/am/stbus/common/di/ViewModelModule.kt

@@ -25,6 +25,8 @@
 package com.am.stbus.common.di
 
 import com.am.stbus.presentation.MainViewModel
+import com.am.stbus.presentation.screens.info.InfoScreenViewModel
+import com.am.stbus.presentation.screens.info.maps.GmapsScreenViewModel
 import com.am.stbus.presentation.screens.stops.detail.BusStopArrivalsDetailViewModel
 import com.am.stbus.presentation.screens.timetables.detail.TimetablesDetailViewModel
 import org.koin.core.module.dsl.viewModel
@@ -46,7 +48,19 @@ val viewModelModule = module {
 
     viewModel {
         TimetablesDetailViewModel(
-            getTimetableDetailDataUseCase = get()
+            getLocalTimetableDetailDataUseCase = get(),
+            getRemoteTimetableDetailDataUseCase = get()
         )
     }
+
+    viewModel {
+        GmapsScreenViewModel(
+            getLiveVehiclesUseCase = get(),
+            getLiveVehiclesFromHubConnection = get()
+        )
+    }
+
+    viewModel {
+        InfoScreenViewModel()
+    }
 }

app/src/main/java/com/am/stbus/common/room/AppDatabase.kt

@@ -26,11 +26,16 @@ package com.am.stbus.common.room
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import com.am.stbus.common.Constants.DB_VERSION
-import com.am.stbus.data.models.FavouriteItem
-import com.am.stbus.data.room.FavouriteItemDao
+import com.am.stbus.data.models.roomdb.FavouriteItem
+import com.am.stbus.data.models.roomdb.TimetableDetailDataCached
+import com.am.stbus.data.services.room.FavouriteItemDao
+import com.am.stbus.data.services.room.TimetableDetailDataCachedDao
 
-@Database(entities = [FavouriteItem::class], version = DB_VERSION)
+@Database(entities = [FavouriteItem::class, TimetableDetailDataCached::class], version = DB_VERSION)
+@TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun favouriteItemDao(): FavouriteItemDao
+    abstract fun timetableDetailDataCachedDao(): TimetableDetailDataCachedDao
 }