Skip to content

Visually indicate ongoing search #6188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
May 13, 2026
Merged

Visually indicate ongoing search #6188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions app/src/main/java/com/nextcloud/talk/conversationlist/ui/ConversationListTopBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
Expand Down Expand Up @@ -90,7 +91,8 @@ data class ConversationListTopBarState(
val avatarUrl: String?,
val credentials: String,
val showFilterActive: Boolean,
val showThreadsButton: Boolean
val showThreadsButton: Boolean,
val isSearchLoading: Boolean = false
)

@Suppress("LongParameterList")
Expand Down Expand Up @@ -133,6 +135,7 @@ fun ConversationListTopBar(
)
is TopBarMode.SearchActive -> TopBarSearchActiveContent(
query = mode.query,
isLoading = state.isSearchLoading,
onQueryChange = actions.onSearchQueryChange,
onSearchClose = actions.onSearchClose,
focusRequester = focusRequester
Expand Down Expand Up @@ -256,6 +259,7 @@ private fun IdleSearchBarActions(
@Composable
private fun TopBarSearchActiveContent(
query: String,
isLoading: Boolean,
onQueryChange: (String) -> Unit,
onSearchClose: () -> Unit,
focusRequester: FocusRequester
Expand Down Expand Up @@ -301,7 +305,14 @@ private fun TopBarSearchActiveContent(
),
windowInsets = WindowInsets(0)
)
HorizontalDivider()
if (isLoading) {
LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(),
color = MaterialTheme.colorScheme.primary
)
} else {
HorizontalDivider()
}
}
LaunchedEffect(Unit) { focusRequester.requestFocus() }
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/nextcloud/talk/conversationlist/ui/ConversationsListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ fun ConversationsListScreen(
avatarUrl = avatarUrl,
credentials = state.credentials,
showFilterActive = showFilterActive,
showThreadsButton = showThreadsButton
showThreadsButton = showThreadsButton,
isSearchLoading = isSearchLoading
),
actions = ConversationListTopBarActions(
onSearchQueryChange = { viewModel.setSearchQuery(it) },
Expand Down
Loading