From 258a378f39f604f243fdd04acb34130fcd79089c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 19 Apr 2021 15:51:56 +0200
Subject: [PATCH] Add back link to learn more on EMS

---
 .../java/im/vector/app/core/extensions/TextView.kt |  2 +-
 .../login2/LoginServerSelectionFragment2.kt        | 12 ++++++++++++
 .../layout/fragment_login_server_selection_2.xml   | 14 +++++++++++++-
 vector/src/main/res/values/strings_login_v2.xml    |  2 ++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
index 574e25a5ee..6b3902deea 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
@@ -62,7 +62,7 @@ fun TextView.setTextWithColoredPart(@StringRes fullTextRes: Int,
                                     @StringRes coloredTextRes: Int,
                                     @AttrRes colorAttribute: Int = R.attr.colorAccent,
                                     underline: Boolean = false,
-                                    onClick: (() -> Unit)?) {
+                                    onClick: (() -> Unit)? = null) {
     val coloredPart = resources.getString(coloredTextRes)
     // Insert colored part into the full text
     val fullText = resources.getString(fullTextRes, coloredPart)
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt
index 3343abbdde..60e381b047 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt
@@ -21,7 +21,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import im.vector.app.R
+import im.vector.app.core.extensions.setTextWithColoredPart
+import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.databinding.FragmentLoginServerSelection2Binding
+import im.vector.app.features.login.EMS_LINK
 import javax.inject.Inject
 
 /**
@@ -42,6 +45,15 @@ class LoginServerSelectionFragment2 @Inject constructor() : AbstractLoginFragmen
     private fun initViews() {
         views.loginServerChoiceMatrixOrg.setOnClickListener { selectMatrixOrg() }
         views.loginServerChoiceOther.setOnClickListener { selectOther() }
+
+        views.loginServerChoiceEmsLearnMore.setTextWithColoredPart(
+                fullTextRes = R.string.login_server_modular_learn_more_about_ems,
+                coloredTextRes = R.string.login_server_modular_learn_more,
+                underline = true
+        )
+        views.loginServerChoiceEmsLearnMore.setOnClickListener {
+            openUrlInChromeCustomTab(requireActivity(), null, EMS_LINK)
+        }
     }
 
     private fun updateUi(state: LoginViewState2) {
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index 1a7d5a14c5..9200a76f04 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -86,7 +86,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:layout_marginBottom="32dp"
                 android:background="@drawable/bg_login_server_selector"
                 android:contentDescription="@string/login_a11y_choose_other"
                 android:minHeight="80dp"
@@ -122,6 +121,19 @@
 
             </im.vector.app.core.platform.CheckableConstraintLayout>
 
+            <TextView
+                android:id="@+id/loginServerChoiceEmsLearnMore"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:text="@string/login_server_modular_learn_more_about_ems"
+                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />
+
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/values/strings_login_v2.xml b/vector/src/main/res/values/strings_login_v2.xml
index 91e4d8c38b..5d1e14d73e 100644
--- a/vector/src/main/res/values/strings_login_v2.xml
+++ b/vector/src/main/res/values/strings_login_v2.xml
@@ -44,5 +44,7 @@
     <string name="login_set_msisdn_title_2">Associate a phone number</string>
     <string name="login_set_msisdn_notice_2">Associate a phone number to optionally allow people you know to discover you.</string>
     <string name="login_set_msisdn_mandatory_notice_2">The server %s requires you to associate a phone number to create an account.</string>
+    <!-- %S will be replaced by the value of login_server_modular_learn_more ("Learn more" in English)-->
+    <string name="login_server_modular_learn_more_about_ems">%s about Element Matrix Service.</string>
 
 </resources>
\ No newline at end of file