Skip to content

Commit e918a4e

Browse files
committed
Nova verzija 4.0.1
1 parent 717cae0 commit e918a4e

File tree

8 files changed

+26
-58
lines changed

8 files changed

+26
-58
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
alias(libs.plugins.kotlin.compose)
55
alias(libs.plugins.jetbrains.kotlin.serialization)
66
alias(libs.plugins.ksp)
7+
alias(libs.plugins.crashlytics)
78
}
89

910
android {
@@ -15,7 +16,7 @@ android {
1516
minSdk = 23
1617
targetSdk = 36
1718
versionCode = 81
18-
versionName = "4.0.0"
19+
versionName = "4.0.1"
1920

2021
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2122
}
@@ -56,7 +57,6 @@ dependencies {
5657
implementation(libs.androidx.ui.tooling.preview)
5758
implementation(libs.androidx.material3)
5859

59-
//implementation(libs.androidx.navigation3)
6060
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
6161
implementation(libs.kotlinx.serialization.core)
6262

@@ -66,6 +66,10 @@ dependencies {
6666
ksp(libs.room.compiler)
6767
implementation(libs.room.ktx)
6868

69+
implementation(platform(libs.firebase.bom))
70+
implementation(libs.firebase.crashlytics)
71+
implementation(libs.firebase.analytics)
72+
6973
implementation(platform(libs.koin.bom))
7074
implementation(libs.koin.android)
7175
implementation(libs.koin.compose)

app/src/main/java/com/am/stbus/SplitBusApplication.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import com.am.stbus.common.di.viewModelModule
3333
import com.jakewharton.threetenabp.AndroidThreeTen
3434
import org.koin.android.ext.koin.androidContext
3535
import org.koin.core.context.startKoin
36-
import timber.log.Timber
3736

3837
class SplitBusApplication : Application() {
3938

@@ -69,11 +68,9 @@ class SplitBusApplication : Application() {
6968
}
7069

7170
private fun setupTimber() {
72-
Timber.plant(Timber.DebugTree())
73-
74-
/* if (BuildConfig.DEBUG) {
75-
Timber.plant(Timber.DebugTree())
76-
}*/
71+
/* if (BuildConfig.DEBUG) {
72+
Timber.plant(Timber.DebugTree())
73+
}*/
7774
}
7875

7976
private fun setupThreeTen() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ val appModule = module {
4242
Room.databaseBuilder(
4343
androidContext(),
4444
AppDatabase::class.java, "split-bus-db"
45-
).build()
45+
).fallbackToDestructiveMigration(true).build()
4646
}
4747

4848
single<FavouriteItemDao> {

app/src/main/java/com/am/stbus/data/static/BusLinesData.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ val URBAN_AREA_BUS_LINES = listOf(
6464
BusLine(id = 100, title = R.string.bus1, number = "1", websiteTitle = "1 BUNJE"),
6565
BusLine(id = 101, title = R.string.bus021, number = "2", websiteTitle = "2 SPLIT"),
6666
BusLine(id = 102, title = R.string.bus022, number = "2", websiteTitle = "2 ZRAČNA"),
67-
BusLine(id = 103, title = R.string.bus2A, number = "2A", websiteTitle = "2A K.SUĆURAC"),
67+
BusLine(id = 103, title = R.string.bus2A, number = "2A", websiteTitle = "2A K. SUĆURAC"),
6868
BusLine(id = 104, title = R.string.bus5, number = "5", websiteTitle = "5 DRAČEVAC"),
6969
BusLine(id = 105, title = R.string.bus5A, number = "5A", websiteTitle = "5A DRAČEVAC"),
7070
BusLine(id = 106, title = R.string.bus10, number = "10", websiteTitle = "10 JAPIRKO"),
@@ -124,9 +124,9 @@ val SUBURBAN_AREA_BUS_LINES = listOf(
124124
BusLine(id = 520, title = R.string.bus861, number = "86", websiteTitle = "86 SPLIT"),
125125
BusLine(id = 521, title = R.string.bus862, number = "86", websiteTitle = "86 KLADNJICE"),
126126
BusLine(id = 522, title = R.string.bus900, number = "90", websiteTitle = "90 SITNO"),
127-
BusLine(id = 523, title = R.string.bus911, number = "91", websiteTitle = "91 K.STARI"),
127+
BusLine(id = 523, title = R.string.bus911, number = "91", websiteTitle = "91 K. STARI"),
128128
BusLine(id = 524, title = R.string.bus912, number = "91", websiteTitle = "91 DIVOJEVIĆI"),
129-
BusLine(id = 525, title = R.string.bus931, number = "93", websiteTitle = "93 K.STARI"),
129+
BusLine(id = 525, title = R.string.bus931, number = "93", websiteTitle = "93 K. STARI"),
130130
BusLine(id = 526, title = R.string.bus932, number = "93", websiteTitle = "93 ŠERIĆI")
131131
)
132132

app/src/main/res/values-hr/strings.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@
2727

2828
<!-- MainActivity -->
2929
<string name="nav_favourites">Favoriti</string>
30-
<string name="nav_bus_stops">Autobusne stanice</string>
30+
<string name="nav_bus_stops">Stanice</string>
3131
<string name="nav_timetables">Vozni redovi</string>
3232
<string name="nav_information">Informacije</string>
3333
<string name="nav_settings">Postavke</string>
3434

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

324323

325324
<!-- Prigradski busevi -->

build.gradle

Lines changed: 0 additions & 41 deletions
This file was deleted.

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ plugins {
44
alias(libs.plugins.kotlin.android) apply false
55
alias(libs.plugins.kotlin.compose) apply false
66
alias(libs.plugins.ksp) apply false
7+
alias(libs.plugins.crashlytics) apply false
78
}

gradle/libs.versions.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
agp = "8.13.0"
33
kotlin = "2.2.20"
44
ksp = "2.2.20-2.0.4"
5+
crashlytics = "3.0.6"
56

67
coreKtx = "1.17.0"
78
junit = "4.13.2"
@@ -25,6 +26,8 @@ kotlinxSerializationCore = "1.9.0"
2526

2627
room = "2.8.3"
2728

29+
firebaseBom = "34.6.0"
30+
2831
koinBom = "4.1.1"
2932
retrofit = "3.0.0"
3033
navigationFragmentKtx = "2.9.4"
@@ -75,6 +78,10 @@ room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "
7578
room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
7679
room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
7780

81+
firebase-bom = { group = "com.google.firebase", name = "koin-bom", version.ref = "firebaseBom" }
82+
firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
83+
firebase-analytics = { group = "com.google.firebase", name = "koin-android" }
84+
7885
koin-bom = { group = "io.insert-koin", name = "koin-bom", version.ref = "koinBom" }
7986
koin-android = { module = "io.insert-koin:koin-android" }
8087
koin-compose = { module = "io.insert-koin:koin-androidx-compose" }
@@ -97,4 +104,5 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
97104
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
98105
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
99106
jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization"}
107+
crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics" }
100108

0 commit comments

Comments
 (0)