Improved copy/move dialog

Author: fesave

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

@@ -69,6 +69,8 @@ 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 LocalBroadcastManager mLocalBroadcastManager;
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private boolean mSyncInProgress = false;
@@ -103,6 +105,9 @@ protected void onCreate(Bundle savedInstanceState) {
         // sets message for empty list of folders
         setBackgroundText();
 
+        // Set action button text
+        setActionButtonText();
+
         mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
 
         Timber.d("onCreate() end");
@@ -168,6 +173,17 @@ public void setBackgroundText() {
         }
     }
 
+    private void setActionButtonText() {
+        boolean isActionCopy = getIntent().getBooleanExtra(IS_ACTION_COPY, false);
+        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));
+        }
+    }
+
     protected OCFileListFragment getListOfFilesFragment() {
         Fragment listOfFiles = getSupportFragmentManager().findFragmentByTag(FolderPickerActivity.TAG_LIST_OF_FOLDERS);
         if (listOfFiles != null) {

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

@@ -115,6 +115,8 @@ 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 String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
 
     private final String ALL_FILES_SAF_REGEX = "*/*";
@@ -1006,6 +1008,7 @@ private boolean onFileActionChosen(int menuId) {
             }
             case R.id.action_copy:
                 Intent action = new Intent(getActivity(), FolderPickerActivity.class);
+                action.putExtra(IS_ACTION_COPY, true);
                 action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, checkedFiles);
                 requireActivity().startActivityForResult(action, FileDisplayActivity.REQUEST_CODE__COPY_FILES);
                 return true;
@@ -1269,7 +1272,7 @@ private void showSnackMessage(int messageResource) {
         snackbar.show();
     }
 
-    public void setSearchListener(SearchView searchView){
+    public void setSearchListener(SearchView searchView) {
         searchView.setOnQueryTextFocusChangeListener(this);
         searchView.setOnQueryTextListener(this);
     }

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

@@ -16,6 +16,7 @@ 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"
@@ -57,9 +58,9 @@ 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:text="@string/folder_picker_choose_button_text"
-            android:theme="@style/Button.Primary" />
+            android:theme="@style/Button.Primary"
+            tools:text="@string/upload_copy_files" />
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>