Merge pull request #180 from PermanentOrg/feature/VSP-982

Fixed "Update move navigation alert text from Shares workspace".
PermanentOrg · Oct 26, 2022 · 6070ff6 · 6070ff6
2 parents 4eff305 + a2df388
commit 6070ff6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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
@@ -498,13 +498,14 @@
     <string name="archive_onboarding_choose_default_archive">Choose a default archive</string>
 
     <string name="button_leave_share">Leave share</string>
-    <string name="button_discard">Yes, discard selected file</string>
 
     <string name="save_to_permanent_selected_files">Selected files:</string>
     <string name="save_to_permanent_upload_to_destination">Upload selected files to this destination:</string>
     <string name="save_to_permanent_mobile_uploads">Mobile Uploads</string>
 
-    <string name="dialog_shared_files_discard_title">Discard selection</string>
-    <string name="dialog_shared_files_discard_text">Are you sure you want to discard selection and navigate back?</string>
+    <string name="dialog_shared_files_cancel_move_title">Cancel Move?</string>
+    <string name="dialog_shared_files_cancel_move_text">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.</string>
+    <string name="button_cancel_move">Cancel Move</string>
+    <string name="button_continue">Continue</string>
 
 </resources>