hiding username/password fields when the homeserver doesn't support t…

…hem and showing SSO options when available
element-hq · May 23, 2022 · 9b266c8 · 9b266c8
1 parent 2afdf2c
commit 9b266c8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/...src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt b/...src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
@@ -112,13 +112,24 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
 
     private fun setupUi(state: OnboardingViewState) {
         when (state.selectedHomeserver.preferredLoginMode) {
-            is LoginMode.SsoAndPassword -> renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
-            else                        -> hideSsoProviders()
+            is LoginMode.SsoAndPassword -> {
+                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>?) {
         views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
+        views.ssoButtonsHeader.isVisible = views.ssoGroup.isVisible && views.loginEntryGroup.isVisible
         views.ssoButtons.render(ssoProviders, SocialLoginButtonsView.Mode.MODE_CONTINUE) { id ->
             viewModel.getSsoUrl(
                     redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
@@ -133,6 +144,14 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
         views.ssoButtons.ssoIdentityProviders = null
     }
 
+    private fun hideUsernamePassword() {
+        views.loginEntryGroup.isVisible = false
+    }
+
+    private fun showUsernamePassword() {
+        views.loginEntryGroup.isVisible = true
+    }
+
     private fun setupAutoFill() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             views.loginInput.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_USERNAME)

diff --git a/vector/src/main/res/layout/fragment_ftue_combined_login.xml b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
@@ -128,6 +128,13 @@
             app:layout_constraintStart_toStartOf="@id/loginGutterStart"
             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
             android:id="@+id/loginInput"
             style="@style/Widget.Vector.TextInputLayout.Username"