[feat]: update v2.0.4

* [fix]: jumping logs list in selection mode

* [feat]: refactored recordings screen to compose

* [fix]: recording buttons now have the same width

* [build]: bumped app version

app/build.gradle.kts

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         applicationId = logFoxPackageName
 
-        versionCode = 63
-        versionName = "2.0.3"
+        versionCode = 64
+        versionName = "2.0.4"
     }
 }
 

core/arch/src/main/kotlin/com/f0x1d/logfox/arch/presentation/ui/fragment/BaseFragment.kt

@@ -11,7 +11,7 @@ import com.f0x1d.logfox.arch.presentation.ui.base.SimpleFragmentLifecycleOwner
 import com.f0x1d.logfox.arch.presentation.ui.snackbar
 import dev.chrisbanes.insetter.applyInsetter
 
-abstract class BaseFragment<T : ViewBinding>: Fragment(), SimpleFragmentLifecycleOwner {
+abstract class BaseFragment<T : ViewBinding> : Fragment(), SimpleFragmentLifecycleOwner {
 
     private var mutableBinding: T? = null
     protected val binding: T get() = mutableBinding!!

core/database/build.gradle.kts

@@ -16,6 +16,8 @@ android {
 dependencies {
     implementation(projects.core.arch)
 
+    compileOnly(libs.androidx.compose.runtime)
+
     implementation(libs.androidx.room)
     implementation(libs.androidx.room.runtime)
     ksp(libs.androidx.room.compiler)

core/database/src/main/kotlin/com/f0x1d/logfox/database/entity/LogRecording.kt

@@ -1,5 +1,6 @@
 package com.f0x1d.logfox.database.entity
 
+import androidx.compose.runtime.Immutable
 import androidx.room.ColumnInfo
 import androidx.room.Dao
 import androidx.room.Delete
@@ -12,6 +13,7 @@ import com.f0x1d.logfox.model.Identifiable
 import kotlinx.coroutines.flow.Flow
 import java.io.File
 
+@Immutable
 @Entity
 data class LogRecording(
     @ColumnInfo(name = "title") val title: String,

core/navigation/src/main/res/navigation/recordings.xml

@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/recordingsFragment"
-        android:name="com.f0x1d.logfox.feature.recordings.list.presentation.ui.fragment.RecordingsFragment"
+        android:name="com.f0x1d.logfox.feature.recordings.list.presentation.ui.RecordingsFragment"
         android:label="RecordingsFragment" />
     <action
         android:id="@+id/action_recordingsFragment_to_recordingBottomSheet"

core/ui-compose/src/main/kotlin/com/f0x1d/logfox/ui/compose/component/button/VerticalButton.kt

@@ -0,0 +1,76 @@
+package com.f0x1d.logfox.ui.compose.component.button
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ProvideTextStyle
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.f0x1d.logfox.strings.Strings
+import com.f0x1d.logfox.ui.Icons
+import com.f0x1d.logfox.ui.compose.preview.DayNightPreview
+import com.f0x1d.logfox.ui.compose.theme.LogFoxTheme
+
+@Composable
+fun VerticalButton(
+    icon: @Composable () -> Unit,
+    text: @Composable () -> Unit,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    shape: Shape = CardDefaults.shape,
+) {
+    Card(
+        modifier = modifier,
+        onClick = onClick,
+        enabled = enabled,
+        shape = shape,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(20.dp),
+            verticalArrangement = Arrangement.spacedBy(6.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            icon()
+
+            ProvideTextStyle(
+                value = MaterialTheme.typography.bodyLarge.copy(
+                    fontWeight = FontWeight.Medium,
+                ),
+            ) {
+                text()
+            }
+        }
+    }
+}
+
+@DayNightPreview
+@Composable
+private fun Preview() = LogFoxTheme {
+    VerticalButton(
+        icon = {
+            Icon(
+                painter = painterResource(Icons.ic_menu_overflow),
+                contentDescription = null,
+            )
+        },
+        text = {
+            Text(text = stringResource(Strings.root))
+        },
+        onClick = { },
+    )
+}

core/ui-compose/src/main/kotlin/com/f0x1d/logfox/ui/compose/component/placeholder/ListPlaceholder.kt

@@ -0,0 +1,68 @@
+package com.f0x1d.logfox.ui.compose.component.placeholder
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ProvideTextStyle
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.f0x1d.logfox.strings.Strings
+import com.f0x1d.logfox.ui.Icons
+import com.f0x1d.logfox.ui.compose.preview.DayNightPreview
+import com.f0x1d.logfox.ui.compose.theme.LogFoxTheme
+
+@Composable
+fun ListPlaceholder(
+    @DrawableRes iconResId: Int,
+    text: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.padding(horizontal = 10.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        Box(
+            modifier = Modifier
+                .size(120.dp)
+                .clip(CircleShape)
+                .background(MaterialTheme.colorScheme.surfaceContainerHighest)
+                .padding(26.dp),
+        ) {
+            Icon(
+                modifier = Modifier.fillMaxSize(),
+                painter = painterResource(iconResId),
+                contentDescription = null,
+            )
+        }
+
+        ProvideTextStyle(MaterialTheme.typography.bodyLarge) {
+            text()
+        }
+    }
+}
+
+@DayNightPreview
+@Composable
+private fun Preview() = LogFoxTheme {
+    ListPlaceholder(
+        iconResId = Icons.ic_recording,
+        text = {
+            Text(text = stringResource(Strings.no_crashes))
+        },
+    )
+}

core/ui/src/main/kotlin/com/f0x1d/logfox/ui/view/EditTextExt.kt

@@ -0,0 +1,37 @@
+package com.f0x1d.logfox.ui.view
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+
+class ExtendedTextWatcher(
+    val editText: EditText,
+    var enabled: Boolean = true,
+    private val doAfterTextChanged: (e: Editable?) -> Unit,
+) : TextWatcher {
+
+    init {
+        editText.addTextChangedListener(this)
+    }
+
+    override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) = Unit
+
+    override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) = Unit
+
+    override fun afterTextChanged(e: Editable?) {
+        if (enabled) {
+            doAfterTextChanged(e)
+        }
+    }
+
+    fun setText(text: String?) {
+        enabled = false
+        editText.setText(text)
+        enabled = true
+    }
+}
+
+fun EditText.applyExtendedTextWatcher(doAfterTextChanged: (e: Editable?) -> Unit): ExtendedTextWatcher = ExtendedTextWatcher(
+    editText = this,
+    doAfterTextChanged = doAfterTextChanged,
+)

core/ui/src/main/res/drawable/ic_menu_overflow.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" />
+</vector>

feature/logging/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(),

feature/logging/list/src/main/kotlin/com/f0x1d/logfox/feature/logging/list/presentation/LogsViewModel.kt

@@ -46,7 +46,7 @@ class LogsViewModel @Inject constructor(
     @IODispatcher private val ioDispatcher: CoroutineDispatcher,
     dateTimeFormatter: DateTimeFormatter,
     application: Application,
-): BaseViewModel<LogsState, LogsAction>(
+) : BaseViewModel<LogsState, LogsAction>(
     initialStateProvider = { LogsState() },
     application = application,
 ), DateTimeFormatter by dateTimeFormatter {
@@ -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(

feature/logging/list/src/main/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 {

feature/recordings/details/src/main/kotlin/com/f0x1d/logfox/feature/recordings/details/presentation/RecordingDetailsViewModel.kt

@@ -34,6 +34,7 @@ class RecordingDetailsViewModel @Inject constructor(
     application = application,
 ), DateTimeFormatter by dateTimeFormatter {
     var currentTitle: String? = null
+        private set
 
     private val titleUpdateMutex = Mutex()
 
@@ -83,6 +84,8 @@ class RecordingDetailsViewModel @Inject constructor(
 
     fun updateTitle(title: String) = launchCatching {
         titleUpdateMutex.withLock {
+            currentTitle = title
+
             currentState.recording?.let {
                 recordingsRepository.updateTitle(it, title)
             }