Skip to content

Commit 172a052

Browse files
authored
Merge pull request #76 from android/kermit
Integrate Kermit for logging
2 parents 61bb0e0 + e2156c6 commit 172a052

File tree

4 files changed

+23
-1
lines changed

4 files changed

+23
-1
lines changed

Fruitties/gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ skie = "0.10.2"
3434
sqlite = "2.5.1"
3535
spotless = "7.0.4"
3636
okio = "3.12.0"
37+
kermit = "2.0.4"
3738
runner = "1.6.2"
3839
core = "1.6.1"
3940
junit = "1.2.1"
@@ -74,6 +75,7 @@ androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runt
7475
androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "nav3Core" }
7576
androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycleViewmodelNav3" }
7677
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" }
78+
kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
7779

7880
[plugins]
7981
androidApplication = { id = "com.android.application", version.ref = "agp" }

Fruitties/shared/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ kotlin {
9898
api(libs.androidx.datastore.preferences.core)
9999
api(libs.androidx.datastore.core.okio)
100100
implementation(libs.okio)
101+
implementation(libs.kermit)
101102
}
102103
}
103104

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/CartViewModel.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.example.fruitties.viewmodel
1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.ViewModelProvider
2121
import androidx.lifecycle.viewModelScope
22+
import co.touchlab.kermit.Logger
2223
import com.example.fruitties.DataRepository
2324
import com.example.fruitties.model.CartItemDetails
2425
import kotlinx.coroutines.flow.SharingStarted
@@ -30,6 +31,18 @@ class CartViewModel(
3031
private val repository: DataRepository,
3132
) : ViewModel() {
3233

34+
<<<<<<< kermit
35+
init {
36+
Logger.i { "CartViewModel created" }
37+
}
38+
39+
override fun onCleared() {
40+
super.onCleared()
41+
Logger.i { "CartViewModel cleared" }
42+
}
43+
44+
=======
45+
>>>>>>> mlykotom/ios-viewmodel-scoping
3346
val cartUiState: StateFlow<CartUiState> =
3447
repository.cartDetails
3548
.map { details ->

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/MainViewModel.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.example.fruitties.viewmodel
1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.ViewModelProvider
2121
import androidx.lifecycle.viewModelScope
22+
import co.touchlab.kermit.Logger
2223
import com.example.fruitties.DataRepository
2324
import com.example.fruitties.model.Fruittie
2425
import kotlinx.coroutines.flow.SharingStarted
@@ -32,7 +33,12 @@ class MainViewModel(
3233
) : ViewModel() {
3334

3435
init {
35-
println("hello from ios!")
36+
Logger.i { "MainViewModel created" }
37+
}
38+
39+
override fun onCleared() {
40+
super.onCleared()
41+
Logger.i { "MainViewModel cleared" }
3642
}
3743

3844
val homeUiState: StateFlow<HomeUiState> =

0 commit comments

Comments
 (0)