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 a29967096a..81f4f06084 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.login_server_modular_learn_more)
+ text = getString(R.string.action_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 60e381b047..cd3d359abd 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.login_server_modular_learn_more,
+ coloredTextRes = R.string.action_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 f72bd2c5d3..b3496f914f 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.login_server_modular_learn_more)
+ text = getString(R.string.action_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 545e9f7190..8359113eab 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.room_profile_section_security_learn_more),
+ title = stringProvider.getString(R.string.action_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.room_profile_section_security_learn_more),
+ title = stringProvider.getString(R.string.action_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 1ea923d7f3..9d665aace7 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/login_server_modular_learn_more"
+ android:text="@string/action_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 0a5c10935a..3cc688c11e 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/login_server_modular_learn_more"
+ android:text="@string/action_learn_more"
android:textColor="?colorPrimary" />
+ app:layout_constraintTop_toTopOf="parent"
+ tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 6a29ec6a1c..4ff0907c16 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/room_profile_section_security_learn_more" />
+ tools:text="@string/action_learn_more" />
Threads Approaching Beta 🎉
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.
Threads Beta
+
Threads help keep your conversations on-topic and easy to track. %sEnabling threads will refresh the app. This may take longer for some accounts.
@@ -1901,7 +1902,6 @@
Just like email, accounts have one home, although you can talk to anyone
Join millions for free on the largest public server
Premium hosting for organisations
- Learn more
Other
Custom & advanced settings
@@ -2142,7 +2142,6 @@
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.
Security
Restore Encryption
- Learn more
More
Admin Actions
Room settings
diff --git a/vector/src/main/res/values/strings_login_v2.xml b/vector/src/main/res/values/strings_login_v2.xml
index c84455a665..627310f437 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 @@
Associate a phone number
Associate a phone number to optionally allow people you know to discover you.
The server %s requires you to associate a phone number to create an account.
-
+
%s about Element Matrix Service.
\ No newline at end of file