From 5ee2579efcc93c24a56ae86311d6a7b5755221d3 Mon Sep 17 00:00:00 2001
From: ariskotsomitopoulos <aris.kotsomitopoulos@gmail.com>
Date: Tue, 5 Apr 2022 19:39:13 +0300
Subject: [PATCH] Revert "Remove duplicate learn more string resources"

This reverts commit 2ac33063829255d7ce413c50b6d52a8162ea28b4.
---
 .../app/features/login/LoginServerSelectionFragment.kt    | 2 +-
 .../app/features/login2/LoginServerSelectionFragment2.kt  | 2 +-
 .../ftueauth/FtueAuthServerSelectionFragment.kt           | 2 +-
 .../roommemberprofile/RoomMemberProfileController.kt      | 4 ++--
 .../main/res/layout/fragment_login_server_selection.xml   | 2 +-
 .../main/res/layout/fragment_login_server_url_form.xml    | 2 +-
 vector/src/main/res/layout/item_bottom_sheet_action.xml   | 8 ++++----
 vector/src/main/res/layout/item_profile_action.xml        | 2 +-
 vector/src/main/res/values/strings.xml                    | 3 ++-
 vector/src/main/res/values/strings_login_v2.xml           | 2 +-
 10 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
index 81f4f06084..a29967096a 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
@@ -56,7 +56,7 @@ class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment
 
     private fun initTextViews() {
         views.loginServerChoiceEmsLearnMore.text = span {
-            text = getString(R.string.action_learn_more)
+            text = getString(R.string.login_server_modular_learn_more)
             textDecorationLine = "underline"
         }
     }
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 cd3d359abd..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
@@ -48,7 +48,7 @@ class LoginServerSelectionFragment2 @Inject constructor() : AbstractLoginFragmen
 
         views.loginServerChoiceEmsLearnMore.setTextWithColoredPart(
                 fullTextRes = R.string.login_server_modular_learn_more_about_ems,
-                coloredTextRes = R.string.action_learn_more,
+                coloredTextRes = R.string.login_server_modular_learn_more,
                 underline = true
         )
         views.loginServerChoiceEmsLearnMore.setOnClickListener {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt
index b3496f914f..f72bd2c5d3 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt
@@ -61,7 +61,7 @@ class FtueAuthServerSelectionFragment @Inject constructor() : AbstractFtueAuthFr
 
     private fun initTextViews() {
         views.loginServerChoiceEmsLearnMore.text = span {
-            text = getString(R.string.action_learn_more)
+            text = getString(R.string.login_server_modular_learn_more)
             textDecorationLine = "underline"
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index 8359113eab..545e9f7190 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -142,7 +142,7 @@ class RoomMemberProfileController @Inject constructor(
                     } else {
                         buildProfileAction(
                                 id = "learn_more",
-                                title = stringProvider.getString(R.string.action_learn_more),
+                                title = stringProvider.getString(R.string.room_profile_section_security_learn_more),
                                 editable = false,
                                 divider = false,
                                 action = { callback?.onShowDeviceListNoCrossSigning() }
@@ -160,7 +160,7 @@ class RoomMemberProfileController @Inject constructor(
 
                 buildProfileAction(
                         id = "learn_more",
-                        title = stringProvider.getString(R.string.action_learn_more),
+                        title = stringProvider.getString(R.string.room_profile_section_security_learn_more),
                         editable = false,
                         divider = false,
                         subtitle = stringProvider.getString(R.string.room_profile_encrypted_subtitle),
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 9d665aace7..1ea923d7f3 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -134,7 +134,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
-                    android:text="@string/action_learn_more"
+                    android:text="@string/login_server_modular_learn_more"
                     android:textColor="?colorPrimary"
                     app:layout_constraintBottom_toBottomOf="@id/loginServerChoiceEmsText"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index 3cc688c11e..0a5c10935a 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:text="@string/action_learn_more"
+                android:text="@string/login_server_modular_learn_more"
                 android:textColor="?colorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index fd8fe7d4c9..e5230620d4 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -89,20 +89,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginEnd="1dp"
         android:background="@drawable/notification_badge"
         android:backgroundTint="@color/palette_azure"
         android:gravity="center"
         android:paddingStart="10dp"
         android:paddingTop="3dp"
         android:paddingEnd="10dp"
+        android:layout_marginEnd="1dp"
         android:paddingBottom="3dp"
+        android:visibility="gone"
+        tools:visibility="visible"
         android:text="@string/beta_title_bottom_sheet_action"
         android:textColor="@color/palette_white"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/actionSelected"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 4ff0907c16..6a29ec6a1c 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -47,7 +47,7 @@
         app:layout_constraintStart_toEndOf="@id/actionIcon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginStart="0dp"
-        tools:text="@string/action_learn_more" />
+        tools:text="@string/room_profile_section_security_learn_more" />
 
     <TextView
         android:id="@+id/actionSubtitle"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index cbc02b1933..6cd14ac10f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -737,7 +737,6 @@
     <string name="threads_notice_migration_title">Threads Approaching Beta 🎉</string>
     <string name="threads_notice_migration_message">We’re getting closer to releasing a public Beta for Threads.\n\nAs we prepare for it, we need to make some changes: threads created before this point will be displayed as regular replies.\n\nThis will be a one-off transition as Threads are now part of the Matrix specification.</string>
     <string name="threads_beta_enable_notice_title">Threads Beta</string>
-    <!-- %s will be replaced with action_learn_more string resource that will be clickable(url redirection)  -->
     <string name="threads_beta_enable_notice_message">Threads help keep your conversations on-topic and easy to track. %sEnabling threads will refresh the app. This may take longer for some accounts.</string>
 
     <!-- Search -->
@@ -1902,6 +1901,7 @@
     <string name="login_server_text">Just like email, accounts have one home, although you can talk to anyone</string>
     <string name="login_server_matrix_org_text">Join millions for free on the largest public server</string>
     <string name="login_server_modular_text">Premium hosting for organisations</string>
+    <string name="login_server_modular_learn_more">Learn more</string>
     <string name="login_server_other_title">Other</string>
     <string name="login_server_other_text">Custom &amp; advanced settings</string>
 
@@ -2142,6 +2142,7 @@
     <string name="direct_room_profile_encrypted_subtitle">Messages here are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
     <string name="room_profile_section_security">Security</string>
     <string name="room_profile_section_restore_security">Restore Encryption</string>
+    <string name="room_profile_section_security_learn_more">Learn more</string>
     <string name="room_profile_section_more">More</string>
     <string name="room_profile_section_admin">Admin Actions</string>
     <string name="room_profile_section_more_settings">Room settings</string>
diff --git a/vector/src/main/res/values/strings_login_v2.xml b/vector/src/main/res/values/strings_login_v2.xml
index 627310f437..c84455a665 100644
--- a/vector/src/main/res/values/strings_login_v2.xml
+++ b/vector/src/main/res/values/strings_login_v2.xml
@@ -43,7 +43,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 action_learn_more ("Learn more" in English)-->
+    <!-- %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