moving "cancel" dialog-button-action from negative to neutral action-button

Resolves #8006

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -301,12 +301,12 @@ public class FileDisplayActivity extends FileActivity
                 AlertDialog alertDialog = new AlertDialog.Builder(this, R.style.Theme_ownCloud_Dialog)
                     .setTitle(R.string.wrong_storage_path)
                     .setMessage(R.string.wrong_storage_path_desc)
-                    .setNegativeButton(R.string.dialog_close, (dialog, which) -> dialog.dismiss())
+                    .setPositiveButton(R.string.dialog_close, (dialog, which) -> dialog.dismiss())
                     .setIcon(R.drawable.ic_settings)
                     .create();
 
                 alertDialog.show();
-                alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(ThemeColorUtils.primaryAccentColor(this));
+                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(ThemeColorUtils.primaryAccentColor(this));
             } catch (WindowManager.BadTokenException e) {
                 Log_OC.e(TAG, "Error showing wrong storage info, so skipping it: " + e.getMessage());
             }

src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -303,7 +303,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 intent.putExtra("authorities", new String[]{MainApp.getAuthTokenType()});
                 startActivityForResult(intent, REQUEST_CODE__SETUP_ACCOUNT);
             });
-            builder.setNegativeButton(R.string.uploader_wrn_no_account_quit_btn_text, (dialog, which) -> getActivity().finish());
+            builder.setNeutralButton(R.string.uploader_wrn_no_account_quit_btn_text,
+                                 (dialog, which) -> getActivity().finish());
             return builder.create();
         }
     }
@@ -479,7 +480,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
                     ((ReceiveExternalFilesActivity) getActivity()).uploadFile(tmpName, filename);
                 }
             });
-            builder.setNegativeButton(R.string.common_cancel, (dialog, id) -> dialog.cancel());
+            builder.setNeutralButton(R.string.common_cancel, (dialog, id) -> dialog.cancel());
 
             return builder.create();
         }

src/main/java/com/owncloud/android/ui/activity/StorageMigration.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski

src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java

@@ -813,7 +813,7 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
                         }
                     }
                 })
-                .setNegativeButton(getString(R.string.battery_optimization_close), (dialog, which) -> dialog.dismiss())
+                .setNeutralButton(getString(R.string.battery_optimization_close), (dialog, which) -> dialog.dismiss())
                 .setIcon(R.drawable.ic_battery_alert);
 
             if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
@@ -821,7 +821,7 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
 
                 int color = ThemeColorUtils.primaryAccentColor(this);
                 alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(color);
-                alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
+                alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(color);
             }
         }
     }

src/main/java/com/owncloud/android/ui/dialog/AccountRemovalConfirmationDialog.java

@@ -69,7 +69,7 @@ public class AccountRemovalConfirmationDialog extends DialogFragment implements
         AlertDialog alertDialog = (AlertDialog) getDialog();
 
         alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(color);
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
+        alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(color);
     }
 
     @NonNull
@@ -82,7 +82,7 @@ public class AccountRemovalConfirmationDialog extends DialogFragment implements
             .setPositiveButton(R.string.common_ok,
                                (dialogInterface, i) -> backgroundJobManager.startAccountRemovalJob(user.getAccountName(),
                                                                                                    false))
-            .setNegativeButton(R.string.common_cancel, null)
+            .setNeutralButton(R.string.common_cancel, null)
             .create();
     }
 }

src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java

@@ -119,7 +119,7 @@ public class ConflictsResolveDialog extends DialogFragment {
         positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
         setPositiveButtonStatus(false);
 
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
+        alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(color);
     }
 
     @Override
@@ -173,7 +173,7 @@ public class ConflictsResolveDialog extends DialogFragment {
 
                 }
             })
-            .setNegativeButton(R.string.common_cancel, (dialog, which) -> {
+            .setNeutralButton(R.string.common_cancel, (dialog, which) -> {
                 if (listener != null) {
                     listener.conflictDecisionMade(Decision.CANCEL);
                 }

src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java

@@ -81,7 +81,7 @@ public class CreateFolderDialogFragment
         AlertDialog alertDialog = (AlertDialog) getDialog();
 
         alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(color);
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
+        alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(color);
     }
 
     @NonNull
@@ -104,7 +104,7 @@ public class CreateFolderDialogFragment
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(view)
                 .setPositiveButton(R.string.folder_confirm_create, this)
-                .setNegativeButton(R.string.common_cancel, this)
+                .setNeutralButton(R.string.common_cancel, this)
                 .setTitle(R.string.uploader_info_dirname);
         AlertDialog d = builder.create();
 

src/main/java/com/owncloud/android/ui/dialog/NoteDialogFragment.java

@@ -83,7 +83,7 @@ public class NoteDialogFragment extends DialogFragment implements DialogInterfac
         AlertDialog alertDialog = (AlertDialog) getDialog();
 
         alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(color);
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
+        alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(color);
     }
 
     @NonNull
@@ -105,7 +105,7 @@ public class NoteDialogFragment extends DialogFragment implements DialogInterfac
         AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity());
         builder.setView(view)
             .setPositiveButton(R.string.note_confirm, this)
-            .setNegativeButton(R.string.common_cancel, this)
+            .setNeutralButton(R.string.common_cancel, this)
             .setTitle(R.string.send_note);
         Dialog dialog = builder.create();
 

src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java

@@ -87,7 +87,7 @@ public class RenameFileDialogFragment
 
         if (alertDialog != null) {
             alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(color);
-            alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
+            alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(color);
         }
     }
 
@@ -117,7 +117,7 @@ public class RenameFileDialogFragment
         AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity());
         builder.setView(view)
             .setPositiveButton(R.string.file_rename, this)
-            .setNegativeButton(R.string.common_cancel, this)
+            .setNeutralButton(R.string.common_cancel, this)
             .setTitle(R.string.rename_dialog_title);
         Dialog d = builder.create();
 

src/main/java/com/owncloud/android/ui/dialog/RenamePublicShareDialogFragment.java

@@ -75,7 +75,7 @@ public class RenamePublicShareDialogFragment
 
         if (alertDialog != null) {
             alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(color);
-            alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(color);
+            alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(color);
         }
     }
 
@@ -101,7 +101,7 @@ public class RenamePublicShareDialogFragment
         AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity());
         builder.setView(view)
             .setPositiveButton(R.string.file_rename, this)
-            .setNegativeButton(R.string.common_cancel, this)
+            .setNeutralButton(R.string.common_cancel, this)
             .setTitle(R.string.public_share_name);
         Dialog dialog = builder.create();
 

src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java

@@ -84,7 +84,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
     private TextView passphraseTextView;
     private ArbitraryDataProvider arbitraryDataProvider;
     private Button positiveButton;
-    private Button negativeButton;
+    private Button neutralButton;
     private DownloadKeysAsyncTask task;
     private TextView passwordField;
     private String keyResult;
@@ -115,8 +115,8 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
         positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
         positiveButton.setTextColor(color);
 
-        negativeButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
-        negativeButton.setTextColor(color);
+        neutralButton = alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL);
+        neutralButton.setTextColor(color);
 
         task = new DownloadKeysAsyncTask();
         task.execute();
@@ -151,7 +151,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
     private Dialog createDialog(View v) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(v).setPositiveButton(R.string.common_ok, null)
-                .setNegativeButton(R.string.common_cancel, null)
+                .setNeutralButton(R.string.common_cancel, null)
                 .setTitle(R.string.end_to_end_encryption_title);
 
         Dialog dialog = builder.create();
@@ -217,7 +217,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
                             case KEY_GENERATE:
                                 passphraseTextView.setVisibility(View.GONE);
                                 positiveButton.setVisibility(View.GONE);
-                                negativeButton.setVisibility(View.GONE);
+                                neutralButton.setVisibility(View.GONE);
                                 getDialog().setTitle(R.string.end_to_end_encryption_storing_keys);
 
                                 GenerateNewKeysAsyncTask newKeysTask = new GenerateNewKeysAsyncTask();
@@ -242,7 +242,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
 
             textView.setText(R.string.end_to_end_encryption_retrieving_keys);
             positiveButton.setVisibility(View.INVISIBLE);
-            negativeButton.setVisibility(View.INVISIBLE);
+            neutralButton.setVisibility(View.INVISIBLE);
         }
 
         @Override
@@ -413,9 +413,9 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
         positiveButton.setText(R.string.end_to_end_encryption_confirm_button);
         positiveButton.setVisibility(View.VISIBLE);
 
-        negativeButton.setVisibility(View.VISIBLE);
-        positiveButton.setTextColor(color);
-        negativeButton.setTextColor(color);
+        neutralButton.setVisibility(View.VISIBLE);
+        ThemeUtils.themeBorderlessButton(positiveButton, color);
+        ThemeUtils.themeBorderlessButton(neutralButton, color);
 
         keyResult = KEY_GENERATE;
     }