Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Benoit Marty 2024-01-26 14:55:53 +01:00
parent 407d1cab24
commit 465748d26f
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@ open class ViewFileStateProvider : PreviewParameterProvider<ViewFileState> {
aViewFileState(lines = AsyncData.Failure(Exception("A failure"))), aViewFileState(lines = AsyncData.Failure(Exception("A failure"))),
aViewFileState(lines = AsyncData.Success(emptyList())), aViewFileState(lines = AsyncData.Success(emptyList())),
aViewFileState( aViewFileState(
name = "logcat.log",
lines = AsyncData.Success( lines = AsyncData.Success(
listOf( listOf(
"Line 1", "Line 1",
@ -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 E error",
"01-23 13:14:50.740 25818 25818 A assertion", "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> {
fun aViewFileState( fun aViewFileState(
name: String = "aName", name: String = "aName",
lines: AsyncData<List<String>> = AsyncData.Uninitialized, lines: AsyncData<List<String>> = AsyncData.Uninitialized,
colorationMode: ColorationMode = ColorationMode.None,
) = ViewFileState( ) = ViewFileState(
name = name, name = name,
lines = lines, lines = lines,
colorationMode = ColorationMode.Logcat, colorationMode = colorationMode,
eventSink = {}, eventSink = {},
) )

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

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