From a2df3884a312e6ad82d41738128e8629cc3d60de Mon Sep 17 00:00:00 2001 From: Flavia Handrea Date: Wed, 26 Oct 2022 15:45:40 +0300 Subject: [PATCH] Fixed "Update move navigation alert text from Shares workspace". --- .../org/permanent/permanent/ui/shares/SharedXMeFragment.kt | 7 ++++--- app/src/main/res/values/strings.xml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/permanent/permanent/ui/shares/SharedXMeFragment.kt b/app/src/main/java/org/permanent/permanent/ui/shares/SharedXMeFragment.kt index bd667ee7..520d7d29 100644 --- a/app/src/main/java/org/permanent/permanent/ui/shares/SharedXMeFragment.kt +++ b/app/src/main/java/org/permanent/permanent/ui/shares/SharedXMeFragment.kt @@ -264,14 +264,15 @@ class SharedXMeFragment : PermanentBaseFragment(), RecordListener { val viewDialog: View = layoutInflater.inflate(R.layout.dialog_title_text_two_buttons, null) val alert = AlertDialog.Builder(context).setView(viewDialog).create() - viewDialog.tvTitle.text = getString(R.string.dialog_shared_files_discard_title) - viewDialog.tvText.text = getString(R.string.dialog_shared_files_discard_text) - viewDialog.btnPositive.text = getString(R.string.button_discard) + viewDialog.tvTitle.text = getString(R.string.dialog_shared_files_cancel_move_title) + viewDialog.tvText.text = getString(R.string.dialog_shared_files_cancel_move_text) + viewDialog.btnPositive.text = getString(R.string.button_cancel_move) viewDialog.btnPositive.setOnClickListener { viewModel.cancelRelocationMode() viewModel.navigateBack() alert.dismiss() } + viewDialog.btnNegative.text = getString(R.string.button_continue) viewDialog.btnNegative.setOnClickListener { alert.dismiss() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d0a846b2..047faad5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -498,13 +498,14 @@ Choose a default archive Leave share - Yes, discard selected file Selected files: Upload selected files to this destination: Mobile Uploads - Discard selection - Are you sure you want to discard selection and navigate back? + Cancel Move? + Moving files or folders outside of the shared folder in which they are currently located is not permitted at this time. You can cancel this move action or continue to choose a destination for the selected item. + Cancel Move + Continue \ No newline at end of file