From e918a4e4bc65a9f07f89e9f4c0c2588a8388c11f Mon Sep 17 00:00:00 2001 From: marinantonio Date: Wed, 19 Nov 2025 19:23:10 +0000 Subject: [PATCH 1/4] Nova verzija 4.0.1 --- app/build.gradle.kts | 8 +++- .../java/com/am/stbus/SplitBusApplication.kt | 9 ++-- .../java/com/am/stbus/common/di/AppModule.kt | 2 +- .../com/am/stbus/data/static/BusLinesData.kt | 6 +-- app/src/main/res/values-hr/strings.xml | 9 ++-- build.gradle | 41 ------------------- build.gradle.kts | 1 + gradle/libs.versions.toml | 8 ++++ 8 files changed, 26 insertions(+), 58 deletions(-) delete mode 100644 build.gradle diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a3ab5ca..61f4ae6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,6 +4,7 @@ plugins { alias(libs.plugins.kotlin.compose) alias(libs.plugins.jetbrains.kotlin.serialization) alias(libs.plugins.ksp) + alias(libs.plugins.crashlytics) } android { @@ -15,7 +16,7 @@ android { minSdk = 23 targetSdk = 36 versionCode = 81 - versionName = "4.0.0" + versionName = "4.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -56,7 +57,6 @@ dependencies { implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) - //implementation(libs.androidx.navigation3) implementation(libs.androidx.lifecycle.viewmodel.navigation3) implementation(libs.kotlinx.serialization.core) @@ -66,6 +66,10 @@ dependencies { ksp(libs.room.compiler) implementation(libs.room.ktx) + implementation(platform(libs.firebase.bom)) + implementation(libs.firebase.crashlytics) + implementation(libs.firebase.analytics) + implementation(platform(libs.koin.bom)) implementation(libs.koin.android) implementation(libs.koin.compose) diff --git a/app/src/main/java/com/am/stbus/SplitBusApplication.kt b/app/src/main/java/com/am/stbus/SplitBusApplication.kt index ac5d1a3..2cd7927 100644 --- a/app/src/main/java/com/am/stbus/SplitBusApplication.kt +++ b/app/src/main/java/com/am/stbus/SplitBusApplication.kt @@ -33,7 +33,6 @@ import com.am.stbus.common.di.viewModelModule import com.jakewharton.threetenabp.AndroidThreeTen import org.koin.android.ext.koin.androidContext import org.koin.core.context.startKoin -import timber.log.Timber class SplitBusApplication : Application() { @@ -69,11 +68,9 @@ class SplitBusApplication : Application() { } private fun setupTimber() { - Timber.plant(Timber.DebugTree()) - - /* if (BuildConfig.DEBUG) { - Timber.plant(Timber.DebugTree()) - }*/ + /* if (BuildConfig.DEBUG) { + Timber.plant(Timber.DebugTree()) + }*/ } private fun setupThreeTen() { diff --git a/app/src/main/java/com/am/stbus/common/di/AppModule.kt b/app/src/main/java/com/am/stbus/common/di/AppModule.kt index f0f4e33..f77e47e 100644 --- a/app/src/main/java/com/am/stbus/common/di/AppModule.kt +++ b/app/src/main/java/com/am/stbus/common/di/AppModule.kt @@ -42,7 +42,7 @@ val appModule = module { Room.databaseBuilder( androidContext(), AppDatabase::class.java, "split-bus-db" - ).build() + ).fallbackToDestructiveMigration(true).build() } single { diff --git a/app/src/main/java/com/am/stbus/data/static/BusLinesData.kt b/app/src/main/java/com/am/stbus/data/static/BusLinesData.kt index 0f5f8da..8061343 100644 --- a/app/src/main/java/com/am/stbus/data/static/BusLinesData.kt +++ b/app/src/main/java/com/am/stbus/data/static/BusLinesData.kt @@ -64,7 +64,7 @@ val URBAN_AREA_BUS_LINES = listOf( BusLine(id = 100, title = R.string.bus1, number = "1", websiteTitle = "1 BUNJE"), BusLine(id = 101, title = R.string.bus021, number = "2", websiteTitle = "2 SPLIT"), BusLine(id = 102, title = R.string.bus022, number = "2", websiteTitle = "2 ZRAČNA"), - BusLine(id = 103, title = R.string.bus2A, number = "2A", websiteTitle = "2A K.SUĆURAC"), + BusLine(id = 103, title = R.string.bus2A, number = "2A", websiteTitle = "2A K. SUĆURAC"), BusLine(id = 104, title = R.string.bus5, number = "5", websiteTitle = "5 DRAČEVAC"), BusLine(id = 105, title = R.string.bus5A, number = "5A", websiteTitle = "5A DRAČEVAC"), BusLine(id = 106, title = R.string.bus10, number = "10", websiteTitle = "10 JAPIRKO"), @@ -124,9 +124,9 @@ val SUBURBAN_AREA_BUS_LINES = listOf( BusLine(id = 520, title = R.string.bus861, number = "86", websiteTitle = "86 SPLIT"), BusLine(id = 521, title = R.string.bus862, number = "86", websiteTitle = "86 KLADNJICE"), BusLine(id = 522, title = R.string.bus900, number = "90", websiteTitle = "90 SITNO"), - BusLine(id = 523, title = R.string.bus911, number = "91", websiteTitle = "91 K.STARI"), + BusLine(id = 523, title = R.string.bus911, number = "91", websiteTitle = "91 K. STARI"), BusLine(id = 524, title = R.string.bus912, number = "91", websiteTitle = "91 DIVOJEVIĆI"), - BusLine(id = 525, title = R.string.bus931, number = "93", websiteTitle = "93 K.STARI"), + BusLine(id = 525, title = R.string.bus931, number = "93", websiteTitle = "93 K. STARI"), BusLine(id = 526, title = R.string.bus932, number = "93", websiteTitle = "93 ŠERIĆI") ) diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index ca3e7d1..10eb365 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -27,12 +27,11 @@ Favoriti - Autobusne stanice + Stanice Vozni redovi Informacije Postavke - Nema favorita! Označite omiljene linije kako bi se pojavile na početnoj stranici @@ -317,9 +316,9 @@ Ravnički Most - Omiš - Split Kaštel Stari - Rudine Rudine - Kaštel Stari - Kaštel Stari - Train station - Train station - Kaštel Stari - Trogir - Split (direct) + Kaštel Stari - Željeznička stanica + Željeznička stanica - Kaštel Stari + Trogir - Split (direktna) diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 6e43f6d..0000000 --- a/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -/* -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - ext.kotlin_version = '1.7.21' - ext.gradle_version = '8.3.0' - ext.navigation_safe_args_version = '2.5.0' - ext.gms_services_version = '4.3.10' - ext.licenses_version = '0.10.4' - ext.crashlytics_gradle_version = '2.9.0' - - repositories { - mavenCentral() - google() - jcenter() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" - classpath "com.android.tools.build:gradle:$gradle_version" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_safe_args_version" - classpath "com.google.gms:google-services:$gms_services_version" - classpath "com.google.android.gms:oss-licenses-plugin:$licenses_version" - classpath "com.google.firebase:firebase-crashlytics-gradle:$crashlytics_gradle_version" - } - -} - -allprojects { - repositories { - google() - jcenter() - maven { url "https://jitpack.io" } - - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} -*/ diff --git a/build.gradle.kts b/build.gradle.kts index 963bc56..8459bd3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,4 +4,5 @@ plugins { alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.ksp) apply false + alias(libs.plugins.crashlytics) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 61f6864..bc79ffa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,6 +2,7 @@ agp = "8.13.0" kotlin = "2.2.20" ksp = "2.2.20-2.0.4" +crashlytics = "3.0.6" coreKtx = "1.17.0" junit = "4.13.2" @@ -25,6 +26,8 @@ kotlinxSerializationCore = "1.9.0" room = "2.8.3" +firebaseBom = "34.6.0" + koinBom = "4.1.1" retrofit = "3.0.0" navigationFragmentKtx = "2.9.4" @@ -75,6 +78,10 @@ room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = " room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +firebase-bom = { group = "com.google.firebase", name = "koin-bom", version.ref = "firebaseBom" } +firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" } +firebase-analytics = { group = "com.google.firebase", name = "koin-android" } + koin-bom = { group = "io.insert-koin", name = "koin-bom", version.ref = "koinBom" } koin-android = { module = "io.insert-koin:koin-android" } koin-compose = { module = "io.insert-koin:koin-androidx-compose" } @@ -97,4 +104,5 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization"} +crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics" } From 2d3c562cd2a0905d654cf63e75ecf7654bd320d8 Mon Sep 17 00:00:00 2001 From: marinantonio Date: Wed, 19 Nov 2025 19:38:23 +0000 Subject: [PATCH 2/4] Nova verzija 4.0.1 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bc79ffa..bfd91da 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -78,9 +78,9 @@ room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = " room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } -firebase-bom = { group = "com.google.firebase", name = "koin-bom", version.ref = "firebaseBom" } +firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" } firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" } -firebase-analytics = { group = "com.google.firebase", name = "koin-android" } +firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } koin-bom = { group = "io.insert-koin", name = "koin-bom", version.ref = "koinBom" } koin-android = { module = "io.insert-koin:koin-android" } From bad6d3a97b2ef6e3c638069168a06ad3cc75af6c Mon Sep 17 00:00:00 2001 From: marinantonio Date: Wed, 19 Nov 2025 19:50:22 +0000 Subject: [PATCH 3/4] Nova verzija 4.0.1 --- app/build.gradle.kts | 1 + build.gradle.kts | 1 + gradle/libs.versions.toml | 2 ++ 3 files changed, 4 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 61f4ae6..b6dcab7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,6 +4,7 @@ plugins { alias(libs.plugins.kotlin.compose) alias(libs.plugins.jetbrains.kotlin.serialization) alias(libs.plugins.ksp) + alias(libs.plugins.google.services) alias(libs.plugins.crashlytics) } diff --git a/build.gradle.kts b/build.gradle.kts index 8459bd3..74aa0af 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,5 +4,6 @@ plugins { alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.ksp) apply false + alias(libs.plugins.google.services) apply false alias(libs.plugins.crashlytics) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bfd91da..6f286f1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,6 +2,7 @@ agp = "8.13.0" kotlin = "2.2.20" ksp = "2.2.20-2.0.4" +googleServices = "4.4.4" crashlytics = "3.0.6" coreKtx = "1.17.0" @@ -104,5 +105,6 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization"} +google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics" } From d3de429fe0eefbdded423995d856494d5a530ac8 Mon Sep 17 00:00:00 2001 From: marinantonio Date: Wed, 19 Nov 2025 20:09:25 +0000 Subject: [PATCH 4/4] Bump verzije --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b6dcab7..3b4050b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ android { applicationId = "com.am.stbus" minSdk = 23 targetSdk = 36 - versionCode = 81 + versionCode = 82 versionName = "4.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"