1 files changed, 15 insertions, 28 deletions

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 f529ced63..d12389d21 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
@@ -1,11 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.board;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -13,17 +10,16 @@ import androidx.fragment.app.DialogFragment;
 
 import java.util.Objects;
 
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.ButterKnife;
 import it.niedermann.nextcloud.deck.Application;
 import it.niedermann.nextcloud.deck.R;
+import it.niedermann.nextcloud.deck.databinding.DialogBoardCreateBinding;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
-import it.niedermann.nextcloud.deck.ui.helper.colorchooser.ColorChooser;
 
 public class EditBoardDialogFragment extends DialogFragment {
 
+    private DialogBoardCreateBinding binding;
+
     private static final String KEY_ACCOUNT_ID = "account_id";
     private static final String KEY_BOARD_ID = "board_id";
     private static final Long NO_BOARD_ID = -1L;
@@ -32,14 +28,6 @@ public class EditBoardDialogFragment extends DialogFragment {
 
     private FullBoard fullBoard = null;
 
-    @BindView(R.id.input)
-    EditText boardTitle;
-    @BindView(R.id.colorChooser)
-    ColorChooser colorChooser;
-
-    @BindColor(R.color.board_default_color)
-    int boardDefaultColor;
-
     /**
      * Use newInstance()-Method
      */
@@ -60,37 +48,36 @@ public class EditBoardDialogFragment extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Activity activity = requireActivity();
-        View view = activity.getLayoutInflater().inflate(R.layout.dialog_board_create, null);
-        ButterKnife.bind(this, view);
+        binding = DialogBoardCreateBinding.inflate(getLayoutInflater());
+
         Long boardId = Objects.requireNonNull(getArguments()).getLong(KEY_BOARD_ID);
 
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, Application.getAppTheme(getContext()) ? R.style.DialogDarkTheme : R.style.ThemeOverlay_AppCompat_Dialog_Alert);
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext(), Application.getAppTheme(getContext()) ? R.style.DialogDarkTheme : R.style.ThemeOverlay_AppCompat_Dialog_Alert);
 
         if (NO_BOARD_ID.equals(boardId)) {
             dialogBuilder.setTitle(R.string.add_board);
-            dialogBuilder.setPositiveButton(R.string.simple_add, (dialog, which) -> editBoardListener.onCreateBoard(boardTitle.getText().toString(), colorChooser.getSelectedColor()));
-            this.colorChooser.selectColor(String.format("#%06X", 0xFFFFFF & boardDefaultColor));
+            dialogBuilder.setPositiveButton(R.string.simple_add, (dialog, which) -> editBoardListener.onCreateBoard(binding.input.getText().toString(), binding.colorChooser.getSelectedColor()));
+            binding.colorChooser.selectColor(String.format("#%06X", 0xFFFFFF & getResources().getColor(R.color.board_default_color)));
         } else {
             dialogBuilder.setTitle(R.string.edit_board);
             dialogBuilder.setPositiveButton(R.string.simple_save, (dialog, which) -> {
-                this.fullBoard.board.setColor(colorChooser.getSelectedColor().substring(1));
-                this.fullBoard.board.setTitle(this.boardTitle.getText().toString());
+                this.fullBoard.board.setColor(binding.colorChooser.getSelectedColor().substring(1));
+                this.fullBoard.board.setTitle(binding.input.getText().toString());
                 editBoardListener.onUpdateBoard(fullBoard);
             });
-            new SyncManager(activity).getFullBoardById(Objects.requireNonNull(getArguments()).getLong(KEY_ACCOUNT_ID), boardId).observe(EditBoardDialogFragment.this, (FullBoard fb) -> {
+            new SyncManager(requireActivity()).getFullBoardById(Objects.requireNonNull(getArguments()).getLong(KEY_ACCOUNT_ID), boardId).observe(EditBoardDialogFragment.this, (FullBoard fb) -> {
                 if (fb.board != null) {
                     this.fullBoard = fb;
                     String title = this.fullBoard.getBoard().getTitle();
-                    this.boardTitle.setText(title);
-                    this.boardTitle.setSelection(title.length());
-                    this.colorChooser.selectColor("#" + fullBoard.getBoard().getColor());
+                    binding.input.setText(title);
+                    binding.input.setSelection(title.length());
+                    binding.colorChooser.selectColor("#" + fullBoard.getBoard().getColor());
                 }
             });
         }
 
         return dialogBuilder
-                .setView(view)
+                .setView(binding.getRoot())
                 .setNegativeButton(android.R.string.cancel, null)
                 .create();
     }