Implement nested subtasks (#21)

* Implement bare subtask of subtask

* Implement SubtaskRetrieval - makes request to get a task (used for subtasks) in the new com.boruminc.borumjot.android.subtasks package
* Implement subtask_activity (copy of task_activity except uses subtask_options_menu and label container is removed)
* Implement barebone of SubtaskActivity
- instantiate SubtaskRetrieval and call runAsync
* Change subtask names to TextViews so they are clickable to the SubtaskActivity
* Implement onEnterSubtaskClick - starts SubtaskActivity and sends id of subtask as extra to make the activity function properly and make a successful GET task request
* Implement subtask_options_menu - the task_options_menu with label and share removed

* Finish subtask of subtask

* Polish for v2.6.0, update build

* Set id for tag of subtask row rather than title for completion to function properly

v2.6.0

Author: varunsingh87

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.boruminc.borumjot.android"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 54
-        versionName "2.5.0"
+        versionCode 55
+        versionName "2.6.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -49,6 +49,10 @@
             android:name=".TaskActivity"
             android:label="Task" />
 
+        <activity android:name=".subtasks.SubtaskActivity"
+            android:label="Subtask"
+            android:parentActivityName=".TaskActivity" />
+
         <activity
             android:name=".NoteActivity"
             android:label="Note" />

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

@@ -31,7 +31,7 @@
 
 import java.util.ArrayList;
 
-abstract class JottingActivity extends AppCompatActivity {
+public abstract class JottingActivity extends AppCompatActivity {
     private String jottingType;
     private String userApiKey;
     private Jotting jottingData;
@@ -270,5 +270,5 @@ protected void slideLabelsListUp(FragmentTransaction ft) {
      * Updates the UI of the appbar to display the passed in text
      * @param name The new name of the jotting
      */
-    abstract void setJottingName(String name);
+    protected abstract void setJottingName(String name);
 }

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

@@ -43,6 +43,7 @@
 import com.boruminc.borumjot.android.server.requests.DeleteJottingRequest;
 import com.boruminc.borumjot.android.server.requests.PinJottingRequest;
 import com.boruminc.borumjot.android.server.requests.UpdateTaskRequest;
+import com.boruminc.borumjot.android.subtasks.SubtaskActivity;
 import com.google.android.material.appbar.MaterialToolbar;
 
 import org.json.JSONException;
@@ -53,7 +54,6 @@
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Locale;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -256,7 +256,7 @@ public void onBackPressed() {
 
     /* Helper Methods */
 
-    private void setSubtask(EditText view, boolean isCompleted) {
+    private void setSubtask(TextView view, boolean isCompleted) {
         if (isCompleted)
             // Add a strikethrough to the already existing paint flags using "|" bitwise operator
             view.setPaintFlags(view.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
@@ -441,7 +441,7 @@ private void scheduleTaskDueDateNotification(long delay) {
      * @param name The new name of the jotting
      */
     protected void setJottingName(String name) {
-        taskTitle.setText(name);
+        taskTitle.setText(SlashNormalizer.unescapeUserSlashes(name));
     }
 
     /**
@@ -497,6 +497,7 @@ private void setSubtasksTableContent(ArrayList<Task> subtasks) {
         }
 
         TableRow addSubtaskLayout = new TableRow(this);
+
         addSubtaskLayout.setLayoutParams(new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         addSubtaskLayout.setGravity(Gravity.START);
         ImageButton addSubtaskBtn = generateCherryRasboraPlusButton();
@@ -542,6 +543,13 @@ private LinearLayout addSubtaskToTable(Task subtask) {
 
     /* Event Handlers */
 
+    public void onEnterSubtaskClick(View v) {
+        Intent subtask = new Intent(getApplicationContext(), SubtaskActivity.class);
+
+        subtask.putExtra("id", (int) ((ViewGroup) v.getParent()).getTag());
+        startActivity(subtask);
+    }
+
     public void onDeleteClick() {
         android.app.AlertDialog.Builder deleteDialog = new android.app.AlertDialog.Builder(this);
         deleteDialog
@@ -640,44 +648,8 @@ public void onComplete(JSONObject result) {
                                 Task subtask = new Task(newSubtaskField.getText().toString());
                                 subtask.setId(result.getJSONObject("data").getInt("id"));
 
-                                /*
-                                 * Add right after last incomplete task using binary search for the last incomplete subtask
-                                 * The algorithm is as follows:
-                                 * 1. Start at first element and check if complete
-                                 * 2. If complete, then
-                                 * 3. If the first element OR the previous element is incomplete, then
-                                 * ADD SUBTASK; END
-                                 * 4. Else, (previous element is complete), then
-                                 * (the last incomplete subtask is BEFORE i) divide i by 2 and REPEAT
-                                 * 7. Else, (current element is incomplete), then
-                                 * (the last incomplete subtask is AFTER i) set i to be between its current value
-                                 * and the index of the last element
-                                */
-                                ArrayList<Task> currSubtasks = getTaskData().getSubtasks();
-                                int i = getTaskData().getSubtasks().size() / 2;
-
-                                while (i < getTaskData().getSubtasks().size()) {
-
-                                    if (currSubtasks.get(i).isCompleted()) {
-                                        if (i == 0 || !currSubtasks.get(i - 1).isCompleted()) {
-                                            getTaskData().addSubtask(i, subtask);
-                                            subtaskList.addView(addSubtaskToTable(subtask), i);
-
-                                            break;
-                                        } else {
-                                            i /= 2;
-                                        }
-                                    } else {
-                                        if (i != currSubtasks.size() - 1 && currSubtasks.get(i + 1).isCompleted()) {
-                                            getTaskData().addSubtask(i, subtask);
-                                            subtaskList.addView(addSubtaskToTable(subtask), i + 1);
-
-                                            break;
-                                        } else {
-                                            i = (currSubtasks.size() + i) / 2;
-                                        }
-                                    }
-                                }
+                                int indexAfterLastIncompleteTask = searchForLastIncompleteTask(subtask);
+                                subtaskList.addView(addSubtaskToTable(subtask), indexAfterLastIncompleteTask);
 
                                 ((EditText) subtaskList.findViewById(R.id.newSubtaskFieldId)).setText("");
                             }
@@ -689,20 +661,48 @@ public void onComplete(JSONObject result) {
         );
     }
 
-    public void onDeleteSubtaskClick(View view) {
-        TableRow subtaskRow = (TableRow) view.getParent();
-
-        new TaskRunner().executeAsync(
-                new DeleteJottingRequest((Integer) subtaskRow.getTag(), getUserApiKey(), "task"), data -> {
-                    if (data != null) {
-                        if (data.optInt("statusCode") == 200) {
-                            TableLayout subtaskTable = (TableLayout) subtaskRow.getParent();
-                            getTaskData().getSubtasks().remove(subtaskTable.indexOfChild(subtaskRow));
-                            subtaskTable.removeView(subtaskRow);
-                        }
-                    }
+    /**
+     * Add right after last incomplete task using binary search for the last incomplete subtask
+     * @implNote The algorithm is as follows:
+     * <ol>
+     *     <li>Start at first element and check if complete</li>
+     *     <li>If complete, then</li>
+     *     <li>If the first element OR the previous element is incomplete, then</li>
+     *          ADD SUBTASK; END
+     *      <li>Else, (previous element is complete), then
+     *          (the last incomplete subtask is BEFORE i) divide i by 2 and REPEAT
+     *      <li>Else, (current element is incomplete), then</li>
+     *          (the last incomplete subtask is AFTER i) set i to be between its current value
+     *          and the index of the last element</li>
+     * </ol>
+     * @return one index after the last incomplete subtask, or 0 if there were no subtasks
+     */
+    private int searchForLastIncompleteTask(Task subtask) {
+        ArrayList<Task> currSubtasks = getTaskData().getSubtasks();
+        int subtaskSize = currSubtasks.size();
+        int i = subtaskSize / 2;
+
+        while (i < subtaskSize) {
+            if (currSubtasks.get(i).isCompleted()) {
+                if (i == 0 || !currSubtasks.get(i - 1).isCompleted()) {
+                    getTaskData().addSubtask(i, subtask);
+
+                    return i;
+                } else {
+                    i /= 2;
                 }
-        );
+            } else {
+                if (i != currSubtasks.size() - 1 && currSubtasks.get(i + 1).isCompleted()) {
+                    getTaskData().addSubtask(i + 1, subtask);
+                    return i + 1;
+                } else {
+                    i = (int) Math.round((currSubtasks.size() + i) / 2.0);
+                }
+            }
+        }
+
+        // There are no (incomplete or complete) subtasks
+        return currSubtasks.size();
     }
 
     public void onCompleteSubtaskClick(View view) {
@@ -734,7 +734,7 @@ public JSONObject call() {
                     public void onComplete(JSONObject result) {
                         super.onComplete(result);
                         if (ranOk()) {
-                            EditText subtaskTxt = (EditText) subtaskRow.getChildAt(1);
+                            TextView subtaskTxt = (TextView) subtaskRow.getChildAt(1);
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                                 if (completed == 1)
                                     setSubtask(subtaskTxt, true);

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

@@ -71,7 +71,7 @@ public static ArrayList<Note> convertJSONToNotes(JSONArray data) throws JSONExce
         return notes;
     }
 
-    private static Task convertJSONToTask(JSONObject row) throws JSONException {
+    public static Task convertJSONToTask(JSONObject row) throws JSONException {
         // Set task information
         Task task = new Task(row.getString("title"), row.optString("body"), new ArrayList<Label>());
         task.setId(row.getInt("id"));