[fix]: jumping logs list in selection mode

F0x1d · Nov 3, 2024 · 5eae9b4 · 5eae9b4
1 parent d0ac7d6
commit 5eae9b4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/...ging/list/src/main/kotlin/com/f0x1d/logfox/feature/logging/list/presentation/LogsState.kt b/...ging/list/src/main/kotlin/com/f0x1d/logfox/feature/logging/list/presentation/LogsState.kt
@@ -5,6 +5,7 @@ import com.f0x1d.logfox.model.logline.LogLine
 
 data class LogsState(
     val logs: List<LogLine> = emptyList(),
+    val logsChanged: Boolean = true,
     val paused: Boolean = false,
     val query: String? = null,
     val filters: List<UserFilter> = emptyList(),

diff --git a/.../list/src/main/kotlin/com/f0x1d/logfox/feature/logging/list/presentation/LogsViewModel.kt b/.../list/src/main/kotlin/com/f0x1d/logfox/feature/logging/list/presentation/LogsViewModel.kt
@@ -58,9 +58,12 @@ class LogsViewModel @Inject constructor(
     val logsExpanded get() = appPreferences.logsExpanded
     val logsFormat get() = appPreferences.showLogValues
 
-    val selectedItemsContent get() = currentState.selectedItems.joinToString("\n") {
-        originalOf(it)
-    }
+    val selectedItemsContent get() = currentState
+        .selectedItems
+        .sortedBy { it.dateAndTime }
+        .joinToString("\n") {
+            originalOf(it)
+        }
 
     init {
         load()
@@ -71,7 +74,11 @@ class LogsViewModel @Inject constructor(
             state
                 .map { it.selectedItems }
                 .distinctUntilChanged()
-                .onEach { selectedLogLinesDataSource.updateSelectedLines(it.toList()) }
+                .onEach { lines ->
+                    selectedLogLinesDataSource.updateSelectedLines(
+                        selectedLines = lines.sortedBy { it.dateAndTime },
+                    )
+                }
                 .launchIn(this)
 
             combine(
@@ -119,7 +126,7 @@ class LogsViewModel @Inject constructor(
                     logs = data.logs.filterAndSearch(
                         filters = data.filters,
                         query = data.query,
-                    )
+                    ),
                 )
             }.flowOn(
                 defaultDispatcher,
@@ -129,6 +136,7 @@ class LogsViewModel @Inject constructor(
                         logs = data.logs,
                         query = data.query,
                         filters = data.filters,
+                        logsChanged = true,
                     )
                 }
             }.launchIn(this)
@@ -143,7 +151,8 @@ class LogsViewModel @Inject constructor(
                 ) else remove(
                     logLine
                 )
-            }
+            },
+            logsChanged = false,
         )
     }
 
@@ -154,6 +163,7 @@ class LogsViewModel @Inject constructor(
             } else {
                 logs.toSet()
             },
+            logsChanged = false,
         )
     }
 
@@ -171,9 +181,9 @@ class LogsViewModel @Inject constructor(
         }
     }
 
-    fun switchState() = reduce { copy(paused = paused.not()) }
-    fun pause() = reduce { copy(paused = true) }
-    fun resume() = reduce { copy(paused = false) }
+    fun switchState() = reduce { copy(paused = paused.not(), logsChanged = false) }
+    fun pause() = reduce { copy(paused = true, logsChanged = false) }
+    fun resume() = reduce { copy(paused = false, logsChanged = false) }
 
     fun originalOf(logLine: LogLine): String = appPreferences.originalOf(
         logLine = logLine,
@@ -182,7 +192,10 @@ class LogsViewModel @Inject constructor(
     )
 
     fun clearSelection() = reduce {
-        copy(selectedItems = emptySet())
+        copy(
+            selectedItems = emptySet(),
+            logsChanged = false,
+        )
     }
 
     private data class LogsData(

diff --git a/...ain/kotlin/com/f0x1d/logfox/feature/logging/list/presentation/ui/fragment/LogsFragment.kt b/...ain/kotlin/com/f0x1d/logfox/feature/logging/list/presentation/ui/fragment/LogsFragment.kt
@@ -161,7 +161,9 @@ class LogsFragment : BaseFragment<FragmentLogsBinding>() {
             processSelectedItems(selectedItems = state.selectedItems)
             processPaused(paused = state.paused)
 
-            updateLogsList(items = state.logs)
+            if (state.logsChanged) {
+                updateLogsList(items = state.logs)
+            }
         }
 
         requireActivity().onBackPressedDispatcher.apply {