Commitbd14f82

authored

feat: show create account button for on-prem and hide it with compile flag (#3978)

1 parenta4eaf0c commitbd14f82Copy full SHA for bd14f82

File tree

1 file changed

-3

lines changed

app/src/main/kotlin/com/wire/android/ui/newauthentication/login/password
- NewLoginPasswordScreen.kt

1 file changed

-3

lines changed

`‎app/src/main/kotlin/com/wire/android/ui/newauthentication/login/password/NewLoginPasswordScreen.kt`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId`
`43`	`43`	`importandroidx.compose.ui.text.style.TextAlign`
`44`	`44`	`importandroidx.compose.ui.text.style.TextDecoration`
`45`	`45`	`importandroidx.hilt.navigation.compose.hiltViewModel`
	`46`	`+importcom.wire.android.BuildConfig`
`46`	`47`	`importcom.wire.android.R`
`47`	`48`	`importcom.wire.android.navigation.BackStackMode`
`48`	`49`	`importcom.wire.android.navigation.NavigationCommand`
`@@ -75,7 +76,7 @@ import com.wire.android.ui.common.preview.EdgeToEdgePreview`
`75`	`76`	`importcom.wire.android.ui.common.textfield.clearAutofillTree`
`76`	`77`	`importcom.wire.android.ui.common.typography`
`77`	`78`	`importcom.wire.android.ui.common.visbility.rememberVisibilityState`
`78`		`-importcom.wire.android.ui.destinations.CreateTeamAccountOverviewScreenDestination`
	`79`	`+importcom.wire.android.ui.destinations.CreatePersonalAccountOverviewScreenDestination`
`79`	`80`	`importcom.wire.android.ui.destinations.E2EIEnrollmentScreenDestination`
`80`	`81`	`importcom.wire.android.ui.destinations.HomeScreenDestination`
`81`	`82`	`importcom.wire.android.ui.destinations.InitialSyncScreenDestination`
`@@ -121,7 +122,7 @@ fun NewLoginPasswordScreen(`
`121`	`122`	`passwordTextState= loginEmailViewModel.passwordTextState,`
`122`	`123`	`onLoginButtonClick= loginEmailViewModel::login,`
`123`	`124`	`onCreateAccount= {`
`124`		`- navigator.navigate(NavigationCommand(CreateTeamAccountOverviewScreenDestination(loginEmailViewModel.serverConfig)))`
	`125`	`+ navigator.navigate(NavigationCommand(CreatePersonalAccountOverviewScreenDestination(loginEmailViewModel.serverConfig)))`
`125`	`126`	`},`
`126`	`127`	`canNavigateBack= navigator.navController.previousBackStackEntry!=null,// if there is a previous screen to navigate back to`
`127`	`128`	`navigateBack= loginEmailViewModel::cancelLogin,`
`@@ -228,7 +229,10 @@ internal fun LoginPasswordContent(`
`228`	`229`	`.padding(bottom= dimensions().spacing24x)`
`229`	`230`	`)`
`230`	`231`	`}`
`231`		`-if (!serverConfig.isOnPremises&&!serverConfig.isProxyEnabled()&& isCloudAccountCreationPossible) {`
	`232`	`+if (BuildConfig.ALLOW_ACCOUNT_CREATION&&`
	`233`	`+!serverConfig.isProxyEnabled()&&`
	`234`	`+ isCloudAccountCreationPossible`
	`235`	`+ ) {`
`232`	`236`	`CreateAccountContent(`
`233`	`237`	`onCreateAccountClicked= onCreateAccount,`
`234`	`238`	`modifier=Modifier.fillMaxWidth(),`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbd14f82

File tree

1 file changed

1 file changed

`‎app/src/main/kotlin/com/wire/android/ui/newauthentication/login/password/NewLoginPasswordScreen.kt`

0 commit comments