fixed an issue with filtering logs

DP-Hridayan · DP-Hridayan · commit dad13162c237 · 2026-04-19T14:58:02.000+05:30
diff --git a/app/src/main/java/in/hridayan/ashell/commandexamples/presentation/component/chip/LabelChip.kt b/app/src/main/java/in/hridayan/ashell/commandexamples/presentation/component/chip/LabelChip.kt
@@ -62,8 +62,8 @@ fun LabelChip(
                     crossIconOnClick(label)
                 },
                 colors = IconButtonDefaults.iconButtonColors(
-                    containerColor = MaterialTheme.colorScheme.errorContainer,
-                    contentColor = MaterialTheme.colorScheme.onErrorContainer
+                    containerColor = MaterialTheme.colorScheme.error,
+                    contentColor = MaterialTheme.colorScheme.onError
                 ),
                 modifier = Modifier.size(20.dp)
             ) {
diff --git a/app/src/main/java/in/hridayan/ashell/qstiles/presentation/model/TileDashBoardScreenUiState.kt b/app/src/main/java/in/hridayan/ashell/qstiles/presentation/model/TileDashBoardScreenUiState.kt
@@ -13,5 +13,6 @@ data class TileDashBoardScreenUiState(
     val logs: List<TileLog> = emptyList(),
     val totalExecutions: Int = 0,
     val successRate: String = "0.0%",
-    val logsSearchQuery: String = ""
+    val selectedTileIdFilter: Int? = null,
+    val tilesWithLogs: List<TileConfig> = emptyList()
 )
diff --git a/app/src/main/java/in/hridayan/ashell/qstiles/presentation/screen/TileDashBoardScreen.kt b/app/src/main/java/in/hridayan/ashell/qstiles/presentation/screen/TileDashBoardScreen.kt
@@ -8,8 +8,13 @@ package `in`.hridayan.ashell.qstiles.presentation.screen
 
 import android.content.pm.PackageManager
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.basicMarquee
@@ -33,11 +38,12 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
@@ -59,7 +65,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -77,13 +82,14 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation.NavController
 import `in`.hridayan.ashell.R
+import `in`.hridayan.ashell.commandexamples.presentation.component.chip.LabelChip
 import `in`.hridayan.ashell.core.common.LocalDarkMode
 import `in`.hridayan.ashell.core.common.LocalWeakHaptic
 import `in`.hridayan.ashell.core.common.constants.SHIZUKU_PACKAGE_NAME
 import `in`.hridayan.ashell.core.common.constants.UrlConst
 import `in`.hridayan.ashell.core.presentation.components.card.IconWithTextCard
-import `in`.hridayan.ashell.core.presentation.components.modifier.dashedBorder
 import `in`.hridayan.ashell.core.presentation.components.haptic.withHaptic
+import `in`.hridayan.ashell.core.presentation.components.modifier.dashedBorder
 import `in`.hridayan.ashell.core.presentation.components.navigation.FloatingNavPill
 import `in`.hridayan.ashell.core.presentation.components.navigation.FloatingNavPillDefaults
 import `in`.hridayan.ashell.core.presentation.components.navigation.FloatingNavPillItem
@@ -101,6 +107,7 @@ import `in`.hridayan.ashell.navigation.slideFadeInFromRight
 import `in`.hridayan.ashell.navigation.slideFadeOutToLeft
 import `in`.hridayan.ashell.navigation.slideFadeOutToRight
 import `in`.hridayan.ashell.qstiles.data.provider.TileIconProvider
+import `in`.hridayan.ashell.qstiles.domain.model.TileConfig
 import `in`.hridayan.ashell.qstiles.domain.model.TileExecutionMode
 import `in`.hridayan.ashell.qstiles.domain.model.TileLog
 import `in`.hridayan.ashell.qstiles.presentation.model.TileDashBoardScreenUiState
@@ -277,11 +284,14 @@ private fun TilesContent(
         state = listState,
         contentPadding = innerPadding
     ) {
-
         item { Spacer(Modifier.height(25.dp)) }
 
-        if (!hasNotificationAccess) {
-            item {
+        item {
+            AnimatedVisibility(
+                visible = !hasNotificationAccess,
+                enter = fadeIn() + expandVertically(),
+                exit = fadeOut() + shrinkVertically(),
+            ) {
                 NotificationAccessRequestCard(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -291,8 +301,12 @@ private fun TilesContent(
             }
         }
 
-        if (showShizukuUnavailableCard) {
-            item {
+        item {
+            AnimatedVisibility(
+                visible = showShizukuUnavailableCard,
+                enter = fadeIn() + expandVertically(),
+                exit = fadeOut() + shrinkVertically(),
+            ) {
                 ShizukuUnavailableCard(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -308,9 +322,13 @@ private fun TilesContent(
             }
         }
 
-        if (Shizuku.pingBinder()) {
-            if (!shizukuPermissionGranted.value) {
-                item {
+        item {
+            if (Shizuku.pingBinder()) {
+                AnimatedVisibility(
+                    visible = !shizukuPermissionGranted.value,
+                    enter = fadeIn() + expandVertically(),
+                    exit = fadeOut() + shrinkVertically(),
+                ) {
                     ShizukuPermissionRequestCard(
                         modifier = Modifier
                             .fillMaxWidth()
@@ -413,8 +431,9 @@ private fun LogsContent(
             item {
                 RecentActivityHeader(
                     modifier = Modifier.padding(20.dp),
-                    searchQuery = uiState.logsSearchQuery,
-                    onSearchQueryChange = viewModel::onLogsSearchQueryChange
+                    selectedTileId = uiState.selectedTileIdFilter,
+                    tilesWithLogs = uiState.tilesWithLogs,
+                    onFilterChange = viewModel::onFilterChange
                 )
             }
 
@@ -620,11 +639,15 @@ private fun StatCard(
 @Composable
 private fun RecentActivityHeader(
     modifier: Modifier = Modifier,
-    searchQuery: String,
-    onSearchQueryChange: (String) -> Unit
+    selectedTileId: Int?,
+    tilesWithLogs: List<TileConfig>,
+    onFilterChange: (Int?) -> Unit
 ) {
-    var isSearchExpanded by remember { mutableStateOf(false) }
+    var isMenuExpanded by remember { mutableStateOf(false) }
     val weakHaptic = LocalWeakHaptic.current
+    val selectedTile = remember(selectedTileId, tilesWithLogs) {
+        tilesWithLogs.find { it.id == selectedTileId }
+    }
 
     Row(
         modifier = modifier
@@ -633,26 +656,13 @@ private fun RecentActivityHeader(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
-        Crossfade(targetState = isSearchExpanded) { expanded ->
-            if (expanded) {
-                BasicTextField(
-                    modifier = Modifier
-                        .weight(1f)
-                        .padding(end = 10.dp)
-                        .background(MaterialTheme.colorScheme.surfaceContainer, CircleShape)
-                        .padding(horizontal = 16.dp, vertical = 8.dp),
-                    value = searchQuery,
-                    onValueChange = onSearchQueryChange,
-                    textStyle = MaterialTheme.typography.bodyMedium.copy(color = MaterialTheme.colorScheme.onSurface),
-                    cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
-                    decorationBox = { innerTextField ->
-                        if (searchQuery.isEmpty()) {
-                            AutoResizeableText(
-                                text = stringResource(R.string.search_tile),
-                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f)
-                            )
-                        }
-                        innerTextField()
+        Crossfade(targetState = selectedTile) { tile ->
+            if (tile != null) {
+                LabelChip(
+                    label = tile.name,
+                    showCrossIcon = true,
+                    crossIconOnClick = {
+                        onFilterChange(null)
                     }
                 )
             } else {
@@ -664,30 +674,71 @@ private fun RecentActivityHeader(
             }
         }
 
-        Row(
-            modifier = Modifier
-                .clip(CircleShape)
-                .clickable {
-                    isSearchExpanded = !isSearchExpanded
-                    weakHaptic()
-                }
-                .padding(horizontal = 12.dp, vertical = 6.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(6.dp)
-        ) {
-            Icon(
-                modifier = Modifier.size(18.dp),
-                painter = painterResource(if (isSearchExpanded) R.drawable.ts_close else R.drawable.ic_filter_alt),
-                contentDescription = null,
-                tint = MaterialTheme.colorScheme.primary
-            )
-            if (!isSearchExpanded) {
+        Box {
+            Row(
+                modifier = Modifier
+                    .clip(CircleShape)
+                    .clickable {
+                        isMenuExpanded = !isMenuExpanded
+                        weakHaptic()
+                    }
+                    .padding(horizontal = 12.dp, vertical = 6.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(6.dp)
+            ) {
+                Icon(
+                    modifier = Modifier.size(18.dp),
+                    painter = painterResource(R.drawable.ic_filter_alt),
+                    contentDescription = null,
+                    tint = MaterialTheme.colorScheme.primary
+                )
                 Text(
                     text = stringResource(R.string.filter),
                     style = MaterialTheme.typography.labelLarge,
                     color = MaterialTheme.colorScheme.primary
                 )
             }
+
+            DropdownMenu(
+                expanded = isMenuExpanded,
+                onDismissRequest = { isMenuExpanded = false },
+                modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh)
+            ) {
+                DropdownMenuItem(
+                    text = { Text(stringResource(R.string.all)) },
+                    onClick = {
+                        onFilterChange(null)
+                        isMenuExpanded = false
+                        weakHaptic()
+                    }
+                )
+                tilesWithLogs.forEach { tile ->
+                    DropdownMenuItem(
+                        text = {
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = Arrangement.spacedBy(8.dp)
+                            ) {
+                                val tileIcon = TileIconProvider.iconById[tile.iconId]
+                                Icon(
+                                    modifier = Modifier.size(18.dp),
+                                    painter = painterResource(
+                                        tileIcon?.resId ?: R.drawable.ic_adb
+                                    ),
+                                    contentDescription = null,
+                                    tint = MaterialTheme.colorScheme.primary
+                                )
+                                Text(tile.name)
+                            }
+                        },
+                        onClick = {
+                            onFilterChange(tile.id)
+                            isMenuExpanded = false
+                            weakHaptic()
+                        }
+                    )
+                }
+            }
         }
     }
 }
diff --git a/app/src/main/java/in/hridayan/ashell/qstiles/presentation/viewmodel/TileDashBoardViewModel.kt b/app/src/main/java/in/hridayan/ashell/qstiles/presentation/viewmodel/TileDashBoardViewModel.kt
@@ -29,7 +29,7 @@ class TileDashboardViewModel @Inject constructor(
 ) : ViewModel() {
 
     private val _currentTab = MutableStateFlow(TileScreenTabs.TILES)
-    private val _logsSearchQuery = MutableStateFlow("")
+    private val _selectedTileIdFilter = MutableStateFlow<Int?>(null)
 
     val state: StateFlow<TileDashBoardScreenUiState> =
         combine(
@@ -40,25 +40,24 @@ class TileDashboardViewModel @Inject constructor(
                 logRepository.getTotalExecutions().distinctUntilChanged(),
                 logRepository.getSuccessCount().distinctUntilChanged(),
                 _currentTab,
-                _logsSearchQuery
-            ) { logs, total, success, tab, query ->
-                DataBundle(logs, total, success, tab, query)
+                _selectedTileIdFilter
+            ) { logs, total, success, tab, filterId ->
+                DataBundle(logs, total, success, tab, filterId)
             }
         ) { tiles, running, bundle ->
             
             val logs = bundle.logs
             val total = bundle.total
             val success = bundle.success
             val tab = bundle.tab
-            val query = bundle.query
+            val filterId = bundle.filterId
+            val logTileIds = logs.map { it.tileId }.toSet()
+            val tilesWithLogs = tiles.filter { it.id in logTileIds }
 
-            val filteredLogs = if (query.isBlank()) {
+            val filteredLogs = if (filterId == null) {
                 logs
             } else {
-                logs.filter { log ->
-                    val tileName = tiles.find { it.id == log.tileId }?.name ?: "Unknown"
-                    tileName.contains(query, ignoreCase = true)
-                }
+                logs.filter { it.tileId == filterId }
             }
 
             val successRateStr = if (total > 0) {
@@ -75,7 +74,8 @@ class TileDashboardViewModel @Inject constructor(
                 logs = filteredLogs,
                 totalExecutions = total,
                 successRate = successRateStr,
-                logsSearchQuery = query
+                selectedTileIdFilter = filterId,
+                tilesWithLogs = tilesWithLogs
             )
         }
             .stateIn(
@@ -88,15 +88,15 @@ class TileDashboardViewModel @Inject constructor(
         _currentTab.value = index
     }
 
-    fun onLogsSearchQueryChange(query: String) {
-        _logsSearchQuery.value = query
+    fun onFilterChange(tileId: Int?) {
+        _selectedTileIdFilter.value = tileId
     }
 
     private data class DataBundle(
         val logs: List<TileLog>,
         val total: Int,
         val success: Int,
         val tab: Int,
-        val query: String
+        val filterId: Int?
     )
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
     <string name="adb_via_wireless_debugging">ADB via Wireless Debugging</string>
     <string name="adb_via_wireless_debugging_summary">Connect devices (Android 11+) over Wi-Fi using wireless debugging and execute ADB commands remotely.</string>
     <string name="add">Add</string>
+    <string name="all">All</string>
     <string name="tiles">Tiles</string>
     <string name="recent_activity">Recent activity</string>
     <string name="total_executions">Total executions</string>

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ data class TileDashBoardScreenUiState(`
`13`	`13`	`val logs: List<TileLog> = emptyList(),`
`14`	`14`	`val totalExecutions: Int = 0,`
`15`	`15`	`val successRate: String = "0.0%",`
`16`		`- val logsSearchQuery: String = ""`
	`16`	`+ val selectedTileIdFilter: Int? = null,`
	`17`	`+ val tilesWithLogs: List<TileConfig> = emptyList()`
`17`	`18`	`)`