Indicate selected jotting

* Implement ExpandableJottingsListAdapter#indicateSelection() and #highlightItem()
- change color of selected jotting
- clear backgrounds when x is clicked

v2.2.0

Author: varunsingh87

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.boruminc.borumjot.android"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 47
-        versionName "2.1.1"
+        versionCode 48
+        versionName "2.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/boruminc/borumjot/android/ExpandableJottingsListAdapter.java

@@ -5,13 +5,18 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.BaseExpandableListAdapter;
+import android.widget.ExpandableListView;
+import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -23,13 +28,13 @@
 import com.boruminc.borumjot.Note;
 import com.boruminc.borumjot.Task;
 import com.boruminc.borumjot.android.customviews.SerializableImage;
+import com.google.android.flexbox.FlexboxLayout;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Predicate;
 
 @RequiresApi(api = Build.VERSION_CODES.N)
 public class ExpandableJottingsListAdapter extends BaseExpandableListAdapter {
@@ -71,27 +76,6 @@ void setSharedData(ArrayList<Jotting> sharedJottings) {
         this.allJottingsLists.replace("shared", sharedJottings);
     }
 
-    public ExpandableJottingsListAdapter.GroupTitleViewHolder onCreateDividerViewHolder(ViewGroup parent) {
-        // Create a new view
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_group, parent, false);
-        return new GroupTitleViewHolder(v, context);
-    }
-
-    public ExpandableJottingsListAdapter.ChildViewHolder onCreateChildViewHolder(ViewGroup parent) {
-        // Create a new view
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.jotting_list_item, parent, false);
-        return new ChildViewHolder(v, context);
-    }
-
-    /*
-     * Replace the contents of a view (invoked by the layout manager)
-     * Get element from the dataset at this position
-     * Replace the contents of the view with that element
-     */
-    public void onBindViewHolder(ExpandableListViewHolder holder, String key, int position) {
-        holder.bindView(Objects.requireNonNull(allJottingsLists.get(key)).get(position));
-    }
-
     @Override
     public int getGroupCount() {
         return this.jottingsListTitles.size();
@@ -200,7 +184,6 @@ void bindView(Object data) {
         }
     }
 
-    // DONE ChildViewHolder
     static class ChildViewHolder extends ExpandableListViewHolder implements View.OnLongClickListener {
         private TextView textView;
         private SerializableImage pinIcon;
@@ -271,6 +254,8 @@ public boolean onLongClick(View v) {
             // Make visible and set data to jotting options toolbar
             temporaryAppBar.setVisibility(View.VISIBLE);
 
+            indicateSelection(v, currentActivity);
+
             Bundle bundle = new Bundle();
             bundle.putSerializable("data", (Serializable) v.getTag());
             bundle.putSerializable("view", pinIcon);
@@ -282,5 +267,30 @@ public boolean onLongClick(View v) {
 
             return true;
         }
+
+        private void indicateSelection(View v, Activity currentActivity) {
+            if (v instanceof FlexboxLayout) { // The row was long clicked
+                highlightItem((ViewGroup) v, currentActivity);
+            } else if (v.getParent() instanceof FlexboxLayout) { // One of the children was long clicked
+                highlightItem(v.getParent(), currentActivity);
+            }
+        }
+
+        private void highlightItem(ViewParent listItemRoot, Activity currentActivity) {
+            int backgroundForSelectedView = currentActivity.getResources().getColor(R.color.cherryRasboraBackgroundSurface);
+            Drawable defaultBackground = currentActivity.getResources().getDrawable(
+                    R.drawable.orange_border,
+                    currentActivity.getTheme()
+            );
+
+            ViewGroup listView = (ViewGroup) listItemRoot.getParent();
+
+            for (int i = 0; i < listView.getChildCount(); i++) {
+                if (listView.getChildAt(i) instanceof FlexboxLayout)
+                    listView.getChildAt(i).setBackground(defaultBackground);
+            }
+
+            ((View) listItemRoot).setBackgroundColor(backgroundForSelectedView);
+        }
     }
 }

app/src/main/java/com/boruminc/borumjot/android/HomeActivity.java

@@ -11,6 +11,7 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ExpandableListView;
 import android.widget.ProgressBar;

app/src/main/java/com/boruminc/borumjot/android/JottingOptionsFragment.java

@@ -3,11 +3,14 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
@@ -29,6 +32,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Objects;
+
 public class JottingOptionsFragment extends Fragment {
     private View root;
     private String userApiKey;
@@ -96,7 +101,19 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                     root.setVisibility(View.GONE);
                     normalToolbar.setVisibility(View.VISIBLE);
                 }
-            break;
+
+                View pin = (SerializableImage) requireArguments().getSerializable("view");
+
+                assert pin != null;
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    ((View) pin.getParent()).setBackground(
+                            getResources().getDrawable(
+                                    R.drawable.orange_border,
+                                    Objects.requireNonNull(getActivity()).getTheme()
+                            )
+                    );
+                }
+                break;
         }
         return super.onOptionsItemSelected(item);
     }