Merge branch 'worktree-searcher'

Author: d4rken

app-workspace-searcher/src/main/java/eu/darken/butler/searcher/ui/search/SearchStatusCard.kt

@@ -4,9 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -15,15 +13,14 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.twotone.Search
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
-import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -58,17 +55,21 @@ fun SearchStatusCard(
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(12.dp)
             ) {
-                // Icon - always show search icon for consistency
-                Icon(
-                    imageVector = Icons.TwoTone.Search,
-                    contentDescription = null,
-                    modifier = Modifier.size(24.dp),
-                    tint = if (state.isSearching) {
-                        MaterialTheme.colorScheme.primary.copy(alpha = 0.7f)
-                    } else {
-                        MaterialTheme.colorScheme.primary
-                    }
-                )
+                // Icon - show circular progress when searching, static icon otherwise
+                if (state.isSearching) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(24.dp),
+                        color = MaterialTheme.colorScheme.primary,
+                        strokeWidth = 2.dp
+                    )
+                } else {
+                    Icon(
+                        imageVector = Icons.TwoTone.Search,
+                        contentDescription = null,
+                        modifier = Modifier.size(24.dp),
+                        tint = MaterialTheme.colorScheme.primary
+                    )
+                }
 
                 Column(
                     modifier = Modifier.weight(1f),
@@ -159,19 +160,6 @@ fun SearchStatusCard(
                     }
                 }
             } // End of Row
-            
-            // Linear progress indicator at bottom when searching
-            if (state.isSearching) {
-                Spacer(modifier = Modifier.height(8.dp))
-                LinearProgressIndicator(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(3.dp),
-                    color = MaterialTheme.colorScheme.primary,
-                    trackColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
-                    strokeCap = StrokeCap.Round
-                )
-            }
         }
     }
 }

buildSrc/src/main/java/Dependencies.kt

@@ -93,6 +93,7 @@ fun DependencyHandlerScope.addCoil() {
 
 fun DependencyHandlerScope.addLottie() {
     implementation("com.airbnb.android:lottie:6.6.6")
+    implementation("com.airbnb.android:lottie-compose:6.6.6")
 }
 
 fun DependencyHandlerScope.addSerialization() {