Merge pull request #5106 from vector-im/feature/adm/enable-use-case-f…

…eature Enabling FTUE Use Case
element-hq · Feb 3, 2022 · dbfd7e6 · dbfd7e6
2 parents dba9a47 + 63a937c
commit dbfd7e6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
@@ -40,8 +40,11 @@ class OnboardingRobot {
 
     private fun crawlGetStarted() {
         clickOn(R.id.loginSplashSubmit)
+        assertDisplayed(R.id.useCaseHeaderTitle, R.string.ftue_auth_use_case_title)
+        clickOn(R.id.useCaseOptionOne)
         OnboardingServersRobot().crawlSignUp()
         pressBack()
+        pressBack()
     }
 
     private fun crawlAlreadyHaveAccount() {
@@ -66,6 +69,7 @@ class OnboardingRobot {
         assertDisplayed(R.id.loginSplashSubmit, R.string.login_splash_create_account)
         if (createAccount) {
             clickOn(R.id.loginSplashSubmit)
+            clickOn(R.id.useCaseOptionOne)
         } else {
             clickOn(R.id.loginSplashAlreadyHaveAccount)
         }

diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -36,5 +36,5 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun onboardingVariant(): VectorFeatures.OnboardingVariant = BuildConfig.ONBOARDING_VARIANT
     override fun isOnboardingAlreadyHaveAccountSplashEnabled() = true
     override fun isOnboardingSplashCarouselEnabled() = true
-    override fun isOnboardingUseCaseEnabled() = false
+    override fun isOnboardingUseCaseEnabled() = true
 }
diff --git a/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml b/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml
@@ -79,7 +79,7 @@
 
         <TextView
             android:id="@+id/useCaseOptionOne"
-            style="@style/Widget.Vector.TextView.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -97,7 +97,7 @@
 
         <TextView
             android:id="@+id/useCaseOptionTwo"
-            style="@style/Widget.Vector.TextView.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -115,7 +115,7 @@
 
         <TextView
             android:id="@+id/useCaseOptionThree"
-            style="@style/Widget.Vector.TextView.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -133,10 +133,12 @@
 
         <TextView
             android:id="@+id/useCaseSkip"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:clickable="true"
             android:gravity="center"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/contentFooterSpacing"
             app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
             app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
@@ -153,10 +155,12 @@
 
         <TextView
             android:id="@+id/useCaseFooter"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/ftue_auth_use_case_join_existing_server"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/useCaseConnectToServer"
             app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
             app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"

diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
@@ -16,15 +16,4 @@
 
     <!-- onboarding english only word play -->
     <string name="cut_the_slack_from_teams" translatable="false">Cut the slack from teams.</string>
-
-    <!--  WIP strings, will move to strings.xml when signed off  -->
-    <string name="ftue_auth_use_case_title" translatable="false">Who will you chat to the most?</string>
-    <string name="ftue_auth_use_case_subtitle" translatable="false">We\'ll help you get connected.</string>
-    <string name="ftue_auth_use_case_option_one" translatable="false">Friends and family</string>
-    <string name="ftue_auth_use_case_option_two" translatable="false">Teams</string>
-    <string name="ftue_auth_use_case_option_three" translatable="false">Communities</string>
-    <string name="ftue_auth_use_case_skip" translatable="false">Not sure yet? %s</string>
-    <string name="ftue_auth_use_case_skip_partial" translatable="false">You can skip this question</string>
-    <string name="ftue_auth_use_case_join_existing_server" translatable="false">Looking to join an existing server?</string>
-    <string name="ftue_auth_use_case_connect_to_server" translatable="false">Connect to server</string>
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
@@ -2556,6 +2556,17 @@
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
     <string name="template_ftue_auth_carousel_body_workplace" translatable="false">${app_name} is also great for the workplace. It’s trusted by the world’s most secure organisations.</string>
 
+    <string name="ftue_auth_use_case_title">Who will you chat to the most?</string>
+    <string name="ftue_auth_use_case_subtitle">We\'ll help you get connected.</string>
+    <string name="ftue_auth_use_case_option_one">Friends and family</string>
+    <string name="ftue_auth_use_case_option_two">Teams</string>
+    <string name="ftue_auth_use_case_option_three">Communities</string>
+    <!-- Note to translators: the %s is replaced by the content of ftue_auth_use_case_skip_partial -->
+    <string name="ftue_auth_use_case_skip">Not sure yet? You can %s</string>
+    <string name="ftue_auth_use_case_skip_partial">skip this question</string>
+    <string name="ftue_auth_use_case_join_existing_server">Looking to join an existing server?</string>
+    <string name="ftue_auth_use_case_connect_to_server">Connect to server</string>
+
     <string name="login_splash_title">It\'s your conversation. Own it.</string>
     <string name="login_splash_text1">Chat with people directly or in groups</string>
     <string name="login_splash_text2">Keep conversations private with encryption</string>