Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove duplicate learn more string resources"

Browse Source 
This reverts commit 2ac3306382.
This commit is contained in:
ariskotsomitopoulos 2022-04-05 19:39:13 +03:00
parent 72d4c7612a
commit 5ee2579efc
10 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
View File

@ -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"
}
}

2
vector/src/main/java/im/vector/app/features/login2/LoginServerSelectionFragment2.kt
View File

@ -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 {

2
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerSelectionFragment.kt
View File

@ -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"
}
}

4
vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
View File

@ -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),

2
vector/src/main/res/layout/fragment_login_server_selection.xml
View File

@ -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"

2
vector/src/main/res/layout/fragment_login_server_url_form.xml
View File

@ -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

8
vector/src/main/res/layout/item_bottom_sheet_action.xml
View File

@ -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>

2
vector/src/main/res/layout/item_profile_action.xml
View File

@ -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"

3
vector/src/main/res/values/strings.xml
View File

@ -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>

2
vector/src/main/res/values/strings_login_v2.xml
View File

@ -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>