Improved copy/move dialog

Author: fesave

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -69,7 +69,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
 
     private static final String TAG_LIST_OF_FOLDERS = "LIST_OF_FOLDERS";
 
-    private static final String IS_ACTION_COPY = "IS_ACTION_COPY";
+    private static final String ACTION_BUTTON = "ACTION_BUTTON";
 
     private LocalBroadcastManager mLocalBroadcastManager;
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
@@ -174,13 +174,18 @@ public void setBackgroundText() {
     }
 
     private void setActionButtonText() {
-        boolean isActionCopy = getIntent().getBooleanExtra(IS_ACTION_COPY, false);
+        FolderPickerActivity.ACTION_BUTTON actionButton = (FolderPickerActivity.ACTION_BUTTON) getIntent().getSerializableExtra(ACTION_BUTTON);
         Button chooseButton = findViewById(R.id.folder_picker_btn_choose);
 
-        if (isActionCopy) {
-            chooseButton.setText(getString(android.R.string.copy));
-        } else {
-            chooseButton.setText(getString(R.string.actionbar_move));
+        if (actionButton != null) {
+            switch (actionButton) {
+                case MOVE:
+                    chooseButton.setText(getString(R.string.folder_picker_move_here_button_text));
+                    break;
+                case COPY:
+                    chooseButton.setText(getString(R.string.folder_picker_copy_here_button_text));
+                    break;
+            }
         }
     }
 
@@ -525,4 +530,8 @@ private void refreshList(boolean ignoreETag) {
             }
         }
     }
+
+    public enum ACTION_BUTTON {
+        MOVE, COPY
+    }
 }

owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -115,7 +115,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     private static final String GRID_IS_PREFERED_PREFERENCE = "gridIsPrefered";
 
-    private static final String IS_ACTION_COPY = "IS_ACTION_COPY";
+    private static final String ACTION_BUTTON = "ACTION_BUTTON";
 
     private static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
 
@@ -1002,13 +1002,14 @@ private boolean onFileActionChosen(int menuId) {
             }
             case R.id.action_move: {
                 Intent action = new Intent(getActivity(), FolderPickerActivity.class);
+                action.putExtra(ACTION_BUTTON, FolderPickerActivity.ACTION_BUTTON.MOVE);
                 action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, checkedFiles);
                 requireActivity().startActivityForResult(action, FileDisplayActivity.REQUEST_CODE__MOVE_FILES);
                 return true;
             }
             case R.id.action_copy:
                 Intent action = new Intent(getActivity(), FolderPickerActivity.class);
-                action.putExtra(IS_ACTION_COPY, true);
+                action.putExtra(ACTION_BUTTON, FolderPickerActivity.ACTION_BUTTON.COPY);
                 action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, checkedFiles);
                 requireActivity().startActivityForResult(action, FileDisplayActivity.REQUEST_CODE__COPY_FILES);
                 return true;

owncloudApp/src/main/res/layout/files_folder_picker.xml

@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/filesFolderPickerLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -58,8 +57,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:theme="@style/Button.Primary"
-            tools:text="@string/upload_copy_files" />
+            android:text="@string/folder_picker_choose_button_text"
+            android:theme="@style/Button.Primary" />
 
     </LinearLayout>
 

owncloudApp/src/main/res/values/strings.xml

@@ -478,6 +478,8 @@
     <string name="actionbar_move">Move</string>
     <string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
     <string name="folder_picker_choose_button_text">Choose</string>
+    <string name="folder_picker_move_here_button_text">Move Here</string>
+    <string name="folder_picker_copy_here_button_text">Copy Here</string>
 
     <string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
     <string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>