#207 Comments support

Implement a dialog for entering comment

6 files changed, 120 insertions, 0 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
index d87d2c32d..139e46c6f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
@@ -239,6 +239,12 @@ public class SyncManager {
         return dataBaseAdapter.getActivitiesForCard(card.getLocalId());
     }
 
+    public void addCommentToCard(long accountId, long boardId, long cardId, String comment) {
+        // TODO implement me
+        // No return value required, since the activities are observed and should get notified
+        // Offline-Support needed.
+    }
+
     public void deleteBoard(Board board) {
         long accountId = board.getAccountId();
         doAsync(() -> {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
index 7131dbac0..991046ce9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
@@ -49,6 +49,7 @@ import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.ui.board.BoardAdapter;
 import it.niedermann.nextcloud.deck.ui.card.CardDetailsFragment;
 import it.niedermann.nextcloud.deck.ui.card.CardTabAdapter;
+import it.niedermann.nextcloud.deck.ui.card.CommentDialogFragment;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
 
 import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
@@ -60,6 +61,7 @@ import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.NO_LOCAL_ID;
 
 public class EditActivity extends AppCompatActivity implements
         CardDetailsFragment.CardDetailsListener,
+        CommentDialogFragment.AddCommentListener,
         AdapterView.OnItemSelectedListener {
 
     SyncManager syncManager;
@@ -361,4 +363,9 @@ public class EditActivity extends AppCompatActivity implements
     public void onNothingSelected(AdapterView<?> parent) {
 
     }
+
+    @Override
+    public void onCommentAdded(String comment) {
+        syncManager.addCommentToCard(accountId, boardId, localId, comment);
+    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java
index 9c190409b..8d7daf628 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java
@@ -1,5 +1,6 @@
 package it.niedermann.nextcloud.deck.ui.card;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,6 +17,7 @@ import com.google.android.material.snackbar.Snackbar;
 
 import java.util.Objects;
 
+import butterknife.BindString;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -30,6 +32,8 @@ import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.BUNDLE_KEY_LOCAL_
 public class CardActivityFragment extends Fragment {
     private Unbinder unbinder;
 
+    @BindString(R.string.simple_comment)
+    String addComment;
     @BindView(R.id.coordinatorLayout)
     CoordinatorLayout coordinatorLayout;
     @BindView(R.id.fab)
@@ -56,6 +60,14 @@ public class CardActivityFragment extends Fragment {
     }
 
     @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (!(context instanceof CommentDialogFragment.AddCommentListener)) {
+            throw new ClassCastException("Caller must implement " + CommentDialogFragment.AddCommentListener.class.getCanonicalName());
+        }
+    }
+
+    @Override
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container,
                              Bundle savedInstanceState) {
@@ -86,6 +98,7 @@ public class CardActivityFragment extends Fragment {
             if (canEdit) {
                 fab.setOnClickListener(v -> {
                     Snackbar.make(coordinatorLayout, "Adding comments is not yet implemented", Snackbar.LENGTH_LONG).show();
+//                    CommentDialogFragment.newInstance().show(getActivity().getSupportFragmentManager(), addComment);
                 });
                 activitiesList.addOnScrollListener(new RecyclerView.OnScrollListener() {
                     @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CommentDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CommentDialogFragment.java
new file mode 100644
index 000000000..71010538f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CommentDialogFragment.java
@@ -0,0 +1,77 @@
+package it.niedermann.nextcloud.deck.ui.card;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.EditText;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
+import java.util.Objects;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import it.niedermann.nextcloud.deck.Application;
+import it.niedermann.nextcloud.deck.R;
+
+public class CommentDialogFragment extends DialogFragment {
+    private AddCommentListener addCommentListener;
+
+    @BindView(R.id.input)
+    EditText input;
+
+    /**
+     * Use newInstance()-Method
+     */
+    public CommentDialogFragment() {
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof AddCommentListener) {
+            this.addCommentListener = (AddCommentListener) context;
+        } else {
+            throw new ClassCastException("Caller must implement " + AddCommentListener.class.getCanonicalName());
+        }
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        View view = Objects.requireNonNull(getActivity()).getLayoutInflater().inflate(R.layout.dialog_add_comment, null);
+        ButterKnife.bind(this, view);
+
+        return new AlertDialog.Builder(getActivity(), Application.getAppTheme(getContext()) ? R.style.DialogDarkTheme : R.style.ThemeOverlay_AppCompat_Dialog_Alert)
+                .setView(view)
+                .setTitle(R.string.simple_comment)
+                .setNegativeButton(R.string.simple_cancel, (dialog, which) -> {
+                    // Do something else
+                })
+                .setPositiveButton(R.string.simple_add, (dialog, which) -> addCommentListener.onCommentAdded(input.getText().toString()))
+                .create();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        input.requestFocus();
+        Objects.requireNonNull(Objects.requireNonNull(getDialog()).getWindow()).setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    public static CommentDialogFragment newInstance() {
+        return new CommentDialogFragment();
+    }
+
+    public interface AddCommentListener {
+        void onCommentAdded(String comment);
+    }
+}
diff --git a/app/src/main/res/layout/dialog_add_comment.xml b/app/src/main/res/layout/dialog_add_comment.xml
new file mode 100644
index 000000000..55ddc60d6
--- /dev/null
+++ b/app/src/main/res/layout/dialog_add_comment.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/standard_margin">
+
+    <EditText
+        android:id="@+id/input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/simple_comment"
+        android:imeOptions="actionDone"
+        android:importantForAutofill="no"
+        android:inputType="text" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ce38bf2e..9ac52161d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,4 +144,5 @@
     <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">You have to be connected to the internet in order to add an account.</string>
     <string name="simple_select">Select</string>
     <string name="owner">Owner</string>
+    <string name="simple_comment">Comment</string>
 </resources>