From 42606162b26f72cfe59ce2ae486c627a454530bc Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Thu, 21 Nov 2019 18:21:08 +0100
Subject: [PATCH] Fixed text color in logs not changing with theme

---
 .../model/entity/recycler/ConsoleRvItem.kt    |  6 ++++-
 .../magisk/redesign/log/LogViewModel.kt       |  4 +--
 app/src/main/res/layout/item_console_md2.xml  | 27 +++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/layout/item_console_md2.xml

diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ConsoleRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ConsoleRvItem.kt
index e890f9f2d..d5d391945 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ConsoleRvItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ConsoleRvItem.kt
@@ -6,7 +6,7 @@ import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
 
-class ConsoleRvItem(val item: String) : LenientRvItem<ConsoleRvItem>() {
+open class ConsoleRvItem(val item: String) : LenientRvItem<ConsoleRvItem>() {
     override val layoutRes: Int = R.layout.item_console
 
     override fun onBindingBound(binding: ViewDataBinding, recyclerView: RecyclerView) {
@@ -23,4 +23,8 @@ class ConsoleRvItem(val item: String) : LenientRvItem<ConsoleRvItem>() {
 
     override fun contentSameAs(other: ConsoleRvItem) = itemSameAs(other)
     override fun itemSameAs(other: ConsoleRvItem) = item == other.item
+}
+
+class ConsoleItem(item: String) : ConsoleRvItem(item) {
+    override val layoutRes = R.layout.item_console_md2
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/log/LogViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/log/LogViewModel.kt
index 2865c62dd..5c69c2239 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/log/LogViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/log/LogViewModel.kt
@@ -8,7 +8,7 @@ import com.topjohnwu.magisk.data.repository.LogRepository
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.model.binding.BindingAdapter
-import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
+import com.topjohnwu.magisk.model.entity.recycler.ConsoleItem
 import com.topjohnwu.magisk.model.entity.recycler.LogItem
 import com.topjohnwu.magisk.model.events.SnackbarEvent
 import com.topjohnwu.magisk.redesign.compat.CompatViewModel
@@ -58,8 +58,8 @@ class LogViewModel(
             .ignoreElement()
 
         val console = repo.fetchMagiskLogs()
+            .map { ConsoleItem(it) }
             .toList()
-            .map { it.map { ConsoleRvItem(it) } }
             .observeOn(Schedulers.computation())
             .map { it to itemsConsole.calculateDiff(it) }
             .observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/res/layout/item_console_md2.xml b/app/src/main/res/layout/item_console_md2.xml
new file mode 100644
index 000000000..98e3663dc
--- /dev/null
+++ b/app/src/main/res/layout/item_console_md2.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="item"
+            type="com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem" />
+
+        <!--no actions are required-->
+        <variable
+            name="viewModel"
+            type="Object" />
+
+    </data>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="monospace"
+        android:text="@{item.item}"
+        android:textAppearance="?appearanceTextCaptionNormal"
+        android:textSize="10sp"
+        tools:text="@tools:sample/lorem/random" />
+
+</layout>