Refactor: Streamline Recorder UI and add discard functionality

This commit simplifies the `RecorderScreen` by removing the `LogFileAdapter` and integrating its logic directly into the Composable. It also introduces a "Discard" option, allowing users to delete the recorded session and its associated files.

The `RecorderViewModel` now handles the session path and zip path more robustly, and the UI reflects the working state more accurately. The `onCancelClick` callback in `RecorderScreenHost` has been updated to trigger the discard action in the ViewModel.

Author: d4rken

app/src/main/java/eu/darken/butler/common/debug/recorder/core/Recorder.kt

@@ -2,7 +2,7 @@ package eu.darken.butler.common.debug.recorder.core
 
 import eu.darken.butler.common.debug.logging.FileLogger
 import eu.darken.butler.common.debug.logging.Logging
-import eu.darken.butler.common.debug.logging.Logging.Priority.*
+import eu.darken.butler.common.debug.logging.Logging.Priority.INFO
 import eu.darken.butler.common.debug.logging.log
 import eu.darken.butler.common.debug.logging.logTag
 import kotlinx.coroutines.sync.Mutex
@@ -38,7 +38,7 @@ class Recorder @Inject constructor() {
     }
 
     companion object {
-        internal val TAG = logTag("Debug", "Log", "eu.darken.butler.common.debug.recording.core.Recorder")
+        internal val TAG = logTag("Debug", "Log", "Recorder")
     }
 
 }

app/src/main/java/eu/darken/butler/common/debug/recorder/ui/LogFileAdapter.kt

@@ -47,7 +47,6 @@ class RecorderActivity : Activity2() {
                         ErrorEventHandler(vm)
                         RecorderScreenHost(
                             viewModel = vm,
-                            onCancelClick = { finish() }
                         )
                     }
                 }

app/src/main/java/eu/darken/butler/common/debug/recorder/ui/RecorderActivity.kt

@@ -27,9 +27,9 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
-import androidx.compose.material.icons.twotone.BugReport
 import androidx.compose.material.icons.filled.Folder
 import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material.icons.twotone.BugReport
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
@@ -67,7 +67,6 @@ import java.io.File
 @Composable
 fun RecorderScreenHost(
     viewModel: RecorderViewModel,
-    onCancelClick: () -> Unit
 ) {
     val state by viewModel.state.collectAsState(null)
     val context = LocalContext.current
@@ -81,7 +80,7 @@ fun RecorderScreenHost(
     state?.let { currentState ->
         RecorderScreen(
             state = currentState,
-            onCancelClick = onCancelClick,
+            onCancelClick = { viewModel.discard() },
             onShareClick = { viewModel.share() },
             onPrivacyPolicyClick = { viewModel.goPrivacyPolicy() }
         )
@@ -119,7 +118,7 @@ private fun RecorderScreen(
                     shadowElevation = 8.dp
                 ) {
                     ActionButtons(
-                        loading = state.loading,
+                        loading = state.isWorking,
                         onCancelClick = onCancelClick,
                         onShareClick = onShareClick,
                         modifier = Modifier.padding(16.dp)
@@ -161,7 +160,7 @@ private fun RecorderScreen(
 
             item {
                 AnimatedVisibility(
-                    visible = !state.loading,
+                    visible = !state.isWorking,
                     enter = fadeIn(animationSpec = tween(300)),
                     exit = fadeOut(animationSpec = tween(300))
                 ) {
@@ -310,7 +309,7 @@ private fun WarningCard(onPrivacyPolicyClick: () -> Unit) {
 }
 
 @Composable
-private fun SessionInfoCard(logDir: File) {
+private fun SessionInfoCard(logDir: File?) {
     ElevatedCard(
         modifier = Modifier.fillMaxWidth(),
         colors = CardDefaults.elevatedCardColors(
@@ -351,7 +350,7 @@ private fun SessionInfoCard(logDir: File) {
                     shape = RoundedCornerShape(8.dp)
                 ) {
                     Text(
-                        text = "${logDir.path}/",
+                        text = logDir?.let { "${it.path}/" } ?: "?",
                         style = MaterialTheme.typography.bodySmall.copy(
                             fontFamily = androidx.compose.ui.text.font.FontFamily.Monospace
                         ),

app/src/main/java/eu/darken/butler/common/debug/recorder/ui/RecorderScreen.kt

@@ -15,6 +15,7 @@ import eu.darken.butler.common.compression.Zipper
 import eu.darken.butler.common.coroutine.DispatcherProvider
 import eu.darken.butler.common.debug.logging.log
 import eu.darken.butler.common.debug.logging.logTag
+import eu.darken.butler.common.files.core.local.deleteAll
 import eu.darken.butler.common.flow.DynamicStateFlow
 import eu.darken.butler.common.flow.SingleEventFlow
 import eu.darken.butler.common.navigation.NavigationController
@@ -27,31 +28,29 @@ import javax.inject.Inject
 class RecorderViewModel @Inject constructor(
     navCtrl: NavigationController,
     dispatchers: DispatcherProvider,
-    savedStateHandle: SavedStateHandle,
+    handle: SavedStateHandle,
     @param:ApplicationContext private val context: Context,
     private val webpageTool: WebpageTool,
-) : ViewModel4(dispatchers, logTag("Debug", "Recorder","Screen","VM"), navCtrl) {
+) : ViewModel4(dispatchers, logTag("Debug", "Recorder", "Screen", "VM"), navCtrl) {
 
-    private val recordedPath: File
+    private val sessionPath = handle.get<String>(RecorderActivity.RECORD_PATH)?.let { File(it) }
+    private val zipPath = sessionPath?.let { File(it.parentFile, "${it.name}.zip") }
 
-    private val stater: DynamicStateFlow<State>
-    val state: Flow<State>
+    private val stater = DynamicStateFlow(TAG, vmScope) {
+        State(logDir = sessionPath)
+    }
+
+    val state: Flow<State> = stater.flow
 
     val shareEvent = SingleEventFlow<Intent>()
 
     init {
-        val path = savedStateHandle.get<String>(RecorderActivity.RECORD_PATH)
-            ?: throw IllegalStateException("No path provided")
-        recordedPath = File(path)
+        launch {
+            if (sessionPath == null) throw IllegalStateException("No recorded path found")
 
-        stater = DynamicStateFlow(TAG, vmScope) {
-            State(logDir = recordedPath)
-        }
-        state = stater.flow
+            log(TAG) { "Getting log files in dir: $sessionPath" }
+            val logFiles = sessionPath.listFiles() ?: throw IllegalStateException("No log files found")
 
-        launch {
-            log(TAG) { "Getting log files in dir: $recordedPath" }
-            val logFiles = recordedPath.listFiles() ?: emptyArray()
             log(TAG) { "Found ${logFiles.size} logfiles: $logFiles" }
             var entries = logFiles.map { LogFileItem(path = it) }
             stater.updateBlocking { copy(logEntries = entries) }
@@ -61,15 +60,15 @@ class RecorderViewModel @Inject constructor(
             stater.updateBlocking { copy(logEntries = entries) }
 
             log(TAG) { "Compressing log files..." }
-            val zipFile = File(recordedPath.parentFile, "${recordedPath.name}.zip")
+            val zipFile = zipPath ?: throw IllegalStateException("No zip path found")
             log(TAG) { "Writing zip file to $zipFile" }
             Zipper().zip(
                 entries.map { it.path.path },
                 zipFile.path
             )
             val zippedSize = zipFile.length()
             log(TAG) { "Zip file created ${zippedSize}B at $zipFile" }
-            stater.updateBlocking { copy(compressedFile = zipFile, compressedSize = zippedSize) }
+            stater.updateBlocking { copy(compressedFile = zipFile, compressedSize = zippedSize, isWorking = false) }
         }
     }
 
@@ -105,14 +104,19 @@ class RecorderViewModel @Inject constructor(
         webpageTool.open(ButlerLinks.PRIVACY_POLICY)
     }
 
+    fun discard() = launch {
+        stater.updateBlocking { copy(isWorking = true) }
+        sessionPath?.deleteAll()
+        navUp()
+    }
+
     data class State(
-        val logDir: File,
+        val logDir: File?,
         val logEntries: List<LogFileItem> = emptyList(),
         val compressedFile: File? = null,
-        val compressedSize: Long? = null
+        val compressedSize: Long? = null,
+        val isWorking: Boolean = true,
     ) {
-        val loading: Boolean
-            get() = compressedSize == null
 
         fun getFormattedCompressedSize(context: Context): String? {
             return compressedSize?.let { Formatter.formatShortFileSize(context, it) }