From 185afe403fb2db6da2c15b8d37e0838004e5d0e1 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 4 Jan 2022 14:15:46 +0100 Subject: [PATCH] Rename some string resources --- .../im/vector/app/ui/robot/ElementRobot.kt | 6 +- .../core/dialogs/ConfirmationDialogBuilder.kt | 2 +- .../dialogs/GalleryOrCameraDialogHelper.kt | 2 +- .../app/core/dialogs/ManuallyVerifyDialog.kt | 2 +- .../app/core/dialogs/PhotoOrVideoDialog.kt | 6 +- .../dialogs/UnrecognizedCertificateDialog.kt | 2 +- .../core/utils/ExternalApplicationsUtil.kt | 4 +- .../vector/app/core/utils/PermissionsTools.kt | 2 +- .../im/vector/app/features/MainActivity.kt | 2 +- .../call/conference/VectorJitsiActivity.kt | 2 +- .../settings/KeysBackupSettingsFragment.kt | 2 +- .../setup/KeysBackupSetupActivity.kt | 4 +- .../crypto/recover/BootstrapBottomSheet.kt | 2 +- .../IncomingVerificationRequestHandler.kt | 2 +- .../cancel/VerificationCancelController.kt | 2 +- .../cancel/VerificationNotMeController.kt | 2 +- .../request/VerificationRequestController.kt | 2 +- .../discovery/DiscoverySettingsFragment.kt | 6 +- .../change/SetIdentityServerFragment.kt | 2 +- .../vector/app/features/home/HomeActivity.kt | 2 +- .../home/room/detail/RoomDetailFragment.kt | 16 ++--- .../room/detail/StartCallActionsHandler.kt | 4 +- .../timeline/action/EventSharedAction.kt | 10 +-- .../timeline/item/CallTileTimelineItem.kt | 4 +- .../home/room/list/RoomListFragment.kt | 4 +- .../home/room/list/RoomSummaryItemFactory.kt | 2 +- .../app/features/link/LinkHandlerActivity.kt | 2 +- .../login/LoginResetPasswordFragment.kt | 2 +- .../app/features/login/LoginSplashFragment.kt | 2 +- .../login2/LoginResetPasswordFragment2.kt | 2 +- .../login2/created/AccountCreatedFragment.kt | 2 +- .../matrixto/MatrixToRoomSpaceFragment.kt | 2 +- .../notifications/NotificationUtils.kt | 4 +- .../im/vector/app/features/pin/PinFragment.kt | 2 +- .../RoomMemberProfileController.kt | 2 +- .../RoomMemberProfileFragment.kt | 2 +- .../powerlevel/EditPowerLevelDialogs.kt | 4 +- .../roomprofile/RoomProfileFragment.kt | 6 +- .../roomprofile/alias/RoomAliasFragment.kt | 6 +- .../RoomAliasBottomSheetSharedAction.kt | 4 +- .../members/RoomMemberListFragment.kt | 4 +- .../settings/RoomSettingsFragment.kt | 2 +- .../settings/joinrule/RoomJoinRuleFragment.kt | 4 +- .../BackgroundSyncModeChooserDialog.kt | 2 +- .../settings/VectorSettingsGeneralFragment.kt | 2 +- .../VectorSettingsPreferencesFragment.kt | 2 +- ...ceVerificationInfoBottomSheetController.kt | 2 +- .../devices/VectorSettingsDevicesFragment.kt | 2 +- .../settings/devtools/AccountDataFragment.kt | 6 +- .../threepids/ThreePidsSettingsFragment.kt | 4 +- .../features/share/IncomingShareFragment.kt | 4 +- .../signout/soft/SoftLogoutFragment.kt | 2 +- .../explore/SpaceDirectoryController.kt | 2 +- .../spaces/explore/SpaceDirectoryFragment.kt | 2 +- .../spaces/invite/SpaceInviteBottomSheet.kt | 4 +- .../spaces/manage/SpaceAddRoomFragment.kt | 2 +- .../spaces/manage/SpaceSettingsFragment.kt | 2 +- .../app/features/widgets/WidgetFragment.kt | 4 +- .../workers/signout/SignOutUiWorker.kt | 2 +- .../res/layout/bottom_sheet_leave_space.xml | 2 +- .../bottom_sheet_room_widget_permission.xml | 2 +- ...ottom_sheet_space_advertise_restricted.xml | 2 +- .../layout/bottom_sheet_tombstone_join.xml | 2 +- .../src/main/res/layout/composer_layout.xml | 4 +- ...composer_layout_constraint_set_compact.xml | 4 +- ...omposer_layout_constraint_set_expanded.xml | 4 +- .../layout/fragment_attachments_preview.xml | 2 +- .../res/layout/fragment_bootstrap_reauth.xml | 2 +- .../layout/fragment_join_rules_recycler.xml | 4 +- .../main/res/layout/fragment_login_terms.xml | 2 +- .../res/layout/fragment_login_terms_2.xml | 2 +- .../fragment_matrix_to_room_space_card.xml | 4 +- .../main/res/layout/fragment_review_terms.xml | 4 +- .../fragment_room_preview_no_preview.xml | 2 +- .../layout/fragment_space_leave_advanced.xml | 2 +- .../res/layout/fragment_space_preview.xml | 4 +- .../res/layout/fragment_ssss_reset_all.xml | 4 +- .../item_form_text_input_with_delete.xml | 2 +- .../src/main/res/layout/item_generic_list.xml | 2 +- .../src/main/res/layout/item_public_room.xml | 2 +- .../src/main/res/layout/item_pushgateway.xml | 2 +- .../res/layout/item_room_directory_server.xml | 2 +- .../main/res/layout/item_room_invitation.xml | 4 +- .../layout/item_settings_continue_cancel.xml | 2 +- .../res/layout/item_settings_three_pid.xml | 2 +- .../main/res/layout/item_suggested_room.xml | 2 +- .../item_timeline_event_call_tile_stub.xml | 4 +- ...item_timeline_event_media_message_stub.xml | 2 +- .../item_timeline_event_verification_stub.xml | 4 +- .../src/main/res/layout/item_uploads_file.xml | 4 +- .../main/res/layout/item_uploads_video.xml | 2 +- .../layout/merge_image_attachment_overlay.xml | 4 +- .../main/res/layout/vector_invite_view.xml | 4 +- .../src/main/res/layout/view_button_state.xml | 4 +- .../layout/view_voice_message_recorder.xml | 2 +- vector/src/main/res/menu/menu_devtools.xml | 2 +- .../src/main/res/menu/menu_manage_space.xml | 2 +- .../src/main/res/menu/menu_space_add_room.xml | 2 +- vector/src/main/res/menu/menu_timeline.xml | 4 +- vector/src/main/res/menu/menu_widget.xml | 2 +- .../res/menu/vector_attachments_preview.xml | 2 +- .../src/main/res/menu/vector_media_viewer.xml | 2 +- .../res/menu/vector_room_member_profile.xml | 2 +- .../src/main/res/menu/vector_room_profile.xml | 2 +- .../main/res/menu/vector_room_settings.xml | 2 +- vector/src/main/res/values-ar/strings.xml | 66 +++++++++--------- .../src/main/res/values-b+sr+Latn/strings.xml | 40 +++++------ vector/src/main/res/values-bg/strings.xml | 66 +++++++++--------- vector/src/main/res/values-bn-rBD/strings.xml | 64 ++++++++--------- vector/src/main/res/values-bn-rIN/strings.xml | 64 ++++++++--------- vector/src/main/res/values-bs/strings.xml | 34 +++++----- vector/src/main/res/values-ca/strings.xml | 66 +++++++++--------- vector/src/main/res/values-cs/strings.xml | 66 +++++++++--------- vector/src/main/res/values-da/strings.xml | 34 +++++----- vector/src/main/res/values-de/strings.xml | 66 +++++++++--------- vector/src/main/res/values-el/strings.xml | 62 ++++++++--------- vector/src/main/res/values-eo/strings.xml | 66 +++++++++--------- vector/src/main/res/values-es-rMX/strings.xml | 40 +++++------ vector/src/main/res/values-es/strings.xml | 66 +++++++++--------- vector/src/main/res/values-et/strings.xml | 66 +++++++++--------- vector/src/main/res/values-eu/strings.xml | 58 ++++++++-------- vector/src/main/res/values-fa/strings.xml | 66 +++++++++--------- vector/src/main/res/values-fi/strings.xml | 66 +++++++++--------- vector/src/main/res/values-fr-rCA/strings.xml | 66 +++++++++--------- vector/src/main/res/values-fr/strings.xml | 66 +++++++++--------- vector/src/main/res/values-fy/strings.xml | 66 +++++++++--------- vector/src/main/res/values-ga/strings.xml | 66 +++++++++--------- vector/src/main/res/values-gl/strings.xml | 54 +++++++-------- vector/src/main/res/values-hr/strings.xml | 58 ++++++++-------- vector/src/main/res/values-hu/strings.xml | 66 +++++++++--------- vector/src/main/res/values-in/strings.xml | 66 +++++++++--------- vector/src/main/res/values-is/strings.xml | 34 +++++----- vector/src/main/res/values-it/strings.xml | 66 +++++++++--------- vector/src/main/res/values-iw/strings.xml | 66 +++++++++--------- vector/src/main/res/values-ja/strings.xml | 66 +++++++++--------- vector/src/main/res/values-kab/strings.xml | 66 +++++++++--------- vector/src/main/res/values-ko/strings.xml | 62 ++++++++--------- vector/src/main/res/values-lt/strings.xml | 8 +-- vector/src/main/res/values-lv/strings.xml | 66 +++++++++--------- vector/src/main/res/values-ml/strings.xml | 66 +++++++++--------- vector/src/main/res/values-nb-rNO/strings.xml | 66 +++++++++--------- vector/src/main/res/values-nl/strings.xml | 66 +++++++++--------- vector/src/main/res/values-nn/strings.xml | 64 ++++++++--------- vector/src/main/res/values-pl/strings.xml | 66 +++++++++--------- vector/src/main/res/values-pt-rBR/strings.xml | 66 +++++++++--------- vector/src/main/res/values-pt/strings.xml | 48 ++++++------- vector/src/main/res/values-ro/strings.xml | 8 +-- vector/src/main/res/values-ru/strings.xml | 66 +++++++++--------- vector/src/main/res/values-sk/strings.xml | 66 +++++++++--------- vector/src/main/res/values-sl/strings.xml | 4 +- vector/src/main/res/values-sq/strings.xml | 64 ++++++++--------- vector/src/main/res/values-sr/strings.xml | 66 +++++++++--------- vector/src/main/res/values-sv/strings.xml | 66 +++++++++--------- vector/src/main/res/values-szl/strings.xml | 40 +++++------ vector/src/main/res/values-te/strings.xml | 34 +++++----- vector/src/main/res/values-th/strings.xml | 60 ++++++++-------- vector/src/main/res/values-tlh/strings.xml | 30 ++++---- vector/src/main/res/values-tr/strings.xml | 66 +++++++++--------- vector/src/main/res/values-tzm/strings.xml | 38 +++++------ vector/src/main/res/values-uk/strings.xml | 66 +++++++++--------- vector/src/main/res/values-uz/strings.xml | 54 +++++++-------- vector/src/main/res/values-vi/strings.xml | 66 +++++++++--------- vector/src/main/res/values-vls/strings.xml | 4 +- vector/src/main/res/values-zh-rCN/strings.xml | 66 +++++++++--------- vector/src/main/res/values-zh-rTW/strings.xml | 66 +++++++++--------- vector/src/main/res/values/strings.xml | 68 +++++++++---------- 166 files changed, 1876 insertions(+), 1878 deletions(-) diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt index 99af7851ef..74e4478635 100644 --- a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt +++ b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt @@ -134,10 +134,10 @@ class ElementRobot { activity.runOnUiThread { popup.performClick() } waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer)) - waitUntilViewVisible(ViewMatchers.withText(R.string.skip)) - clickOn(R.string.skip) + waitUntilViewVisible(ViewMatchers.withText(R.string.action_skip)) + clickOn(R.string.action_skip) assertDisplayed(R.string.are_you_sure) - clickOn(R.string.skip) + clickOn(R.string.action_skip) waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer)) }.onFailure { Timber.w("Verification popup missing", it) } } diff --git a/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt index d2d0967939..6f45091cf9 100644 --- a/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt @@ -56,7 +56,7 @@ object ConfirmationDialogBuilder { ?.takeIf { it.isNotBlank() } confirmation(reason) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } } diff --git a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt index 23c2e13f6f..8f70808087 100644 --- a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt @@ -113,7 +113,7 @@ class GalleryOrCameraDialogHelper( )) { _, which -> onAvatarTypeSelected(if (which == 0) Type.Camera else Type.Gallery) } - .setPositiveButton(R.string.cancel, null) + .setPositiveButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt index 979558afd8..9e318bf693 100644 --- a/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt @@ -34,7 +34,7 @@ object ManuallyVerifyDialog { .setPositiveButton(R.string.encryption_information_verify) { _, _ -> onVerified() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) views.encryptedDeviceInfoDeviceName.text = cryptoDeviceInfo.displayName() views.encryptedDeviceInfoDeviceId.text = cryptoDeviceInfo.deviceId diff --git a/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt index dad1fba600..0b76446ce2 100644 --- a/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt @@ -57,7 +57,7 @@ class PhotoOrVideoDialog( .setPositiveButton(R.string._continue) { _, _ -> submit(views, vectorPreferences, listener) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } } @@ -98,11 +98,11 @@ class PhotoOrVideoDialog( MaterialAlertDialogBuilder(activity) .setTitle(R.string.option_take_photo_video) .setView(dialogLayout) - .setPositiveButton(R.string.save) { _, _ -> + .setPositiveButton(R.string.action_save) { _, _ -> submitSettings(views) listener.onUpdated() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt index 39458a054a..f46737d6c6 100644 --- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt @@ -151,7 +151,7 @@ class UnrecognizedCertificateDialog @Inject constructor( } builder.setNeutralButton(R.string.ssl_logout_account) { _, _ -> callback.onReject() } } else { - builder.setNegativeButton(R.string.cancel) { _, _ -> callback.onReject() } + builder.setNegativeButton(R.string.action_cancel) { _, _ -> callback.onReject() } } builder.setOnDismissListener { diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt index 06da70f391..9e7587056f 100644 --- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt +++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt @@ -308,7 +308,7 @@ fun shareMedia(context: Context, file: File, mediaMimeType: String?) { val chooserIntent = ShareCompat.IntentBuilder(context) .setType(mediaMimeType) .setStream(mediaUri) - .setChooserTitle(R.string.share) + .setChooserTitle(R.string.action_share) .createChooserIntent() createChooser(context, chooserIntent) @@ -318,7 +318,7 @@ fun shareText(context: Context, text: String) { val chooserIntent = ShareCompat.IntentBuilder(context) .setType("text/plain") .setText(text) - .setChooserTitle(R.string.share) + .setChooserTitle(R.string.action_share) .createChooserIntent() createChooser(context, chooserIntent) diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt index ba396ed252..19dc341f12 100644 --- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt +++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt @@ -168,6 +168,6 @@ fun FragmentActivity.onPermissionDeniedDialog(@StringRes rationaleMessage: Int) .setPositiveButton(R.string.open_settings) { _, _ -> openAppSettingsPage(this) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt index 5f9c5433fe..b4706780b7 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -209,7 +209,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity .setTitle(R.string.dialog_title_error) .setMessage(errorFormatter.toHumanReadable(failure)) .setPositiveButton(R.string.global_retry) { _, _ -> doCleanUp() } - .setNegativeButton(R.string.cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) } + .setNegativeButton(R.string.action_cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) } .setCancelable(false) .show() } diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt index 0fdfea8bff..a668f66f30 100644 --- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt @@ -135,7 +135,7 @@ class VectorJitsiActivity : VectorBaseActivity(), JitsiMee .setPositiveButton(R.string.action_switch) { _, _ -> jitsiViewModel.handle(JitsiCallViewActions.SwitchTo(action.args, false)) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt index cf6bd99f23..50d5e56483 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt @@ -78,7 +78,7 @@ class KeysBackupSettingsFragment @Inject constructor(private val keysBackupSetti .setPositiveButton(R.string.keys_backup_settings_delete_confirm_title) { _, _ -> viewModel.handle(KeyBackupSettingsAction.DeleteKeyBackup) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setCancelable(true) .show() } diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt index 3d2ef648ff..0db06209fe 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt @@ -177,8 +177,8 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() { MaterialAlertDialogBuilder(this) .setTitle(R.string.keys_backup_setup_skip_title) .setMessage(R.string.keys_backup_setup_skip_msg) - .setNegativeButton(R.string.cancel, null) - .setPositiveButton(R.string.leave) { _, _ -> + .setNegativeButton(R.string.action_cancel, null) + .setPositiveButton(R.string.action_leave) { _, _ -> finish() } .show() diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt index 727180385d..8448422a56 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt @@ -119,7 +119,7 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment + .setNegativeButton(R.string.action_skip) { _, _ -> bottomSheetResult = ResultListener.RESULT_CANCEL dismiss() } diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt index 6c009d3786..14ffda58a9 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt @@ -92,7 +92,7 @@ class IncomingVerificationRequestHandler @Inject constructor( tx.cancel() } addButton( - context.getString(R.string.ignore), + context.getString(R.string.action_ignore), { tx.cancel() } ) addButton( diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt index 05a5bb7238..f0909dbc26 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt @@ -80,7 +80,7 @@ class VerificationCancelController @Inject constructor( bottomSheetVerificationActionItem { id("cancel") - title(host.stringProvider.getString(R.string.skip)) + title(host.stringProvider.getString(R.string.action_skip)) titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError)) iconRes(R.drawable.ic_arrow_right) iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError)) diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt index 5b9c82958e..34f97d3cb2 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt @@ -56,7 +56,7 @@ class VerificationNotMeController @Inject constructor( bottomSheetVerificationActionItem { id("skip") - title(host.stringProvider.getString(R.string.skip)) + title(host.stringProvider.getString(R.string.action_skip)) titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)) iconRes(R.drawable.ic_arrow_right) iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)) diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt index d8082865c8..d40ee1f5c9 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt @@ -93,7 +93,7 @@ class VerificationRequestController @Inject constructor( bottomSheetVerificationActionItem { id("skip") - title(host.stringProvider.getString(R.string.skip)) + title(host.stringProvider.getString(R.string.action_skip)) titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError)) iconRes(R.drawable.ic_arrow_right) iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError)) diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt index 2c37a19e7d..523e8cb9bb 100644 --- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt @@ -153,7 +153,7 @@ class DiscoverySettingsFragment @Inject constructor( .setTitle(R.string.change_identity_server) .setMessage(getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer())) .setPositiveButton(R.string._continue) { _, _ -> navigateToChangeIdentityServerFragment() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() Unit } else { @@ -177,8 +177,8 @@ class DiscoverySettingsFragment @Inject constructor( MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.disconnect_identity_server) .setMessage(message) - .setPositiveButton(R.string.disconnect) { _, _ -> viewModel.handle(DiscoverySettingsAction.DisconnectIdentityServer) } - .setNegativeButton(R.string.cancel, null) + .setPositiveButton(R.string.action_disconnect) { _, _ -> viewModel.handle(DiscoverySettingsAction.DisconnectIdentityServer) } + .setNegativeButton(R.string.action_cancel, null) .show() } } diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt index fcea2e92b1..f71f224034 100644 --- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt @@ -119,7 +119,7 @@ class SetIdentityServerFragment @Inject constructor( .setPositiveButton(R.string._continue) { _, _ -> processIdentityServerChange() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() Unit } diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt index e2696115f4..293f3426d5 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt @@ -400,7 +400,7 @@ class HomeActivity : dismissedAction = Runnable { homeActivityViewModel.handle(HomeActivityViewActions.PushPromptHasBeenReviewed) } - addButton(getString(R.string.dismiss), { + addButton(getString(R.string.action_dismiss), { homeActivityViewModel.handle(HomeActivityViewActions.PushPromptHasBeenReviewed) }, true) addButton(getString(R.string.settings), { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt index 0d454201cd..620730cb4d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt @@ -397,7 +397,7 @@ class RoomDetailFragment @Inject constructor( when (mode) { is SendMode.Regular -> renderRegularMode(mode.text) is SendMode.Edit -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text) - is SendMode.Quote -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.quote, mode.text) + is SendMode.Quote -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.action_quote, mode.text) is SendMode.Reply -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text) is SendMode.Voice -> renderVoiceMessageMode(mode.text) } @@ -1054,7 +1054,7 @@ class RoomDetailFragment @Inject constructor( .setPositiveButton(R.string.settings) { _, _ -> navigator.openSettings(requireActivity(), VectorSettingsActivity.EXTRA_DIRECT_ACCESS_GENERAL) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } @@ -1062,7 +1062,7 @@ class RoomDetailFragment @Inject constructor( autoCompleter.exitSpecialMode() views.composerLayout.collapse() views.composerLayout.setTextIfDifferent(content) - views.composerLayout.views.sendButton.contentDescription = getString(R.string.send) + views.composerLayout.views.sendButton.contentDescription = getString(R.string.action_send) } private fun renderSpecialMode(event: TimelineEvent, @@ -1574,7 +1574,7 @@ class RoomDetailFragment @Inject constructor( val reason = views.dialogReportContentInput.text.toString() roomDetailViewModel.handle(RoomDetailAction.ReportContent(action.eventId, action.senderId, reason)) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } @@ -1584,7 +1584,7 @@ class RoomDetailFragment @Inject constructor( activity = requireActivity(), askForReason = action.askForReason, confirmationRes = action.dialogDescriptionRes, - positiveRes = R.string.remove, + positiveRes = R.string.action_remove, reasonHintRes = R.string.delete_event_dialog_reason_hint, titleRes = action.dialogTitleRes ) { reason -> @@ -1704,7 +1704,7 @@ class RoomDetailFragment @Inject constructor( .setPositiveButton(R.string._continue) { _, _ -> openUrlInExternalBrowser(requireContext(), url) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } else { // Open in external browser, in a new Tab @@ -2076,7 +2076,7 @@ class RoomDetailFragment @Inject constructor( MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog) .setTitle(R.string.end_poll_confirmation_title) .setMessage(R.string.end_poll_confirmation_description) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setPositiveButton(R.string.end_poll_confirmation_approve_button) { _, _ -> roomDetailViewModel.handle(RoomDetailAction.EndPoll(eventId)) } @@ -2087,7 +2087,7 @@ class RoomDetailFragment @Inject constructor( MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setTitle(R.string.room_participants_action_ignore_title) .setMessage(R.string.room_participants_action_ignore_prompt_msg) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setPositiveButton(R.string.room_participants_action_ignore) { _, _ -> roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(senderId)) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt index 92a75b449a..6b5ed3ba66 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt @@ -97,7 +97,7 @@ class StartCallActionsHandler( // create the widget, then navigate to it.. roomDetailViewModel.handle(RoomDetailAction.AddJitsiWidget(isVideoCall)) } - .setNegativeButton(fragment.getString(R.string.cancel), null) + .setNegativeButton(fragment.getString(R.string.action_cancel), null) .show() } } @@ -112,7 +112,7 @@ class StartCallActionsHandler( .setPositiveButton(if (isVideoCall) R.string.start_video_call else R.string.start_voice_call) { _, _ -> safeStartCall2(isVideoCall) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } else { safeStartCall2(isVideoCall) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt index 30d69d6533..39e04e8ae4 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt @@ -43,28 +43,28 @@ sealed class EventSharedAction(@StringRes val titleRes: Int, EventSharedAction(R.string.edit, R.drawable.ic_edit) data class Quote(val eventId: String) : - EventSharedAction(R.string.quote, R.drawable.ic_quote) + EventSharedAction(R.string.action_quote, R.drawable.ic_quote) data class Reply(val eventId: String) : EventSharedAction(R.string.reply, R.drawable.ic_reply) data class Share(val eventId: String, val messageContent: MessageContent) : - EventSharedAction(R.string.share, R.drawable.ic_share) + EventSharedAction(R.string.action_share, R.drawable.ic_share) data class Save(val eventId: String, val messageContent: MessageWithAttachmentContent) : - EventSharedAction(R.string.save, R.drawable.ic_material_save) + EventSharedAction(R.string.action_save, R.drawable.ic_material_save) data class Resend(val eventId: String) : EventSharedAction(R.string.global_retry, R.drawable.ic_refresh_cw) data class Remove(val eventId: String) : - EventSharedAction(R.string.remove, R.drawable.ic_trash, true) + EventSharedAction(R.string.action_remove, R.drawable.ic_trash, true) data class Redact(val eventId: String, val askForReason: Boolean, val dialogTitleRes: Int, val dialogDescriptionRes: Int) : EventSharedAction(R.string.message_action_item_redact, R.drawable.ic_delete, true) data class Cancel(val eventId: String, val force: Boolean) : - EventSharedAction(R.string.cancel, R.drawable.ic_close_round) + EventSharedAction(R.string.action_cancel, R.drawable.ic_close_round) data class ViewSource(val content: String) : EventSharedAction(R.string.view_source, R.drawable.ic_view_source) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt index 5f8ac822da..5abc9d714c 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt @@ -142,7 +142,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem { holder.rejectView.isVisible = true - holder.rejectView.setText(R.string.leave) + holder.rejectView.setText(R.string.action_leave) holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary) holder.rejectView.onClick { attributes.callback?.onTimelineItemAction(RoomDetailAction.LeaveJitsiCall) @@ -176,7 +176,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem { diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt index f67abfbc88..5171319a41 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt @@ -404,10 +404,10 @@ class RoomListFragment @Inject constructor( MaterialAlertDialogBuilder(requireContext(), if (isPublicRoom) 0 else R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setTitle(R.string.room_participants_leave_prompt_title) .setMessage(message) - .setPositiveButton(R.string.leave) { _, _ -> + .setPositiveButton(R.string.action_leave) { _, _ -> roomListViewModel.handle(RoomListAction.LeaveRoom(roomId)) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt index bf289c2e7d..ff57544a36 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt @@ -72,7 +72,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor ) .buttonLabel( if (error != null) stringProvider.getString(R.string.global_retry) - else stringProvider.getString(R.string.join) + else stringProvider.getString(R.string.action_join) ) .loading(suggestedRoomJoiningStates[spaceChildInfo.childRoomId] is Loading) .memberCount(spaceChildInfo.activeMemberCount ?: 0) diff --git a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt index c22f8eb779..2cb41784b7 100644 --- a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt @@ -121,7 +121,7 @@ class LinkHandlerActivity : VectorBaseActivity() { .setMessage(R.string.error_user_already_logged_in) .setCancelable(false) .setPositiveButton(R.string.logout) { _, _ -> safeSignout(uri) } - .setNegativeButton(R.string.cancel) { _, _ -> finish() } + .setNegativeButton(R.string.action_cancel) { _, _ -> finish() } .show() } diff --git a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt index f8b302d5e7..52bd80a16f 100644 --- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt @@ -88,7 +88,7 @@ class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment doSubmit() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } else { doSubmit() diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt index 527f9f99b3..dd0bfc0ed6 100644 --- a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt @@ -79,7 +79,7 @@ class LoginSplashFragment @Inject constructor( .setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ -> loginViewModel.handle(LoginAction.OnGetStarted(resetLoginConfig = true)) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } else { super.onError(throwable) diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt index c00ed7275c..038a12bea7 100644 --- a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt +++ b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt @@ -124,7 +124,7 @@ class LoginResetPasswordFragment2 @Inject constructor() : AbstractLoginFragment2 showWarning = false doSubmit() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } else { doSubmit() diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt index c1f45c6713..92fd26e5e8 100644 --- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt @@ -107,7 +107,7 @@ class AccountCreatedFragment @Inject constructor( val newName = views.editText.text.toString() viewModel.handle(AccountCreatedAction.SetDisplayName(newName)) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt index 26df42dbe1..3b0fc175b0 100644 --- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt +++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt @@ -108,7 +108,7 @@ class MatrixToRoomSpaceFragment @Inject constructor( views.matrixToCardMainButton.isVisible = true views.matrixToCardSecondaryButton.isVisible = true views.matrixToCardMainButton.button.text = getString(joinTextRes) - views.matrixToCardSecondaryButton.button.text = getString(R.string.decline) + views.matrixToCardSecondaryButton.button.text = getString(R.string.action_decline) } Membership.JOIN -> { views.matrixToCardMainButton.isVisible = true diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt index 1479e577e7..96e8c2af4b 100755 --- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt @@ -691,7 +691,7 @@ class NotificationUtils @Inject constructor(private val context: Context, addAction( R.drawable.vector_notification_reject_invitation, - stringProvider.getString(R.string.reject), + stringProvider.getString(R.string.action_reject), rejectIntentPendingIntent ) @@ -708,7 +708,7 @@ class NotificationUtils @Inject constructor(private val context: Context, ) addAction( R.drawable.vector_notification_accept_invitation, - stringProvider.getString(R.string.join), + stringProvider.getString(R.string.action_join), joinIntentPendingIntent ) diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt index 2309d42f60..a42e88f06d 100644 --- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt +++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt @@ -162,7 +162,7 @@ class PinFragment @Inject constructor( .setPositiveButton(getString(R.string.auth_pin_new_pin_action)) { _, _ -> launchResetPinFlow() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } 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 08eab292a8..ab1c605582 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 @@ -302,7 +302,7 @@ class RoomMemberProfileController @Inject constructor( return if (isIgnored) { stringProvider.getString(R.string.unignore) } else { - stringProvider.getString(R.string.ignore) + stringProvider.getString(R.string.action_ignore) } } } diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt index 48823714f5..40b6a0fe9b 100644 --- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt @@ -168,7 +168,7 @@ class RoomMemberProfileFragment @Inject constructor( .withArgs(roomId = null, otherUserId = startVerification.userId) .show(parentFragmentManager, "VERIF") } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } } diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt index e6b898c2b9..926c9fb60e 100644 --- a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt @@ -61,7 +61,7 @@ object EditPowerLevelDialogs { } listener(newValue) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setOnKeyListener(DialogInterface.OnKeyListener { dialog, keyCode, event -> if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) { @@ -96,7 +96,7 @@ object EditPowerLevelDialogs { .setPositiveButton(R.string.room_participants_power_level_demote) { _, _ -> onValidate() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt index 5a8519ecb4..ee4d0601c6 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt @@ -235,7 +235,7 @@ class RoomProfileFragment @Inject constructor( MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.room_settings_enable_encryption_dialog_title) .setMessage(R.string.room_settings_enable_encryption_dialog_content) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setPositiveButton(R.string.room_settings_enable_encryption_dialog_submit) { _, _ -> roomProfileViewModel.handle(RoomProfileAction.EnableEncryption) } @@ -284,10 +284,10 @@ class RoomProfileFragment @Inject constructor( MaterialAlertDialogBuilder(requireContext(), if (isPublicRoom) 0 else R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setTitle(R.string.room_participants_leave_prompt_title) .setMessage(message) - .setPositiveButton(R.string.leave) { _, _ -> + .setPositiveButton(R.string.action_leave) { _, _ -> roomProfileViewModel.handle(RoomProfileAction.LeaveRoom) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt index 15686a6848..3128a590ce 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt @@ -135,7 +135,7 @@ class RoomAliasFragment @Inject constructor( MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setTitle(R.string.dialog_title_confirmation) .setMessage(getString(R.string.room_alias_unpublish_confirmation, alias)) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setPositiveButton(R.string.action_unpublish) { _, _ -> viewModel.handle(RoomAliasAction.UnpublishAlias(alias)) } @@ -190,8 +190,8 @@ class RoomAliasFragment @Inject constructor( MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setTitle(R.string.dialog_title_confirmation) .setMessage(getString(R.string.room_alias_delete_confirmation, alias)) - .setNegativeButton(R.string.cancel, null) - .setPositiveButton(R.string.delete) { _, _ -> + .setNegativeButton(R.string.action_cancel, null) + .setPositiveButton(R.string.action_delete) { _, _ -> viewModel.handle(RoomAliasAction.RemoveLocalAlias(alias)) } .show() diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt index d7cb923603..7625972b05 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt @@ -28,7 +28,7 @@ sealed class RoomAliasBottomSheetSharedAction( VectorSharedAction { data class ShareAlias(val matrixTo: String) : RoomAliasBottomSheetSharedAction( - R.string.share, + R.string.action_share, R.drawable.ic_material_share ) @@ -41,7 +41,7 @@ sealed class RoomAliasBottomSheetSharedAction( ) data class DeleteAlias(val alias: String) : RoomAliasBottomSheetSharedAction( - R.string.delete, + R.string.action_delete, R.drawable.ic_trash_24, true ) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt index 8840f61600..ba7e020ebe 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt @@ -126,8 +126,8 @@ class RoomMemberListFragment @Inject constructor( MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.three_pid_revoke_invite_dialog_title) .setMessage(getString(R.string.three_pid_revoke_invite_dialog_content, content.displayName)) - .setNegativeButton(R.string.cancel, null) - .setPositiveButton(R.string.revoke) { _, _ -> + .setNegativeButton(R.string.action_cancel, null) + .setPositiveButton(R.string.action_revoke) { _, _ -> viewModel.handle(RoomMemberListAction.RevokeThreePidInvite(stateKey)) } .show() diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt index 0a5f8f4d9a..3fa0bbaa5b 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt @@ -231,7 +231,7 @@ class RoomSettingsFragment @Inject constructor( .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ -> viewModel.handle(RoomSettingsAction.Cancel) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() true } else { diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt index eaf19fe075..4e42cce3ee 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt @@ -60,7 +60,7 @@ class RoomJoinRuleFragment @Inject constructor( .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ -> requireActivity().finish() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() return true } @@ -75,7 +75,7 @@ class RoomJoinRuleFragment @Inject constructor( views.cancelButton.isVisible = true views.positiveButton.text = getString(R.string.warning_unsaved_change_discard) views.positiveButton.isVisible = true - views.positiveButton.text = getString(R.string.save) + views.positiveButton.text = getString(R.string.action_save) views.positiveButton.debouncedClicks { viewModel.handle(RoomJoinRuleChooseRestrictedActions.DoUpdateJoinRules) } diff --git a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt index 95a0422742..c64ade96c0 100644 --- a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt +++ b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt @@ -35,7 +35,7 @@ class BackgroundSyncModeChooserDialog : DialogFragment() { val dialog = MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.settings_background_fdroid_sync_mode) .setView(view) - .setPositiveButton(R.string.cancel, null) + .setPositiveButton(R.string.action_cancel, null) .create() views.backgroundSyncModeBattery.setOnClickListener { diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt index 27548dc756..c572b72ca8 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt @@ -371,7 +371,7 @@ class VectorSettingsGeneralFragment @Inject constructor( .setView(view) .setCancelable(false) .setPositiveButton(R.string.settings_change_password, null) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setOnDismissListener { view.hideKeyboard() } diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt index dbea253649..2e2fab06a3 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt @@ -187,7 +187,7 @@ class VectorSettingsPreferencesFragment @Inject constructor( .setTitle(R.string.font_size) .setView(layout) .setPositiveButton(R.string.ok, null) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() val index = FontScale.getFontScaleValue(activity).index diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt index 22e1e67aa4..b35d32f473 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt @@ -272,7 +272,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor( } bottomSheetVerificationActionItem { id("rename") - title(host.stringProvider.getString(R.string.rename)) + title(host.stringProvider.getString(R.string.action_rename)) titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)) iconRes(R.drawable.ic_arrow_right) iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)) diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt index 531e9a944b..5bbb03c8a4 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt @@ -136,7 +136,7 @@ class VectorSettingsDevicesFragment @Inject constructor( viewModel.handle(DevicesAction.Rename(deviceInfo.deviceId!!, newName)) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt index a586e14d99..bce15bbf4b 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt @@ -82,10 +82,10 @@ class AccountDataFragment @Inject constructor( override fun didLongTap(data: UserAccountDataEvent) { MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) - .setTitle(R.string.delete) + .setTitle(R.string.action_delete) .setMessage(getString(R.string.delete_account_data_warning, data.type)) - .setNegativeButton(R.string.cancel, null) - .setPositiveButton(R.string.delete) { _, _ -> + .setNegativeButton(R.string.action_cancel, null) + .setPositiveButton(R.string.action_delete) { _, _ -> viewModel.handle(AccountDataAction.DeleteAccountData(data.type)) } .show() diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt index a893f0f508..bdb1fb895f 100644 --- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt @@ -184,10 +184,10 @@ class ThreePidsSettingsFragment @Inject constructor( override fun deleteThreePid(threePid: ThreePid) { MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.getFormattedValue())) - .setPositiveButton(R.string.remove) { _, _ -> + .setPositiveButton(R.string.action_remove) { _, _ -> viewModel.handle(ThreePidsSettingsAction.DeleteThreePid(threePid)) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt index e1efef4d5a..62fb064536 100644 --- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt @@ -200,10 +200,10 @@ class IncomingShareFragment @Inject constructor( MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.send_attachment) .setMessage(getString(R.string.share_confirm_room, roomSummary.displayName)) - .setPositiveButton(R.string.send) { _, _ -> + .setPositiveButton(R.string.action_send) { _, _ -> navigator.openRoomForSharingAndFinish(requireActivity(), roomSummary.roomId, sharedData) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt index 016d340f80..f40f35a6e2 100644 --- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt @@ -127,7 +127,7 @@ class SoftLogoutFragment @Inject constructor( MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setTitle(R.string.soft_logout_clear_data_dialog_title) .setMessage(messageResId) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .setPositiveButton(R.string.soft_logout_clear_data_submit) { _, _ -> softLogoutViewModel.handle(SoftLogoutAction.ClearData) } diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt index 977294f495..6dadce30e0 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt @@ -156,7 +156,7 @@ class SpaceDirectoryController @Inject constructor( when { error != null -> host.stringProvider.getString(R.string.global_retry) isJoined -> host.stringProvider.getString(R.string.action_open) - else -> host.stringProvider.getString(R.string.join) + else -> host.stringProvider.getString(R.string.action_join) } ) apply { diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt index cd7d6a379a..f630323790 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt @@ -215,7 +215,7 @@ class SpaceDirectoryFragment @Inject constructor( .setPositiveButton(R.string._continue) { _, _ -> openUrlInExternalBrowser(requireContext(), url) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } else { // Open in external browser, in a new Tab diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt index bd6dec7c4b..815175c977 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt @@ -120,8 +120,8 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment { diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt index 9bf304fa1c..44de356521 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt @@ -138,7 +138,7 @@ class SpaceAddRoomFragment @Inject constructor( .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ -> sharedViewModel.handle(SpaceManagedSharedAction.HandleBack) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } is SpaceAddRoomsViewEvents.SaveFailed -> { diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt index a0ab055311..a3d0252c19 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt @@ -165,7 +165,7 @@ class SpaceSettingsFragment @Inject constructor( .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ -> viewModel.handle(RoomSettingsAction.Cancel) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() true } else { diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt index afe34a9b7f..15b9ea61b7 100644 --- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt @@ -309,10 +309,10 @@ class WidgetFragment @Inject constructor() : fun deleteWidget() { MaterialAlertDialogBuilder(requireContext()) .setMessage(R.string.widget_delete_message_confirmation) - .setPositiveButton(R.string.remove) { _, _ -> + .setPositiveButton(R.string.action_remove) { _, _ -> viewModel.handle(WidgetAction.DeleteWidget) } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt index 59ea37036c..29c094bff4 100644 --- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt @@ -43,7 +43,7 @@ class SignOutUiWorker(private val activity: FragmentActivity) { .setPositiveButton(R.string.action_sign_out) { _, _ -> doSignOut() } - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } } diff --git a/vector/src/main/res/layout/bottom_sheet_leave_space.xml b/vector/src/main/res/layout/bottom_sheet_leave_space.xml index e47639f752..9e5a7c7ebf 100644 --- a/vector/src/main/res/layout/bottom_sheet_leave_space.xml +++ b/vector/src/main/res/layout/bottom_sheet_leave_space.xml @@ -100,6 +100,6 @@ android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:layout_marginBottom="8dp" - android:text="@string/cancel" /> + android:text="@string/action_cancel" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml index 40bb28f3a2..4e5e8392c4 100644 --- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml +++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml @@ -102,7 +102,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_vertical_margin" - android:text="@string/decline" + android:text="@string/action_decline" android:textAllCaps="true" />