More refactoring

Cleanups, move classes to sane locations, etc.

app/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt

@@ -0,0 +1,37 @@
+package com.topjohnwu.magisk.ui.log
+
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.model.su.SuLog
+import com.topjohnwu.magisk.databinding.ObservableItem
+import com.topjohnwu.magisk.ktx.timeDateFormat
+import com.topjohnwu.magisk.ktx.toTime
+import com.topjohnwu.magisk.utils.set
+
+class LogRvItem(val item: SuLog) : ObservableItem<LogRvItem>() {
+
+    override val layoutRes = R.layout.item_log_access_md2
+
+    val date = item.time.toTime(timeDateFormat)
+
+    @get:Bindable
+    var isTop = false
+        set(value) = set(value, field, { field = it }, BR.top)
+
+    @get:Bindable
+    var isBottom = false
+        set(value) = set(value, field, { field = it }, BR.bottom)
+
+    override fun itemSameAs(other: LogRvItem) = item.appName == other.item.appName
+
+    override fun contentSameAs(other: LogRvItem) = item.fromUid == other.item.fromUid &&
+            item.toUid == other.item.toUid &&
+            item.fromPid == other.item.fromPid &&
+            item.packageName == other.item.packageName &&
+            item.command == other.item.command &&
+            item.action == other.item.action &&
+            item.time == other.item.time &&
+            isTop == other.isTop &&
+            isBottom == other.isBottom
+}

app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt

@@ -10,10 +10,9 @@ import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.model.entity.recycler.LogItem
-import com.topjohnwu.magisk.model.entity.recycler.TextItem
-import com.topjohnwu.magisk.model.events.SnackbarEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.utils.set
+import com.topjohnwu.magisk.view.TextItem
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -34,8 +33,8 @@ class LogViewModel(
 
     // --- su log
 
-    val items = diffListOf<LogItem>()
-    val itemBinding = itemBindingOf<LogItem> {
+    val items = diffListOf<LogRvItem>()
+    val itemBinding = itemBindingOf<LogRvItem> {
         it.bindExtra(BR.viewModel, this)
     }
 
@@ -47,7 +46,7 @@ class LogViewModel(
     override fun refresh() = viewModelScope.launch {
         consoleText = repo.fetchMagiskLogs()
         val (suLogs, diff) = withContext(Dispatchers.Default) {
-            val suLogs = repo.fetchSuLogs().map { LogItem(it) }
+            val suLogs = repo.fetchSuLogs().map { LogRvItem(it) }
             suLogs to items.calculateDiff(suLogs)
         }
         items.firstOrNull()?.isTop = false