From ad181cb057b8c755005004c7111e2855762d9302 Mon Sep 17 00:00:00 2001
From: avon <2956-avon@users.noreply.code.briarproject.org>
Date: Fri, 20 Jan 2023 16:19:58 -0500
Subject: [PATCH] Addressing MR feedback
---
.../briar/desktop/contact/ContactList.kt | 2 +-
.../desktop/forums/GroupListComposable.kt | 2 +-
.../briar/desktop/ui/SearchTextField.kt | 30 +++++++++----------
.../resources/strings/BriarDesktop.properties | 1 +
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
index 759db1864a..44d5e14624 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
@@ -137,7 +137,7 @@ fun ContactList(
modifier = Modifier.fillMaxWidth().height(HEADER_SIZE + 1.dp),
) {
SearchTextField(
- placeholder = i18n("contacts.search.title"),
+ title = i18n("contacts.search.title"),
icon = Icons.Filled.PersonAdd,
searchValue = filterBy,
addButtonDescription = i18n("access.contacts.add"),
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/GroupListComposable.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/GroupListComposable.kt
index 0c08e2a6d5..c5e0af2750 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/GroupListComposable.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/GroupListComposable.kt
@@ -68,7 +68,7 @@ fun GroupListComposable(
modifier = Modifier.fillMaxWidth().height(Constants.HEADER_SIZE + 1.dp),
) {
SearchTextField(
- placeholder = i18n("forum.search.title"),
+ title = i18n("forum.search.title"),
icon = Icons.Filled.AddComment,
searchValue = filterBy,
addButtonDescription = i18n("forum.add.title"),
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/SearchTextField.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/SearchTextField.kt
index c1b08e1b5a..89827e5a37 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/SearchTextField.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/SearchTextField.kt
@@ -70,15 +70,14 @@ import kotlinx.coroutines.runInterruptible
import org.briarproject.briar.desktop.theme.surfaceVariant
import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
-@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun SearchTextField(
- placeholder: String,
+ title: String,
icon: ImageVector,
searchValue: String,
addButtonDescription: String,
onValueChange: (String) -> Unit,
- onAddButtonClicked: () -> Unit
+ onAddButtonClicked: () -> Unit,
) {
val (isSearchMode, setSearchMode) = remember { mutableStateOf(false) }
@@ -91,22 +90,25 @@ fun SearchTextField(
onBack = { setSearchMode(false) },
)
} else {
- ContactListTopAppBar(
+ SearchTopAppBar(
+ title,
onAddButtonClicked,
+ addButtonDescription,
onSearch = { setSearchMode(true) },
- icon
+ icon,
)
}
}
}
}
-@OptIn(ExperimentalComposeUiApi::class)
@Composable
-fun ContactListTopAppBar(
+fun SearchTopAppBar(
+ placeholder: String,
onContactAdd: () -> Unit,
+ addButtonDescription: String,
onSearch: () -> Unit,
- icon: ImageVector
+ icon: ImageVector,
) {
Surface(
color = MaterialTheme.colors.surfaceVariant,
@@ -114,14 +116,12 @@ fun ContactListTopAppBar(
) {
Box {
Row(
- Modifier.fillMaxSize(),
- horizontalArrangement = Arrangement.SpaceBetween,
+ Modifier.fillMaxSize().padding(start = 64.dp, end = 14.dp),
verticalAlignment = Alignment.CenterVertically
) {
Text(
- i18n("contacts.search.title"),
+ placeholder,
style = MaterialTheme.typography.h4,
- modifier = Modifier.padding(start = 64.dp)
)
Spacer(Modifier.weight(1f))
IconButton(
@@ -133,7 +133,7 @@ fun ContactListTopAppBar(
}
IconButton(
onClick = onContactAdd,
- modifier = Modifier.padding(end = 14.dp).then(Modifier.size(32.dp))
+ modifier = Modifier.size(32.dp),
) {
Icon(
icon,
@@ -168,7 +168,7 @@ fun SearchInput(
textStyle = LocalTextStyle.current.copy(
color = MaterialTheme.colors.onSurface
),
- placeholder = { Text(i18n("contacts.search.placeholder"), style = MaterialTheme.typography.body1) },
+ placeholder = { Text(i18n("search"), style = MaterialTheme.typography.body1) },
shape = RoundedCornerShape(0.dp),
colors = TextFieldDefaults.textFieldColors(backgroundColor = MaterialTheme.colors.surfaceVariant),
leadingIcon = {
@@ -188,7 +188,7 @@ fun SearchInput(
},
Modifier.size(24.dp).pointerHoverIcon(PointerIconDefaults.Default)
) {
- Icon(Icons.Filled.Close, "clear search text")
+ Icon(Icons.Filled.Close, i18n("search.clear"))
}
}
},
diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop.properties b/briar-desktop/src/main/resources/strings/BriarDesktop.properties
index 8f559e5d88..f5707f4787 100644
--- a/briar-desktop/src/main/resources/strings/BriarDesktop.properties
+++ b/briar-desktop/src/main/resources/strings/BriarDesktop.properties
@@ -261,6 +261,7 @@ unsupported_feature=Unfortunately, this feature is not yet supported by Briar De
remove=Remove
hide=Hide
search=Search
+search.clear=Clear Search
# Compose text edit actions
copy=Copy
--
GitLab