Skip to content

Commit 8162b50

Browse files
authored
feat: Search in a cells conversation (WPB-21649) (#4479)
1 parent d24faa9 commit 8162b50

File tree

42 files changed

+146
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+146
-86
lines changed

app/src/main/kotlin/com/wire/android/ui/common/groupname/GroupConversationNameComponent.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import androidx.compose.ui.text.input.ImeAction
4848
import androidx.compose.ui.text.input.KeyboardType
4949
import com.wire.android.R
5050
import com.wire.android.ui.common.R as commonR
51-
import com.wire.android.ui.common.Icon
5251
import com.wire.android.ui.common.animation.ShakeAnimation
5352
import com.wire.android.ui.common.button.WireButtonState
5453
import com.wire.android.ui.common.button.WirePrimaryButton
@@ -170,8 +169,8 @@ fun GroupNameScreen(
170169
onClick = newGroupNameTextState::clearText,
171170
) {
172171
Icon(
173-
painter = painterResource(id = R.drawable.ic_clear_search),
174-
contentDescription = stringResource(R.string.content_description_clear_content)
172+
painter = painterResource(id = commonR.drawable.ic_clear_search),
173+
contentDescription = stringResource(commonR.string.content_description_clear_content)
175174
)
176175
}
177176
}

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationTopAppBar.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ import com.wire.kalium.logic.data.conversation.Conversation
7171
import com.wire.kalium.logic.data.id.ConversationId
7272
import com.wire.kalium.logic.data.id.QualifiedID
7373
import com.wire.kalium.logic.data.user.UserAvailabilityStatus
74+
import com.wire.android.ui.common.R as commonR
7475

7576
@Composable
7677
fun ConversationScreenTopAppBar(
@@ -176,7 +177,7 @@ private fun ConversationScreenTopAppBarContent(
176177
WireSecondaryIconButton(
177178
onButtonClicked = onSearchButtonClick,
178179
iconResource = R.drawable.ic_search,
179-
contentDescription = R.string.content_description_conversation_search_icon,
180+
contentDescription = commonR.string.content_description_conversation_search_icon,
180181
minSize = dimensions().buttonSmallMinSize,
181182
minClickableSize = DpSize(
182183
dimensions().buttonSmallMinSize.width,

app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchUsersAndAppsScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ fun SearchUsersAndAppsScreen(
143143
SearchTopBar(
144144
isSearchActive = searchBarState.isSearchActive,
145145
searchBarHint = searchBarTitle,
146+
backIconContentDescription = stringResource(id = R.string.content_description_add_participants_back_btn),
146147
searchBarDescription = stringResource(R.string.content_description_add_participants_search_field),
147148
searchQueryTextState = searchBarState.searchQueryTextState,
148149
onActiveChanged = searchBarState::searchActiveChanged,

app/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<string name="content_description_reveal_password">Passwort anzeigen</string>
8585
<string name="content_description_hide_password">Passwort ausblenden</string>
8686
<string name="content_description_search_back">Suche-Icon zurück</string>
87-
<string name="content_description_clear_content">Gesprächsverlauf löschen</string>
8887
<string name="content_description_muted_conversation">Unterhaltung ist stummgeschaltet</string>
8988
<string name="content_description_download_icon">Icon herunterladen</string>
9089
<string name="content_description_open_asset_icon">Icon öffnen</string>
@@ -98,8 +97,6 @@
9897
<string name="content_description_delete_the_conversation">Unterhaltung löschen</string>
9998
<string name="content_description_conversation_phone_icon">Audioanruf starten</string>
10099
<string name="content_description_welcome_wire_logo">Wire</string>
101-
<string name="content_description_conversation_search_icon">Icon suchen</string>
102-
<string name="content_description_conversation_search_input">Sucheingabe</string>
103100
<string name="content_description_conversation_mention_someone">Jemanden erwähnen</string>
104101
<string name="content_description_conversation_back_btn">Zurück zur Unterhaltungsliste</string>
105102
<string name="content_description_conversation_open_details_label">Unterhaltungsdetails öffnen</string>

app/src/main/res/values-es/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<string name="content_description_reveal_password">Mostrar contraseña</string>
8585
<string name="content_description_hide_password">Ocultar contraseña</string>
8686
<string name="content_description_search_back">Icono de búsqueda atrás</string>
87-
<string name="content_description_clear_content">Borrar contenido</string>
8887
<string name="content_description_muted_conversation">Conversación silenciada</string>
8988
<string name="content_description_download_icon">Icono de descarga</string>
9089
<string name="content_description_open_asset_icon">Icono de abrir</string>
@@ -98,8 +97,6 @@
9897
<string name="content_description_delete_the_conversation">Eliminar la conversación</string>
9998
<string name="content_description_conversation_phone_icon">Iniciar una llamada</string>
10099
<string name="content_description_welcome_wire_logo">Logo de Wire</string>
101-
<string name="content_description_conversation_search_icon">Ícono de búsqueda</string>
102-
<string name="content_description_conversation_search_input">Campo de búsqueda</string>
103100
<string name="content_description_conversation_enable_rich_text_mode">Botón de modo de texto enriquecido</string>
104101
<string name="content_description_conversation_enable_drawing_mode">Botón activar modo de dibujo</string>
105102
<string name="content_description_conversation_rich_text_header">Encabezado de formato de texto enriquecido</string>

app/src/main/res/values-et/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<string name="content_description_reveal_password">Kuva parool</string>
5959
<string name="content_description_hide_password">Peida parool</string>
6060
<string name="content_description_search_back">Otsi tagasi ikoon</string>
61-
<string name="content_description_clear_content">Tühjenda sisu</string>
6261
<string name="content_description_muted_conversation">Vaigistatud vestlus</string>
6362
<string name="content_description_download_icon">Allalaadimise ikoon</string>
6463
<string name="content_description_open_asset_icon">Avamise ikoon</string>

app/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<string name="content_description_reveal_password">Afficher le mot de passe</string>
7878
<string name="content_description_hide_password">Cacher le mot de passe</string>
7979
<string name="content_description_search_back">Icône de retour de recherche</string>
80-
<string name="content_description_clear_content">Effacer le contenu</string>
8180
<string name="content_description_muted_conversation">Conversation en sourdine</string>
8281
<string name="content_description_download_icon">Icône de téléchargement</string>
8382
<string name="content_description_open_asset_icon">Icône d\'ouverture</string>
@@ -89,8 +88,6 @@
8988
<string name="content_description_unblock_the_user">Débloquer</string>
9089
<string name="content_description_conversation_phone_icon">Passer un appel audio</string>
9190
<string name="content_description_welcome_wire_logo">Wire</string>
92-
<string name="content_description_conversation_search_icon">Icône de Recherche</string>
93-
<string name="content_description_conversation_search_input">Saisie de la recherche</string>
9491
<string name="content_description_conversation_enable_rich_text_mode">Bouton d\'activation du mode texte enrichi</string>
9592
<string name="content_description_conversation_enable_drawing_mode">Activer le bouton du mode dessin</string>
9693
<string name="content_description_conversation_rich_text_header">En-tête de mise en forme du texte enrichi</string>

app/src/main/res/values-hr/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<string name="content_description_reveal_password">Prikaži lozinku</string>
7676
<string name="content_description_hide_password">Sakrij lozinku</string>
7777
<string name="content_description_search_back">Ikona za povratak</string>
78-
<string name="content_description_clear_content">Izbriši sadržaj</string>
7978
<string name="content_description_muted_conversation">Utišan razgovor</string>
8079
<string name="content_description_download_icon">Ikona za preuzimanje</string>
8180
<string name="content_description_open_asset_icon">Otvori ikonu</string>
@@ -87,8 +86,6 @@
8786
<string name="content_description_unblock_the_user">Odblokiraj</string>
8887
<string name="content_description_conversation_phone_icon">Pokreni audio poziv</string>
8988
<string name="content_description_welcome_wire_logo">Wire</string>
90-
<string name="content_description_conversation_search_icon">Ikona pretraživanja</string>
91-
<string name="content_description_conversation_search_input">Unos pretraživanja</string>
9289
<string name="content_description_conversation_enable_rich_text_mode">Gumb za prikaz obogaćenog teksta</string>
9390
<string name="content_description_conversation_rich_text_header">Zaglavlje teksta</string>
9491
<string name="content_description_conversation_rich_text_bold">Podebljanje teksta</string>

app/src/main/res/values-hu/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<string name="content_description_reveal_password">Jelszó megjelenítése</string>
8585
<string name="content_description_hide_password">Jelszó elrejtése</string>
8686
<string name="content_description_search_back">Keresés vissza ikon</string>
87-
<string name="content_description_clear_content">Tartalom törlése</string>
8887
<string name="content_description_muted_conversation">Némított beszélgetés</string>
8988
<string name="content_description_download_icon">Letöltés ikon</string>
9089
<string name="content_description_open_asset_icon">Megnyitás ikon</string>
@@ -98,8 +97,6 @@
9897
<string name="content_description_delete_the_conversation">Beszélgetés törlése</string>
9998
<string name="content_description_conversation_phone_icon">Hívás indítása</string>
10099
<string name="content_description_welcome_wire_logo">Wire</string>
101-
<string name="content_description_conversation_search_icon">Keresés ikon</string>
102-
<string name="content_description_conversation_search_input">Keresőmező</string>
103100
<string name="content_description_conversation_enable_rich_text_mode">Formázott szöveg engedélyezése gomb</string>
104101
<string name="content_description_conversation_enable_drawing_mode">Rajzmód gomb engedélyezése</string>
105102
<string name="content_description_conversation_rich_text_header">Szövegformázás Címsor</string>

app/src/main/res/values-it/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<string name="content_description_reveal_password">Mostra la password</string>
8181
<string name="content_description_hide_password">Nascondi la password</string>
8282
<string name="content_description_search_back">Icona di ricerca all\'indietro</string>
83-
<string name="content_description_clear_content">Cancella il contenuto</string>
8483
<string name="content_description_muted_conversation">Conversazione silenziata</string>
8584
<string name="content_description_download_icon">Icona di download</string>
8685
<string name="content_description_open_asset_icon">Apri icona</string>
@@ -92,8 +91,6 @@
9291
<string name="content_description_unblock_the_user">Sblocca</string>
9392
<string name="content_description_conversation_phone_icon">Avvia chiamata audio</string>
9493
<string name="content_description_welcome_wire_logo">Wire</string>
95-
<string name="content_description_conversation_search_icon">Icona di ricerca</string>
96-
<string name="content_description_conversation_search_input">Input della ricerca</string>
9794
<string name="content_description_conversation_enable_rich_text_mode">Abilita la modalit&#224; di testo avanzata</string>
9895
<string name="content_description_conversation_rich_text_header">Intestazione formattata in testo ricco</string>
9996
<string name="content_description_conversation_rich_text_bold">Grassetto formattazione in testo ricco</string>

0 commit comments

Comments
 (0)