From 9bf7c1ccf8dac08d9abb3929870c5ccf62bb8187 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 9 Dec 2022 15:43:32 +0100 Subject: [PATCH] Log with Timber. --- .../java/io/element/android/x/core/compose/LogCompositions.kt | 4 ++-- .../core/src/main/java/io/element/android/x/core/data/Try.kt | 4 ++-- .../android/x/designsystem/components/avatar/Avatar.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt b/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt index ab2daa385a..16f57ab409 100644 --- a/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt +++ b/libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt @@ -1,10 +1,10 @@ package io.element.android.x.core.compose -import android.util.Log import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.runtime.remember import io.element.android.x.core.BuildConfig +import timber.log.Timber // Note the inline function below which ensures that this function is essentially // copied at the call site to ensure that its logging only recompositions from the @@ -14,7 +14,7 @@ fun LogCompositions(tag: String, msg: String) { if (BuildConfig.DEBUG) { val ref = remember { Ref(0) } SideEffect { ref.value++ } - Log.d(tag, "Compositions: $msg ${ref.value}") + Timber.d(tag, "Compositions: $msg ${ref.value}") } } diff --git a/libraries/core/src/main/java/io/element/android/x/core/data/Try.kt b/libraries/core/src/main/java/io/element/android/x/core/data/Try.kt index 6c3cfa8599..d6a4148ee1 100644 --- a/libraries/core/src/main/java/io/element/android/x/core/data/Try.kt +++ b/libraries/core/src/main/java/io/element/android/x/core/data/Try.kt @@ -1,13 +1,13 @@ package io.element.android.x.core.data -import android.util.Log +import timber.log.Timber inline fun tryOrNull(message: String? = null, operation: () -> A): A? { return try { operation() } catch (any: Throwable) { if (message != null) { - Log.e("TAG", message, any) + Timber.e("TAG", message, any) } null } diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt index 248c0c2158..cdd1e4bb5b 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt @@ -1,6 +1,5 @@ package io.element.android.x.designsystem.components.avatar -import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.size @@ -18,6 +17,7 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import io.element.android.x.designsystem.AvatarGradientEnd import io.element.android.x.designsystem.AvatarGradientStart +import timber.log.Timber @Composable fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) { @@ -45,7 +45,7 @@ private fun ImageAvatar( AsyncImage( model = avatarData.model, onError = { - Log.e("TAG", "Error $it\n${it.result}", it.result.throwable) + Timber.e("TAG", "Error $it\n${it.result}", it.result.throwable) }, contentDescription = null, contentScale = ContentScale.Crop,