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

Rename ColorationMode.Logs to ColorationMode.RustLogs.

Browse source
This commit is contained in:
Benoit Marty 2024-01-26 14:46:51 +01:00
parent feed0ada86
commit 52e0137904
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ class ViewFilePresenter @AssistedInject constructor(
private fun String.toColorationMode(): ColorationMode { private fun String.toColorationMode(): ColorationMode {
return when { return when {
equals("logcat.log") -> ColorationMode.Logcat equals("logcat.log") -> ColorationMode.Logcat
startsWith("logs.") -> ColorationMode.Logs startsWith("logs.") -> ColorationMode.RustLogs
else -> ColorationMode.None else -> ColorationMode.None
} }
} }

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

@ -27,6 +27,6 @@ data class ViewFileState(
enum class ColorationMode { enum class ColorationMode {
Logcat, Logcat,
Logs, RustLogs,
None, None,
} }

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

@ -210,7 +210,7 @@ private fun LineRow(
* Ex for logcat: * Ex for logcat:
* `01-23 13:14:50.740 25818 25818 D org.matrix.rust.sdk: elementx: SyncIndicator = Hide | RustRoomListService.kt:81` * `01-23 13:14:50.740 25818 25818 D org.matrix.rust.sdk: elementx: SyncIndicator = Hide | RustRoomListService.kt:81`
* ^ use this char to determine the color * ^ use this char to determine the color
* Ex for logs: * Ex for Rust logs:
* `2024-01-26T10:22:26.947416Z WARN elementx: Restore with non-empty map | MatrixClientsHolder.kt:68` * `2024-01-26T10:22:26.947416Z WARN elementx: Restore with non-empty map | MatrixClientsHolder.kt:68`
* ^ use this char to determine the color, see [LogLevel] * ^ use this char to determine the color, see [LogLevel]
*/ */
@ -225,7 +225,7 @@ private fun String.toColor(colorationMode: ColorationMode): Color {
'A' -> Color(0xFFFF6B68) 'A' -> Color(0xFFFF6B68)
else -> ElementTheme.colors.textPrimary else -> ElementTheme.colors.textPrimary
} }
ColorationMode.Logs -> when (getOrNull(32)) { ColorationMode.RustLogs -> when (getOrNull(32)) {
'E' -> ElementTheme.colors.textPrimary 'E' -> ElementTheme.colors.textPrimary
'G' -> Color(0xFF299999) 'G' -> Color(0xFF299999)
'0' -> Color(0xFFABC023) '0' -> Color(0xFFABC023)

2
features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/ViewFilePresenterTest.kt
View file

@ -76,7 +76,7 @@ class ViewFilePresenterTest {
presenter.present() presenter.present()
}.test { }.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.colorationMode).isEqualTo(ColorationMode.Logs) assertThat(initialState.colorationMode).isEqualTo(ColorationMode.RustLogs)
cancelAndConsumeRemainingEvents() cancelAndConsumeRemainingEvents()
} }
} }