Skip to content

Commit 726b20b

Browse files
authored
Merge pull request #6220 from nextcloud/bugfix/6137/rippleEffect
fix ripple effect for filter
2 parents f9d35bb + 8f03541 commit 726b20b

2 files changed

Lines changed: 9 additions & 15 deletions

File tree

app/src/main/java/com/nextcloud/talk/conversationlist/ui/ConversationListTopBar.kt

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -225,20 +225,15 @@ private fun IdleSearchBarActions(
225225
onClick = actions.onFilterClick,
226226
modifier = Modifier.size(48.dp)
227227
) {
228-
Box(
229-
Modifier.fillMaxSize(),
230-
contentAlignment = if (state.showThreadsButton) Alignment.CenterEnd else Alignment.Center
231-
) {
232-
Icon(
233-
painter = painterResource(R.drawable.ic_baseline_filter_list_24),
234-
contentDescription = stringResource(R.string.nc_filter),
235-
tint = if (state.showFilterActive) {
236-
MaterialTheme.colorScheme.primary
237-
} else {
238-
MaterialTheme.colorScheme.onSurfaceVariant
239-
}
240-
)
241-
}
228+
Icon(
229+
painter = painterResource(R.drawable.ic_baseline_filter_list_24),
230+
contentDescription = stringResource(R.string.nc_filter),
231+
tint = if (state.showFilterActive) {
232+
MaterialTheme.colorScheme.primary
233+
} else {
234+
MaterialTheme.colorScheme.onSurfaceVariant
235+
}
236+
)
242237
}
243238
if (state.showThreadsButton) {
244239
IconButton(

app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import androidx.compose.material3.Surface
3535
import androidx.compose.material3.Text
3636
import androidx.compose.runtime.Composable
3737
import androidx.compose.runtime.compositionLocalOf
38-
import androidx.compose.runtime.getValue
3938
import androidx.compose.runtime.remember
4039
import androidx.compose.foundation.rememberScrollState
4140
import androidx.compose.ui.Alignment

0 commit comments

Comments
 (0)