Strikethrough completed tasks on home activity

* Implement ExpandableJottingsListAdapter.ChildViewHolder#displayStrikethrough() (same implementation as the method in AppBarFragment)
* Show whether jotting is marked as completed with a strikethrough - invoke displayStrikethrough() in bindView()
* Add shared notes and shared tasks more cleanly to data pump
* Implement JSONToModel#convertJSONToNotes() - same purpose and implementation as convertJSONToTasks() but for notes
* Go back to OrangeGradientButton on login screen
* Add whether a Task is marked as complete to its string representation

v2.3.2

Author: varunsingh87

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.boruminc.borumjot.android"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 50
-        versionName "2.3.1"
+        versionCode 51
+        versionName "2.3.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/boruminc/borumjot/Task.java

@@ -30,7 +30,10 @@ public Task(String n, String b, ArrayList<Label> labels) {
 
   @NonNull
   public String toString() {
-    return super.toString();
+    String str = super.toString();
+    str += "Completed: " + completed;
+
+    return str;
   }
 
   @Override

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

@@ -47,10 +47,8 @@ void passTitleLeftAligned(String titleTxt) {
     void displayStrikethrough(boolean on) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             if (on)
-                // Add a strikethrough to the already existing paint flags using "|" bitwise operator
                 title.setPaintFlags(title.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
             else
-                // Remove the strikethrough from the paint flags using "&" bitwise operator
                 title.setPaintFlags(title.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
         }
     }

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

@@ -4,10 +4,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.Paint;
 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.View;
 import android.view.ViewGroup;
@@ -199,12 +201,29 @@ public void setViewProperties(View v) {
             textView.setPadding(padding, padding, 0, padding);
         }
 
+        /**
+         * Sets a strikethrough on the title by adding a background
+         * @param on Whether to strikethrough or remove strikethrough
+         */
+        void displayStrikethrough(boolean on) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                if (on)
+                    textView.setPaintFlags(textView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+                else
+                    textView.setPaintFlags(textView.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
+            }
+        }
+
         @Override
         public void bindView(Object data) {
             Jotting jottingInst = (Jotting) data;
             textView.setText(jottingInst.getName());
             textView.setTag(jottingInst);
             pinIcon.setVisibility(jottingInst.getPriority() > 0 ? View.VISIBLE : View.INVISIBLE);
+
+            // Indicate whether the task is marked as complete to give the priority property meaning
+            boolean completed = data instanceof Task && ((Task) textView.getTag()).isCompleted();
+            displayStrikethrough(completed);
         }
 
         /**

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

@@ -211,10 +211,12 @@ public void onComplete(JSONObject result) {
                     if (ranOk()) {
                         JSONObject groupedData = result.getJSONObject("data");
 
-                        ArrayList<Jotting> jottings = JSONToModel.convertJSONToJottings(groupedData.getJSONArray("notes"));
-                        ArrayList<Jotting> tasks = JSONToModel.convertJSONToJottings(groupedData.getJSONArray("tasks"));
+                        ArrayList<Note> notes = JSONToModel.convertJSONToNotes(groupedData.getJSONArray("notes"));
+                        ArrayList<Task> tasks = JSONToModel.convertJSONToTasks(groupedData.getJSONArray("tasks"));
 
+                        ArrayList<Jotting> jottings = new ArrayList<>(notes);
                         jottings.addAll(tasks);
+
                         jotListData.setSharedData(jottings);
                         jottingsListAdapter.setSharedData(jotListData.getSharedData());
                         jottingsListAdapter.notifyDataSetChanged();

app/src/main/java/com/boruminc/borumjot/android/server/JSONToModel.java

@@ -30,8 +30,9 @@ public static ArrayList<Jotting> convertJSONToJottings(JSONArray jottingsData) t
 
             if (row.getString("source").equals("note"))
                 jottings.add(convertJSONToNote(row));
-            else if (row.getString("source").equals("task"))
+            else if (row.getString("source").equals("task")) {
                 jottings.add(convertJSONToTask(row));
+            }
         }
 
         return jottings;
@@ -45,12 +46,28 @@ else if (row.getString("source").equals("task"))
      */
     public static ArrayList<Task> convertJSONToTasks(JSONArray data) throws JSONException {
         ArrayList<Task> tasks = new ArrayList<Task>();
-        for (int i = 0; i < data.length(); i++)
+        for (int i = 0; i < data.length(); i++) {
             tasks.add(convertJSONToTask(data.getJSONObject(i)));
+        }
 
         return tasks;
     }
 
+    /**
+     * Converts a <code>JSONArray</code> of <code>JSONObject</code>s to a <code>Task</code> object
+     * @param data The JSONArray
+     * @return A list of Tasks corresponding to the JSON data
+     * @throws JSONException if the id or title is not given for any row
+     */
+    public static ArrayList<Note> convertJSONToNotes(JSONArray data) throws JSONException {
+        ArrayList<Note> notes = new ArrayList<>();
+        for (int i = 0; i < data.length(); i++) {
+            notes.add(convertJSONToNote(data.getJSONObject(i)));
+        }
+
+        return notes;
+    }
+
     private static Task convertJSONToTask(JSONObject row) throws JSONException {
         // Set task information
         Task task = new Task(row.getString("title"), row.optString("body"), new ArrayList<Label>());

app/src/main/res/layout/activity_login.xml

@@ -67,14 +67,14 @@
         app:layout_constraintTop_toBottomOf="@+id/password"
         app:layout_constraintBottom_toTopOf="@id/borumjot_affil_note">
 
-        <Button
+        <com.boruminc.borumjot.android.customviews.OrangeGradientButton
             android:id="@+id/login"
             style="@style/OneSelectButtonGradient"
             android:enabled="true"
             android:onClick="submitLogin"
             android:text="@string/action_sign_in" />
 
-        <Button
+        <com.boruminc.borumjot.android.customviews.OrangeGradientButton
             android:id="@+id/registernavbtn"
             style="@style/OneSelectButtonGradient"
             android:onClick="navToRegister"

app/src/main/res/values/strings.xml

@@ -92,7 +92,7 @@
     <string name="delete_content_desc">Trashcan or delete icon</string>
     <string name="save_content_desc">Save icon</string>
     <string name="action_help">Help</string>
-    <string name="version_name">Version 2.3.1</string>
+    <string name="version_name">Version 2.3.2</string>
     <string name="action_labels">Labels</string>
     <string name="copyright_notice">Copyright 2021 Varun Singh</string>
     <string name="support_email">support@borumtech.com</string>