From 68e6ec3e8f8acfb601ea2c5bc0111404f8b601a0 Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Mon, 5 Aug 2024 05:56:06 +0300 Subject: [PATCH] logging with Napier --- composeApp/build.gradle.kts | 2 +- composeApp/src/commonMain/kotlin/dev/meloda/overseerr/App.kt | 5 +++++ .../kotlin/dev/meloda/overseerr/screens/url/UrlViewModel.kt | 3 ++- gradle/libs.versions.toml | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index db055e6..90c7640 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -66,7 +66,6 @@ kotlin { implementation(libs.ktor.core) implementation(libs.ktor.client.cio) implementation(libs.kotlinx.serialization.json) - implementation(libs.multiplatformSettings) implementation(libs.koin.core) implementation(libs.koin.compose) implementation(libs.androidx.lifecycle.viewmodel.compose) @@ -74,6 +73,7 @@ kotlin { implementation(libs.haze.materials) implementation(libs.kstore) implementation(libs.kstore.file) + implementation(libs.napier) } commonTest.dependencies { diff --git a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/App.kt b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/App.kt index ec73908..ee7fc41 100644 --- a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/App.kt +++ b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/App.kt @@ -10,6 +10,8 @@ import cafe.adriel.voyager.transitions.FadeTransition import dev.meloda.overseerr.screens.main.MainScreen import dev.meloda.overseerr.settings.SettingsController import dev.meloda.overseerr.theme.AppTheme +import io.github.aakira.napier.DebugAntilog +import io.github.aakira.napier.Napier import org.koin.compose.KoinContext import org.koin.compose.koinInject @@ -17,6 +19,9 @@ var appDir: String = "" @Composable internal fun App() = KoinContext { + LaunchedEffect(true) { + Napier.base(DebugAntilog()) + } val settingsController: SettingsController = koinInject() diff --git a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/UrlViewModel.kt b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/UrlViewModel.kt index f437293..dae7cf4 100644 --- a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/UrlViewModel.kt +++ b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/UrlViewModel.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope import dev.meloda.overseerr.ext.setValue import dev.meloda.overseerr.screens.url.model.UrlScreenState import dev.meloda.overseerr.settings.SettingsController +import io.github.aakira.napier.Napier import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.launchIn @@ -53,6 +54,6 @@ class UrlViewModelImpl( } override fun onTestButtonClicked() { - + Napier.v("Test button clicked") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1c905a3..d823a68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,12 +10,12 @@ coil = "3.0.0-alpha09" kotlinx-coroutines = "1.9.0-RC" ktor = "3.0.0-beta-2" kotlinx-serialization = "1.7.1" -multiplatformSettings = "1.1.1" koin = "4.0.0-RC1" viewmodel-compose = "2.8.0" haze = "0.7.3" kstore = "0.8.0" appdirs = "1.2.2" +napier = "2.7.1" [libraries] @@ -36,7 +36,6 @@ ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" } ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } -multiplatformSettings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" } koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin" } haze = { module = "dev.chrisbanes.haze:haze", version.ref = "haze" } @@ -44,6 +43,7 @@ haze-materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref = kstore = { module = "io.github.xxfast:kstore", version.ref = "kstore" } kstore-file = { module = "io.github.xxfast:kstore-file", version.ref = "kstore" } appdirs = { module = "net.harawata:appdirs", version.ref = "appdirs" } +napier = { module = "io.github.aakira:napier", version.ref = "napier" } [plugins]