Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ 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)
}

android {
Expand All @@ -15,7 +17,7 @@ android {
minSdk = 23
targetSdk = 36
versionCode = 81
versionName = "4.0.0"
versionName = "4.0.1"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -56,7 +58,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)

Expand All @@ -66,6 +67,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)
Expand Down
9 changes: 3 additions & 6 deletions app/src/main/java/com/am/stbus/SplitBusApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/am/stbus/common/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ val appModule = module {
Room.databaseBuilder(
androidContext(),
AppDatabase::class.java, "split-bus-db"
).build()
).fallbackToDestructiveMigration(true).build()
}

single<FavouriteItemDao> {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/am/stbus/data/static/BusLinesData.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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")
)

Expand Down
9 changes: 4 additions & 5 deletions app/src/main/res/values-hr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@

<!-- MainActivity -->
<string name="nav_favourites">Favoriti</string>
<string name="nav_bus_stops">Autobusne stanice</string>
<string name="nav_bus_stops">Stanice</string>
<string name="nav_timetables">Vozni redovi</string>
<string name="nav_information">Informacije</string>
<string name="nav_settings">Postavke</string>


<!-- Favourites -->
<string name="favourite_empty_title">Nema favorita!</string>
<string name="favourite_empty_message">Označite omiljene linije kako bi se pojavile na početnoj stranici</string>
Expand Down Expand Up @@ -317,9 +316,9 @@
<string name="bus602">Ravnički Most - Omiš - Split</string>
<string name="bus391">Kaštel Stari - Rudine</string>
<string name="bus392">Rudine - Kaštel Stari</string>
<string name="bus39A1">Kaštel Stari - Train station</string>
<string name="bus39A2">Train station - Kaštel Stari</string>
<string name="trostdirekt">Trogir - Split (direct)</string>
<string name="bus39A1">Kaštel Stari - Željeznička stanica</string>
<string name="bus39A2">Željeznička stanica - Kaštel Stari</string>
<string name="trostdirekt">Trogir - Split (direktna)</string>


<!-- Prigradski busevi -->
Expand Down
41 changes: 0 additions & 41 deletions build.gradle

This file was deleted.

2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +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
}
10 changes: 10 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
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"
junit = "4.13.2"
Expand All @@ -25,6 +27,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"
Expand Down Expand Up @@ -75,6 +79,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 = "firebase-bom", version.ref = "firebaseBom" }
firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
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" }
koin-compose = { module = "io.insert-koin:koin-androidx-compose" }
Expand All @@ -97,4 +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" }