updating email entry copy to include the current homeserver

Author: ouchadam

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)
     }

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"

vector/src/main/res/values/donottranslate.xml

@@ -23,7 +23,6 @@
     <string name="ftue_auth_choose_server_title">Select your server</string>
     <string name="ftue_auth_choose_server_subtitle">What is the address of your server? This is like a home for all your data</string>
     <string name="ftue_auth_choose_server_entry_hint">Server URL</string>
-    <string name="ftue_auth_choose_server_entry_footer">You can only connect to a server that has already been set up</string>
     <string name="ftue_auth_choose_server_ems_title">Want to host your own server?</string>
 
     <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is a robust and reliable hosting service for fast, secure and real time communication. Find out how on <a href="${ftue_ems_url}">element.io/ems</a></string>
@@ -32,9 +31,10 @@
     <string name="ftue_auth_terms_title">Privacy policy</string>
     <string name="ftue_auth_terms_subtitle">Please read through T&amp;C. You must accept in order to continue.</string>
 
-    <string name="ftue_auth_email_title">Enter your email address</string>
-    <string name="ftue_auth_email_subtitle">This will help verify your account and enables password recovery.</string>
-    <string name="ftue_auth_email_entry_title">Email Address</string>
+    <string name="ftue_auth_email_title">Enter your email</string>
+    <!-- Note for translators, %s is the homeserver name, eg matrix.org -->
+    <string name="ftue_auth_email_subtitle">%s needs to verify your account</string>
+    <string name="ftue_auth_email_entry_title">Email</string>
     <string name="ftue_auth_phone_title">Enter your phone number</string>
     <string name="ftue_auth_phone_subtitle">This will help verify your account and enables password recovery.</string>
     <string name="ftue_auth_phone_entry_title">Phone Number</string>
@@ -55,7 +55,7 @@
 
     <string name="ftue_auth_email_verification_title">Check your email to verify.</string>
     <!-- Note for translators, %s is the users email address -->
-    <string name="ftue_auth_email_verification_subtitle">To confirm your email address, tap the button in the email we just sent to %s</string>
+    <string name="ftue_auth_email_verification_subtitle">To confirm your email, tap the button in the email we just sent to %s</string>
     <string name="ftue_auth_email_verification_footer">Did not receive an email?</string>
     <string name="ftue_auth_email_resend_email">Resend email</string>
     <string name="ftue_auth_forgot_password">Forgot password</string>