From 407d1cab246c63e8703012ae79e523758212e95e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 26 Jan 2024 14:49:45 +0100 Subject: [PATCH] Extract colors to avoid duplication and for more clarity. --- .../viewfolder/impl/file/ViewFileView.kt | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt index 5127d41828..39f14ef88f 100644 --- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt +++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt @@ -218,25 +218,30 @@ private fun LineRow( private fun String.toColor(colorationMode: ColorationMode): Color { return when (colorationMode) { ColorationMode.Logcat -> when (getOrNull(31)) { - 'D' -> Color(0xFF299999) - 'I' -> Color(0xFFABC023) - 'W' -> Color(0xFFBBB529) - 'E' -> Color(0xFFFF6B68) - 'A' -> Color(0xFFFF6B68) + 'D' -> colorDebug + 'I' -> colorInfo + 'W' -> colorWarning + 'E' -> colorError + 'A' -> colorError else -> ElementTheme.colors.textPrimary } ColorationMode.RustLogs -> when (getOrNull(32)) { 'E' -> ElementTheme.colors.textPrimary - 'G' -> Color(0xFF299999) - '0' -> Color(0xFFABC023) - 'N' -> Color(0xFFBBB529) - 'R' -> Color(0xFFFF6B68) + 'G' -> colorDebug + '0' -> colorInfo + 'N' -> colorWarning + 'R' -> colorError else -> ElementTheme.colors.textPrimary } ColorationMode.None -> ElementTheme.colors.textPrimary } } +private val colorDebug = Color(0xFF299999) +private val colorInfo = Color(0xFFABC023) +private val colorWarning = Color(0xFFBBB529) +private val colorError = Color(0xFFFF6B68) + @PreviewsDayNight @Composable internal fun ViewFileViewPreview(@PreviewParameter(ViewFileStateProvider::class) state: ViewFileState) = ElementPreview {