Skip to content
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

Jump to bottom

fix: text changes for the new group creation flow [WPB-1630] #2947

Merged
merged 3 commits into from
Apr 29, 2024
Merged

fix: text changes for the new group creation flow [WPB-1630] #2947

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38229e6
fix: text changes for the new group creation flow [WPB-1630]
saleniuk Apr 29, 2024
48517cd
Merge remote-tracking branch 'origin/develop' into fix/new-group-flow…
saleniuk Apr 29, 2024
8a5a6c0
detekt
saleniuk Apr 29, 2024
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
4 changes: 3 additions & 1 deletion ...in/kotlin/com/wire/android/ui/home/newconversation/common/SelectParticipantsButtonsRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
Expand Down Expand Up @@ -153,7 +154,8 @@ fun SelectParticipantsButtonsRow(
.padding(horizontal = dimensions().spacing16x)
.height(dimensions().groupButtonHeight),
) {
val buttonText = if (showTotalSelectedItemsCount) "$mainButtonText ($selectedParticipantsCount)" else mainButtonText
val countText = pluralStringResource(R.plurals.label_x_participants, selectedParticipantsCount, selectedParticipantsCount)
val buttonText = if (showTotalSelectedItemsCount) "$mainButtonText ($countText)" else mainButtonText
WirePrimaryButton(
text = buttonText,
leadingIcon = leadingIcon,
Expand Down
2 changes: 1 addition & 1 deletion ...tlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fun NewConversationSearchPeopleScreen(
userSearchSignal = userSearchSignal,
serviceSearchSignal = serviceSearchSignal,
searchTitle = stringResource(id = R.string.label_new_conversation),
actionButtonTitle = stringResource(id = R.string.label_new_group),
actionButtonTitle = stringResource(id = R.string.label_create_new_group),
onServicesSearchQueryChanged = searchBarViewModel::onServiceSearchQueryChanged,
onUsersSearchQueryChanged = searchBarViewModel::onUserSearchQueryChanged,
onOpenUserProfile = { contact ->
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,11 @@
<!-- Search Contact-->
<string name="label_contacts">CONTACTS</string>
<string name="label_new_group">New Group</string>
<string name="label_create_new_group">Create New Group</string>
<plurals name="label_x_participants">
<item quantity="one">%1$d Participant</item>
<item quantity="other">%1$d Participants</item>
</plurals>
<string name="label_new_conversation">New Conversation</string>
<string name="label_search_people">Search people</string>
<string name="label_public_wire">PUBLIC WIRE</string>
Expand Down
Loading