filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-11 17:33:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

hiding username/password fields when the homeserver doesn't support them and showing SSO options when available

Browse Source
This commit is contained in:
Adam Brown 2022-05-16 15:52:24 +01:00
parent bc2a99c3cf
commit 137fe89938
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
View File

@ -112,13 +112,24 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
private fun setupUi(state: OnboardingViewState) { private fun setupUi(state: OnboardingViewState) {
when (state.selectedHomeserver.preferredLoginMode) { when (state.selectedHomeserver.preferredLoginMode) {
is LoginMode.SsoAndPassword -> renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders) is LoginMode.SsoAndPassword -> {
else -> hideSsoProviders() showUsernamePassword()
renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
}
is LoginMode.Sso -> {
hideUsernamePassword()
renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
}
else -> {
showUsernamePassword()
hideSsoProviders()
}
} }
} }
private fun renderSsoProviders(deviceId: String?, ssoProviders: List<SsoIdentityProvider>?) { private fun renderSsoProviders(deviceId: String?, ssoProviders: List<SsoIdentityProvider>?) {
views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
views.ssoButtonsHeader.isVisible = views.ssoGroup.isVisible && views.loginEntryGroup.isVisible
views.ssoButtons.render(ssoProviders, SocialLoginButtonsView.Mode.MODE_CONTINUE) { id -> views.ssoButtons.render(ssoProviders, SocialLoginButtonsView.Mode.MODE_CONTINUE) { id ->
viewModel.getSsoUrl( viewModel.getSsoUrl(
redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL, redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
@ -133,6 +144,14 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
views.ssoButtons.ssoIdentityProviders = null views.ssoButtons.ssoIdentityProviders = null
} }
private fun hideUsernamePassword() {
views.loginEntryGroup.isVisible = false
}
private fun showUsernamePassword() {
views.loginEntryGroup.isVisible = true
}
private fun setupAutoFill() { private fun setupAutoFill() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
views.loginInput.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_USERNAME) views.loginInput.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_USERNAME)

7
vector/src/main/res/layout/fragment_ftue_combined_login.xml
View File

@ -128,6 +128,13 @@
app:layout_constraintStart_toStartOf="@id/loginGutterStart" app:layout_constraintStart_toStartOf="@id/loginGutterStart"
app:layout_constraintTop_toTopOf="@id/serverSelectionSpacing" /> app:layout_constraintTop_toTopOf="@id/serverSelectionSpacing" />
<androidx.constraintlayout.widget.Group
android:id="@+id/loginEntryGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
app:constraint_referenced_ids="loginInput,loginPasswordInput,entrySpacing,actionSpacing,loginSubmit" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/loginInput" android:id="@+id/loginInput"
style="@style/Widget.Vector.TextInputLayout.Username" style="@style/Widget.Vector.TextInputLayout.Username"