filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using a consistent name for the combined register screens and events

Browse Source 
- also adds a missing tag to the fragment adding
This commit is contained in:
Adam Brown 2022-03-31 18:04:13 +01:00
parent c45c421e48
commit 801fb90f7b
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
View File

@ -36,7 +36,7 @@ sealed class OnboardingViewEvents : VectorViewEvents {
object OpenUseCaseSelection : OnboardingViewEvents()
object OpenServerSelection : OnboardingViewEvents()
object OpenCombinedServerSelection : OnboardingViewEvents()
object OpenCombinedRegister : OnboardingViewEvents()
data class OnServerSelectionDone(val serverType: ServerType) : OnboardingViewEvents()
object OnLoginFlowRetrieved : OnboardingViewEvents()
data class OnSignModeSelected(val signMode: SignMode) : OnboardingViewEvents()

2
vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
View File

@ -360,7 +360,7 @@ class OnboardingViewModel @AssistedInject constructor(
when (vectorFeatures.isOnboardingCombinedChooseServerEnabled()) {
true -> {
handle(OnboardingAction.UpdateHomeServer(matrixOrgUrl))
OnboardingViewEvents.OpenCombinedServerSelection
OnboardingViewEvents.OpenCombinedRegister
}
false -> _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
}

2
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedSignUpFragment.kt → vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
View File

@ -55,7 +55,7 @@ import org.matrix.android.sdk.api.failure.isUsernameInUse
import org.matrix.android.sdk.api.failure.isWeakPassword
import javax.inject.Inject
class FtueAuthCombinedSignUpFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentFtueSignUpCombinedBinding>() {
class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentFtueSignUpCombinedBinding>() {
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueSignUpCombinedBinding {
return FragmentFtueSignUpCombinedBinding.inflate(inflater, container, false)

9
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
View File

@ -138,7 +138,7 @@ class FtueAuthVariant(
handleRegistrationNavigation(viewEvents.flowResult)
} else {
if (vectorFeatures.isOnboardingCombinedChooseServerEnabled()) {
openCombinedSelectionSignUp()
openCombinedRegister()
} else {
// First ask for login and password
// I add a tag to indicate that this fragment is a registration stage.
@ -225,7 +225,7 @@ class FtueAuthVariant(
FtueAuthUseCaseFragment::class.java,
option = commonOption)
}
OnboardingViewEvents.OpenCombinedServerSelection -> openCombinedSelectionSignUp()
OnboardingViewEvents.OpenCombinedRegister -> openCombinedRegister()
is OnboardingViewEvents.OnAccountCreated -> onAccountCreated()
OnboardingViewEvents.OnAccountSignedIn -> onAccountSignedIn()
OnboardingViewEvents.OnChooseDisplayName -> onChooseDisplayName()
@ -236,10 +236,11 @@ class FtueAuthVariant(
}
}
private fun openCombinedSelectionSignUp() {
private fun openCombinedRegister() {
activity.addFragmentToBackstack(
views.loginFragmentContainer,
FtueAuthCombinedSignUpFragment::class.java,
FtueAuthCombinedRegisterFragment::class.java,
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
option = commonOption
)
}