From a54b795666107eb70eaec386257fc74e0d63b4fc Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Sat, 24 Sep 2022 13:15:51 +0200 Subject: [PATCH] Do not show "Clear" text button in SearchScreen if the text input is already empty --- .../ui/screens/search/LibrarySearchTab.kt | 24 +++++++++---------- .../ui/screens/search/OnlineSearchTab.kt | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LibrarySearchTab.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LibrarySearchTab.kt index 5ffcf39..1579b83 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LibrarySearchTab.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LibrarySearchTab.kt @@ -105,18 +105,18 @@ fun LibrarySearchTab( ) }, actionsContent = { - BasicText( - text = "Clear", - style = typography.xxs.medium, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .clickable(enabled = textFieldValue.text.isNotEmpty()) { - onTextFieldValueChanged(TextFieldValue()) - } - .background(colorPalette.background2) - .padding(all = 8.dp) - .padding(horizontal = 8.dp) - ) + if (textFieldValue.text.isNotEmpty()) { + BasicText( + text = "Clear", + style = typography.xxs.medium, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .clickable { onTextFieldValueChanged(TextFieldValue()) } + .background(colorPalette.background2) + .padding(all = 8.dp) + .padding(horizontal = 8.dp) + ) + } } ) } diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearchTab.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearchTab.kt index 015a32b..9a8407f 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearchTab.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearchTab.kt @@ -156,18 +156,18 @@ fun OnlineSearchTab( .weight(1f) ) - BasicText( - text = "Clear", - style = typography.xxs.medium, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .clickable(enabled = textFieldValue.text.isNotEmpty()) { - onTextFieldValueChanged(TextFieldValue()) - } - .background(colorPalette.background2) - .padding(all = 8.dp) - .padding(horizontal = 8.dp) - ) + if (textFieldValue.text.isNotEmpty()) { + BasicText( + text = "Clear", + style = typography.xxs.medium, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .clickable { onTextFieldValueChanged(TextFieldValue()) } + .background(colorPalette.background2) + .padding(all = 8.dp) + .padding(horizontal = 8.dp) + ) + } } ) }