Fix app drawer search lifecycle, touch interception, launch-close sequencing, and label hierarchy (#17)

Co-authored-by: Paul Scheduikat <lu4p@pm.me>

Author: Copilot

app/src/main/java/com/lu4p/fokuslauncher/ui/components/CategoryChips.kt

@@ -18,6 +18,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.dp
 import com.lu4p.fokuslauncher.ui.theme.ChipBackground
 import com.lu4p.fokuslauncher.ui.theme.ChipSelectedBackground
+import java.util.Locale
 
 /**
  * Horizontal scrollable row of category filter chips.

app/src/main/java/com/lu4p/fokuslauncher/ui/drawer/AppDrawerScreen.kt

@@ -53,6 +53,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.lu4p.fokuslauncher.data.model.AppInfo
 import com.lu4p.fokuslauncher.ui.components.CategoryChips
 import com.lu4p.fokuslauncher.ui.components.SearchBar
+import java.util.Locale
 import kotlinx.coroutines.delay
 
 @Composable
@@ -83,6 +84,7 @@ fun AppDrawerScreen(
 
     // Close the drawer after an app is auto-launched from search
     LaunchedEffect(Unit) {
+        viewModel.resetSearchState()
         viewModel.refresh()
         viewModel.events.collect { event ->
             when (event) {
@@ -99,8 +101,9 @@ fun AppDrawerScreen(
             onCategorySelected = viewModel::onCategorySelected,
             onCategoryLongPress = viewModel::onCategoryLongPress,
             onAppClick = { target ->
-                viewModel.launchTarget(target)
-                closeAndReset()
+                if (viewModel.launchTarget(target)) {
+                    closeAndReset()
+                }
             },
             onAppLongPress = viewModel::onAppLongPress,
             onMenuToggle = viewModel::toggleMenu,
@@ -275,8 +278,8 @@ fun AppDrawerContent(
             if (uiState.filteredApps.isNotEmpty()) {
                 item {
                     Text(
-                            text = uiState.selectedCategory,
-                            style = MaterialTheme.typography.titleMedium,
+                            text = uiState.selectedCategory.uppercase(Locale.getDefault()),
+                            style = MaterialTheme.typography.labelLarge,
                             color = MaterialTheme.colorScheme.primary,
                             modifier = Modifier.padding(horizontal = 24.dp, vertical = 12.dp)
                     )
@@ -303,8 +306,8 @@ fun AppDrawerContent(
                 }
                 item {
                     Text(
-                            text = "Private Space",
-                            style = MaterialTheme.typography.titleMedium,
+                            text = "Private Space".uppercase(Locale.getDefault()),
+                            style = MaterialTheme.typography.labelLarge,
                             color = MaterialTheme.colorScheme.primary,
                             modifier = Modifier.padding(horizontal = 24.dp, vertical = 12.dp)
                     )

app/src/main/java/com/lu4p/fokuslauncher/ui/drawer/AppDrawerViewModel.kt

@@ -219,9 +219,10 @@ constructor(
                 )
         if (!browseMode && trimmed.isNotBlank() && allMatches.size == 1) {
             val target = allMatches[0]
-            viewModelScope.launch { _events.emit(DrawerEvent.AutoLaunch(target)) }
-            launchTarget(target)
-            resetSearchState()
+            if (launchTarget(target)) {
+                resetSearchState()
+                viewModelScope.launch { _events.emit(DrawerEvent.AutoLaunch(target)) }
+            }
         }
     }
 
@@ -271,12 +272,12 @@ constructor(
 
     // --- Launch ---
 
-    fun launchApp(packageName: String) {
-        launchTarget(LaunchTarget.MainApp(packageName))
+    fun launchApp(packageName: String): Boolean {
+        return launchTarget(LaunchTarget.MainApp(packageName))
     }
 
-    fun launchTarget(target: LaunchTarget) {
-        when (target) {
+    fun launchTarget(target: LaunchTarget): Boolean {
+        return when (target) {
             is LaunchTarget.MainApp -> appRepository.launchApp(target.packageName)
             is LaunchTarget.PrivateApp ->
                     privateSpaceManager.launchApp(target.componentName, target.userHandle)

app/src/main/java/com/lu4p/fokuslauncher/ui/navigation/NavGraph.kt

@@ -20,8 +20,10 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectHorizontalDragGestures
 import androidx.compose.foundation.gestures.detectVerticalDragGestures
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.fillMaxSize
@@ -329,6 +331,10 @@ fun FokusNavGraph(
                 modifier = Modifier
                     .fillMaxSize()
                     .background(MaterialTheme.colorScheme.background)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null
+                    ) {}
             ) {
                 AppDrawerScreen(
                     onSettingsClick = {

app/src/test/java/com/lu4p/fokuslauncher/ui/drawer/AppDrawerViewModelTest.kt

@@ -67,9 +67,11 @@ class AppDrawerViewModelTest {
         every { appRepository.getHiddenPackageNames() } returns hiddenFlow
         every { appRepository.getAllRenamedApps() } returns renamedFlow
         every { appRepository.getAllAppCategories() } returns categoriesFlow
+        every { appRepository.launchApp(any()) } returns true
         every { preferencesManager.favoritesFlow } returns favoritesFlow
         every { privateSpaceManager.isSupported } returns false
         every { privateSpaceManager.isPrivateSpaceUnlocked() } returns false
+        every { privateSpaceManager.launchApp(any(), any()) } returns true
         viewModel = AppDrawerViewModel(appRepository, privateSpaceManager, preferencesManager)
         testDispatcher.scheduler.advanceUntilIdle()
     }
@@ -122,6 +124,15 @@ class AppDrawerViewModelTest {
         assertEquals("", viewModel.uiState.value.searchQuery)
     }
 
+    @Test
+    fun `single search result does not reset query when launch fails`() {
+        every { appRepository.launchApp("com.lu4p.atom") } returns false
+
+        viewModel.onSearchQueryChanged("Atom")
+
+        assertEquals("Atom", viewModel.uiState.value.searchQuery)
+    }
+
     @Test
     fun `empty search query shows all apps`() {
         viewModel.onSearchQueryChanged("cal")