Use neutral buttons

10 files changed, 16 insertions, 22 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
index 3ff474a3a..e7faa6dba 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
@@ -815,7 +815,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
                                                         copyToClipboard(context, context.getString(R.string.simple_exception), "```\n" + debugInfos + "\n```");
                                                         a.dismiss();
                                                     })
-                                                    .setNegativeButton(R.string.simple_close, null)
+                                                    .setNeutralButton(R.string.simple_close, null)
                                                     .create();
                                             dialog.show();
                                             ((TextView) Objects.requireNonNull(dialog.findViewById(android.R.id.message))).setTypeface(Typeface.MONOSPACE);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/SelectCardActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/SelectCardActivity.java
index be000b3f3..dbdfd04e4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/SelectCardActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/SelectCardActivity.java
@@ -103,7 +103,7 @@ public class SelectCardActivity extends MainActivity implements SelectCardListen
                     copyToClipboard(this, throwable.getMessage(), "```\n" + debugInfos + "\n```");
                     finish();
                 })
-                .setNegativeButton(R.string.simple_close, (d, w) -> finish())
+                .setNeutralButton(R.string.simple_close, null)
                 .create();
         dialog.show();
         ((TextView) Objects.requireNonNull(dialog.findViewById(android.R.id.message))).setTypeface(Typeface.MONOSPACE);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/DeleteBoardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/DeleteBoardDialogFragment.java
index 44c6f5388..d07aaed11 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/DeleteBoardDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/DeleteBoardDialogFragment.java
@@ -42,7 +42,7 @@ public class DeleteBoardDialogFragment extends DialogFragment {
                 .setTitle(getString(R.string.delete_something, board.getTitle()))
                 .setMessage(R.string.delete_board_message)
                 .setPositiveButton(R.string.simple_delete, (dialog, which) -> deleteBoardListener.onBoardDeleted(board))
-                .setNegativeButton(android.R.string.cancel, null);
+                .setNeutralButton(android.R.string.cancel, null);
         return builder.create();
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
index b856a5f52..0f5992fc1 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
@@ -72,7 +72,7 @@ public class EditBoardDialogFragment extends BrandedDialogFragment {
 
         return dialogBuilder
                 .setView(binding.getRoot())
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNeutralButton(android.R.string.cancel, null)
                 .create();
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
index 84adf1e75..a0768b12f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
@@ -298,7 +298,7 @@ public class CardAdapter extends RecyclerView.Adapter<ItemCardViewHolder> implem
                             });
                             DeckLog.log("Moved card \"" + card.getCard().getTitle() + "\" to \"" + availableStacks.get(which).getStack().getTitle() + "\"");
                         })
-                        .setNegativeButton(android.R.string.cancel, null)
+                        .setNeutralButton(android.R.string.cancel, null)
                         .setTitle(context.getString(R.string.action_card_move_title, card.getCard().getTitle()))
                         .show();
                 return true;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/DeleteAttachmentDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/DeleteAttachmentDialogFragment.java
index 2c13ec6d0..02cec5771 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/DeleteAttachmentDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/DeleteAttachmentDialogFragment.java
@@ -44,7 +44,7 @@ public class DeleteAttachmentDialogFragment extends DialogFragment {
                 .setTitle(getString(R.string.delete_something, attachment.getFilename()))
                 .setMessage(R.string.attachment_delete_message)
                 .setPositiveButton(R.string.simple_delete, (dialog, whichButton) -> deleteAttachmentListener.onAttachmentDeleted(attachment))
-                .setNegativeButton(android.R.string.cancel, null);
+                .setNeutralButton(android.R.string.cancel, null);
         return builder.create();
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsEditDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsEditDialogFragment.java
index d5c80ae63..f43ccb5a0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsEditDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsEditDialogFragment.java
@@ -52,7 +52,7 @@ public class CardCommentsEditDialogFragment extends BrandedDialogFragment {
         return new BrandedAlertDialogBuilder(requireActivity())
                 .setView(binding.getRoot())
                 .setTitle(R.string.simple_comment)
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNeutralButton(android.R.string.cancel, null)
                 .setPositiveButton(R.string.simple_update, (dialog, which) -> addCommentListener.onCommentEdited(requireArguments().getLong(BUNDLE_KEY_COMMENT_ID), binding.input.getText().toString()))
                 .create();
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
index d5a3c5e6f..85ecf7d3c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
@@ -27,14 +27,7 @@ public class FilterDialogFragment extends BrandedDialogFragment {
     private static final String KEY_BOARD_ID = "board_id";
 
     private MainViewModel viewModel;
-
-    private DialogFilterBinding binding;
-    private SyncManager syncManager;
-
     private OverdueFilterAdapter overdueAdapter;
-
-    private Account account;
-    private long boardId;
     private FilterInformation filterInformation;
 
     @Override
@@ -51,10 +44,10 @@ public class FilterDialogFragment extends BrandedDialogFragment {
             throw new IllegalArgumentException(KEY_ACCOUNT + " and " + KEY_BOARD_ID + " must be provided as arguments");
         }
 
-        this.boardId = args.getLong(KEY_BOARD_ID);
-        this.account = (Account) args.getSerializable(KEY_ACCOUNT);
+        long boardId = args.getLong(KEY_BOARD_ID);
+        Account account = (Account) args.getSerializable(KEY_ACCOUNT);
 
-        if (this.boardId == 0L || this.account == null) {
+        if (boardId == 0L || account == null) {
             throw new IllegalArgumentException(KEY_ACCOUNT + " and " + KEY_BOARD_ID + " must be valid localIds and not be 0 or null");
         }
     }
@@ -72,7 +65,7 @@ public class FilterDialogFragment extends BrandedDialogFragment {
 
         final AlertDialog.Builder dialogBuilder = new BrandedAlertDialogBuilder(requireContext());
 
-        binding = DialogFilterBinding.inflate(requireActivity().getLayoutInflater());
+        it.niedermann.nextcloud.deck.databinding.DialogFilterBinding binding = DialogFilterBinding.inflate(requireActivity().getLayoutInflater());
         overdueAdapter = new OverdueFilterAdapter(requireContext());
         binding.overdue.setAdapter(overdueAdapter);
         binding.overdue.setSelection(overdueAdapter.getPosition(this.filterInformation.getDueType()));
@@ -88,11 +81,12 @@ public class FilterDialogFragment extends BrandedDialogFragment {
             }
         });
 
-        syncManager = new SyncManager(requireActivity());
+        SyncManager syncManager = new SyncManager(requireActivity());
         return dialogBuilder
                 .setTitle(R.string.simple_filter)
                 .setView(binding.getRoot())
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNeutralButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.simple_clear, (a, b) -> viewModel.postFilterInformation(null))
                 .setPositiveButton(R.string.simple_filter, (a, b) -> viewModel.postFilterInformation(filterInformation))
                 .create();
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java
index 7fe8a7921..8be166e70 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java
@@ -41,7 +41,7 @@ public class DeleteStackDialogFragment extends DialogFragment {
                 .setTitle(R.string.delete_list)
                 .setMessage(R.string.do_you_want_to_delete_the_current_list)
                 .setPositiveButton(R.string.simple_delete, (dialog, whichButton) -> deleteStackListener.onStackDeleted(stackId))
-                .setNegativeButton(android.R.string.cancel, null);
+                .setNeutralButton(android.R.string.cancel, null);
         return builder.create();
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
index d5c39d0c9..750dec2ca 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
@@ -47,7 +47,7 @@ public class EditStackDialogFragment extends BrandedDialogFragment {
 
         AlertDialog.Builder builder = new BrandedAlertDialogBuilder(requireActivity())
                 .setView(binding.getRoot())
-                .setNegativeButton(android.R.string.cancel, null);
+                .setNeutralButton(android.R.string.cancel, null);
         if (getArguments() == null) {
             throw new IllegalArgumentException("Please add at least stack id to the arguments");
         }