Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6b5b4b4

Browse files
authored
fix: new registration general fixes about navigation and copies (WPB-17410) (#4071)
1 parent359a3c4 commit6b5b4b4

File tree

4 files changed

+30
-13
lines changed

4 files changed

+30
-13
lines changed

‎app/src/main/kotlin/com/wire/android/ui/authentication/create/username/CreateAccountUsernameScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private fun UsernameContent(
9393
NewAuthHeader(
9494
title= {
9595
Text(
96-
text= stringResource(id=R.string.create_personal_account_title),
96+
text= stringResource(id=R.string.create_account_set_username_title),
9797
style=MaterialTheme.wireTypography.title01,
9898
)
9999
},

‎app/src/main/kotlin/com/wire/android/ui/authentication/welcome/WelcomeScreen.kt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,12 @@ import com.ramcosta.composedestinations.annotation.RootNavGraph
7070
importcom.wire.android.BuildConfig.ENABLE_NEW_REGISTRATION
7171
importcom.wire.android.R
7272
importcom.wire.android.config.LocalCustomUiConfigurationProvider
73+
importcom.wire.android.config.orDefault
7374
importcom.wire.android.navigation.NavigationCommand
7475
importcom.wire.android.navigation.Navigator
7576
importcom.wire.android.navigation.annotation.app.WireDestination
7677
importcom.wire.android.navigation.style.PopUpNavigationAnimation
78+
importcom.wire.android.ui.authentication.create.common.CreateAccountDataNavArgs
7779
importcom.wire.android.ui.authentication.create.common.ServerTitle
7880
importcom.wire.android.ui.authentication.login.LoginPasswordPath
7981
importcom.wire.android.ui.common.button.WirePrimaryButton
@@ -87,7 +89,7 @@ import com.wire.android.ui.common.scaffold.WireScaffold
8789
importcom.wire.android.ui.common.topappbar.NavigationIconType
8890
importcom.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
8991
importcom.wire.android.ui.common.visbility.rememberVisibilityState
90-
importcom.wire.android.ui.destinations.CreateAccountSelectorScreenDestination
92+
importcom.wire.android.ui.destinations.CreateAccountDataDetailScreenDestination
9193
importcom.wire.android.ui.destinations.CreatePersonalAccountOverviewScreenDestination
9294
importcom.wire.android.ui.destinations.CreateTeamAccountOverviewScreenDestination
9395
importcom.wire.android.ui.destinations.LoginScreenDestination
@@ -132,6 +134,7 @@ private fun WelcomeContent(
132134
navigateBack: ()->Unit,
133135
navigate: (NavigationCommand)->Unit
134136
) {
137+
val teamCreationUrl= state.teams+ stringResource(R.string.create_account_email_backlink_to_team_suffix_url)
135138
val enterpriseDisabledWithProxyDialogState= rememberVisibilityState<FeatureDisabledWithProxyDialogState>()
136139
val createPersonalAccountDisabledWithProxyDialogState= rememberVisibilityState<FeatureDisabledWithProxyDialogState>()
137140
val context=LocalContext.current
@@ -206,7 +209,11 @@ private fun WelcomeContent(
206209
)
207210
)
208211
}else {
209-
navigate(NavigationCommand(CreateTeamAccountOverviewScreenDestination(state)))
212+
if (ENABLE_NEW_REGISTRATION) {
213+
CustomTabsHelper.launchUrl(context, teamCreationUrl)
214+
}else {
215+
navigate(NavigationCommand(CreateTeamAccountOverviewScreenDestination(state)))
216+
}
210217
}
211218
}
212219
}
@@ -224,7 +231,15 @@ private fun WelcomeContent(
224231
)
225232
}else {
226233
if (ENABLE_NEW_REGISTRATION) {
227-
navigate(NavigationCommand(CreateAccountSelectorScreenDestination(state)))
234+
navigate(
235+
NavigationCommand(
236+
CreateAccountDataDetailScreenDestination(
237+
CreateAccountDataNavArgs(
238+
customServerConfig= state.orDefault()
239+
)
240+
)
241+
)
242+
)
228243
}else {
229244
navigate(NavigationCommand(CreatePersonalAccountOverviewScreenDestination(state)))
230245
}

‎app/src/main/kotlin/com/wire/android/ui/registration/details/CreateAccountDataDetailScreen.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
packagecom.wire.android.ui.registration.details
2020

21-
importandroidx.compose.animation.AnimatedVisibility
21+
importandroidx.compose.animation.AnimatedContent
2222
importandroidx.compose.foundation.layout.Arrangement
2323
importandroidx.compose.foundation.layout.Column
2424
importandroidx.compose.foundation.layout.Row
@@ -72,6 +72,7 @@ import com.wire.android.ui.common.button.WireSecondaryButton
7272
importcom.wire.android.ui.common.dimensions
7373
importcom.wire.android.ui.common.error.CoreFailureErrorDialog
7474
importcom.wire.android.ui.common.preview.EdgeToEdgePreview
75+
importcom.wire.android.ui.common.spacers.VerticalSpace
7576
importcom.wire.android.ui.common.textfield.DefaultEmailDone
7677
importcom.wire.android.ui.common.textfield.DefaultPassword
7778
importcom.wire.android.ui.common.textfield.WirePasswordTextField
@@ -196,16 +197,16 @@ private fun AccountDetailsContent(
196197
keyboardOptions=KeyboardOptions.DefaultEmailDone,
197198
onKeyboardAction= { keyboardController?.hide() },
198199
modifier=Modifier
199-
.padding(
200-
start=MaterialTheme.wireDimensions.spacing16x,
201-
end=MaterialTheme.wireDimensions.spacing16x,
202-
bottom=MaterialTheme.wireDimensions.spacing16x
203-
)
200+
.padding(horizontal=MaterialTheme.wireDimensions.spacing16x)
204201
.testTag("emailField")
205202
.focusRequester(emailFocusRequester)
206203
)
207-
AnimatedVisibility(visible= state.error.isEmailError()) {
208-
EmailErrorDetailText(state.error)
204+
205+
AnimatedContent(state.error.isEmailError()) { isEmailError->
206+
when (isEmailError) {
207+
true->EmailErrorDetailText(state.error)
208+
false->VerticalSpace.x16()
209+
}
209210
}
210211

211212
WireTextField(

‎app/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
<stringname="enterprise_login_user_identifier_label_placeholder">Enter Email or SSO Code</string>
378378
<stringname="enterprise_login_error_invalid_user_identifier">Please enter a valid email or SSO code</string>
379379
<stringname="enterprise_login_create_account_label">Don\'t have a Wire account?</string>
380-
<stringname="enterprise_login_create_account_text_button">Create account</string>
380+
<stringname="enterprise_login_create_account_text_button">Create account or team</string>
381381
<stringname="enterprise_login_on_prem_welcome_title">Welcome to Wire Enterprise for %s!</string>
382382
<stringname="enterprise_login_verification_code_title">You have mail</string>
383383
<!-- Login-->
@@ -531,6 +531,7 @@
531531
<stringname="create_account_username_title">Your Username</string>
532532
<stringname="create_account_username_placeholder">jane.doe</string>
533533
<stringname="create_account_username_label">USERNAME</string>
534+
<stringname="create_account_set_username_title">Set username</string>
534535
<stringname="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
535536
<stringname="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
536537
<stringname="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp