jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extracting server information rendering to a reusable method to reduce duplication and better enforce consistency

This commit is contained in:
Adam Brown 2022-04-08 13:12:42 +01:00
parent 05a7d40950
commit a2bcbfb7c7
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
View File

@ -20,6 +20,7 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.annotation.DrawableRes
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.airbnb.mvrx.withState import com.airbnb.mvrx.withState
import im.vector.app.R import im.vector.app.R
@ -55,25 +56,23 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
views.loginSignupSigninSignIn.setOnClickListener { signIn() } views.loginSignupSigninSignIn.setOnClickListener { signIn() }
} }
private fun setupUi(state: OnboardingViewState) { private fun render(state: OnboardingViewState) {
when (state.serverType) { when (state.serverType) {
ServerType.MatrixOrg -> { ServerType.MatrixOrg -> renderServerInformation(
views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org) icon = R.drawable.ic_logo_matrix_org,
views.loginSignupSigninServerIcon.isVisible = true title = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl()),
views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl()) subtitle = getString(R.string.login_server_matrix_org_text)
views.loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text) )
} ServerType.EMS -> renderServerInformation(
ServerType.EMS -> { icon = R.drawable.ic_logo_element_matrix_services,
views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services) title = getString(R.string.login_connect_to_modular),
views.loginSignupSigninServerIcon.isVisible = true subtitle = state.selectedHomeserver.userFacingUrl.toReducedUrl()
views.loginSignupSigninTitle.text = getString(R.string.login_connect_to_modular) )
views.loginSignupSigninText.text = state.selectedHomeserver.userFacingUrl.toReducedUrl() ServerType.Other -> renderServerInformation(
} icon = null,
ServerType.Other -> { title = getString(R.string.login_server_other_title),
views.loginSignupSigninServerIcon.isVisible = false subtitle = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl())
views.loginSignupSigninTitle.text = getString(R.string.login_server_other_title) )
views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl())
}
ServerType.Unknown -> Unit /* Should not happen */ ServerType.Unknown -> Unit /* Should not happen */
} }
@ -100,6 +99,14 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
} }
} }
private fun renderServerInformation(@DrawableRes icon: Int?, title: String, subtitle: String) {
icon?.let { views.loginSignupSigninServerIcon.setImageResource(it) }
views.loginSignupSigninServerIcon.isVisible = icon != null
views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
views.loginSignupSigninTitle.text = title
views.loginSignupSigninText.text = subtitle
}
private fun setupButtons(state: OnboardingViewState) { private fun setupButtons(state: OnboardingViewState) {
when (state.selectedHomeserver.preferredLoginMode) { when (state.selectedHomeserver.preferredLoginMode) {
is LoginMode.Sso -> { is LoginMode.Sso -> {
@ -136,7 +143,7 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
} }
override fun updateWithState(state: OnboardingViewState) { override fun updateWithState(state: OnboardingViewState) {
setupUi(state) render(state)
setupButtons(state) setupButtons(state)
} }
} }