Browse Source

Rename `ColorationMode.Logs` to `ColorationMode.RustLogs`.

pull/2299/head
Benoit Marty 8 months ago
parent
commit
f55cfd1160
  1. 2
      features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFilePresenter.kt
  2. 2
      features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileState.kt
  3. 4
      features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt
  4. 2
      features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/ViewFilePresenterTest.kt

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

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

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

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

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

@ -210,7 +210,7 @@ private fun LineRow( @@ -210,7 +210,7 @@ private fun LineRow(
* Ex for logcat:
* `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
* Ex for logs:
* Ex for Rust logs:
* `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]
*/
@ -225,7 +225,7 @@ private fun String.toColor(colorationMode: ColorationMode): Color { @@ -225,7 +225,7 @@ private fun String.toColor(colorationMode: ColorationMode): Color {
'A' -> Color(0xFFFF6B68)
else -> ElementTheme.colors.textPrimary
}
ColorationMode.Logs -> when (getOrNull(32)) {
ColorationMode.RustLogs -> when (getOrNull(32)) {
'E' -> ElementTheme.colors.textPrimary
'G' -> Color(0xFF299999)
'0' -> Color(0xFFABC023)

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

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

Loading…
Cancel
Save