Browse Source

Add preview for Rust logs (and fix a bug!)

pull/2299/head
Benoit Marty 8 months ago
parent
commit
7efbee8f86
  1. 24
      features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileStateProvider.kt
  2. 2
      features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt

24
features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileStateProvider.kt

@ -27,6 +27,7 @@ open class ViewFileStateProvider : PreviewParameterProvider<ViewFileState> { @@ -27,6 +27,7 @@ open class ViewFileStateProvider : PreviewParameterProvider<ViewFileState> {
aViewFileState(lines = AsyncData.Failure(Exception("A failure"))),
aViewFileState(lines = AsyncData.Success(emptyList())),
aViewFileState(
name = "logcat.log",
lines = AsyncData.Success(
listOf(
"Line 1",
@ -40,7 +41,25 @@ open class ViewFileStateProvider : PreviewParameterProvider<ViewFileState> { @@ -40,7 +41,25 @@ open class ViewFileStateProvider : PreviewParameterProvider<ViewFileState> {
"01-23 13:14:50.740 25818 25818 E error",
"01-23 13:14:50.740 25818 25818 A assertion",
)
)
),
colorationMode = ColorationMode.Logcat,
),
aViewFileState(
name = "logs.2024-01-26",
lines = AsyncData.Success(
listOf(
"Line 1",
"Line 2",
"Line 3 lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor" +
" incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,",
"2024-01-26T10:22:26.947416Z TRACE trace",
"2024-01-26T10:22:26.947416Z DEBUG debug",
"2024-01-26T10:22:26.947416Z INFO info",
"2024-01-26T10:22:26.947416Z WARN warn",
"2024-01-26T10:22:26.947416Z ERROR error",
)
),
colorationMode = ColorationMode.RustLogs,
)
)
}
@ -48,9 +67,10 @@ open class ViewFileStateProvider : PreviewParameterProvider<ViewFileState> { @@ -48,9 +67,10 @@ open class ViewFileStateProvider : PreviewParameterProvider<ViewFileState> {
fun aViewFileState(
name: String = "aName",
lines: AsyncData<List<String>> = AsyncData.Uninitialized,
colorationMode: ColorationMode = ColorationMode.None,
) = ViewFileState(
name = name,
lines = lines,
colorationMode = ColorationMode.Logcat,
colorationMode = colorationMode,
eventSink = {},
)

2
features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt

@ -228,7 +228,7 @@ private fun String.toColor(colorationMode: ColorationMode): Color { @@ -228,7 +228,7 @@ private fun String.toColor(colorationMode: ColorationMode): Color {
ColorationMode.RustLogs -> when (getOrNull(32)) {
'E' -> ElementTheme.colors.textPrimary
'G' -> colorDebug
'0' -> colorInfo
'O' -> colorInfo
'N' -> colorWarning
'R' -> colorError
else -> ElementTheme.colors.textPrimary

Loading…
Cancel
Save