diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt index 1d85c75fa1..61da7e0d18 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt @@ -20,14 +20,17 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import im.vector.app.R import im.vector.app.core.extensions.associateContentStateWith import im.vector.app.core.extensions.autofillEmail import im.vector.app.core.extensions.clearErrorOnChange import im.vector.app.core.extensions.content import im.vector.app.core.extensions.isEmail import im.vector.app.core.extensions.setOnImeDoneListener +import im.vector.app.core.extensions.toReducedUrl import im.vector.app.databinding.FragmentFtueEmailInputBinding import im.vector.app.features.onboarding.OnboardingAction +import im.vector.app.features.onboarding.OnboardingViewState import im.vector.app.features.onboarding.RegisterAction import org.matrix.android.sdk.api.auth.registration.RegisterThreePid import javax.inject.Inject @@ -56,6 +59,10 @@ class FtueAuthEmailEntryFragment @Inject constructor() : AbstractFtueAuthFragmen viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.AddThreePid(RegisterThreePid.Email(email)))) } + override fun updateWithState(state: OnboardingViewState) { + views.emailEntryHeaderSubtitle.text = getString(R.string.ftue_auth_email_subtitle, state.selectedHomeserver.userFacingUrl.toReducedUrl()) + } + override fun onError(throwable: Throwable) { views.emailEntryInput.error = errorFormatter.toHumanReadable(throwable) } diff --git a/vector/src/main/res/layout/fragment_ftue_email_input.xml b/vector/src/main/res/layout/fragment_ftue_email_input.xml index 0cfcfea7cc..046d9de552 100644 --- a/vector/src/main/res/layout/fragment_ftue_email_input.xml +++ b/vector/src/main/res/layout/fragment_ftue_email_input.xml @@ -70,7 +70,6 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:gravity="center" - android:text="@string/ftue_auth_email_subtitle" android:textColor="?vctr_content_secondary" app:layout_constraintBottom_toTopOf="@id/titleContentSpacing" app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd" diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml index 0a96fd704b..8e8e4e8b56 100755 --- a/vector/src/main/res/values/donottranslate.xml +++ b/vector/src/main/res/values/donottranslate.xml @@ -23,7 +23,6 @@ Select your server What is the address of your server? This is like a home for all your data Server URL - You can only connect to a server that has already been set up Want to host your own server? Element Matrix Services (EMS) is a robust and reliable hosting service for fast, secure and real time communication. Find out how on element.io/ems @@ -32,9 +31,10 @@ Privacy policy Please read through T&C. You must accept in order to continue. - Enter your email address - This will help verify your account and enables password recovery. - Email Address + Enter your email + + %s needs to verify your account + Email Enter your phone number This will help verify your account and enables password recovery. Phone Number @@ -55,7 +55,7 @@ Check your email to verify. - To confirm your email address, tap the button in the email we just sent to %s + To confirm your email, tap the button in the email we just sent to %s Did not receive an email? Resend email Forgot password