allow go back with objectives

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt

@@ -126,7 +126,6 @@ class ObjectivesFragment : Fragment() {
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             val objective = ObjectivesPlugin.objectives[position]
             holder.title.text = MainApp.gs(R.string.nth_objective, position + 1)
-            holder.revert.visibility = View.GONE
             if (objective.objective != 0) {
                 holder.objective.visibility = View.VISIBLE
                 holder.objective.text = MainApp.gs(objective.objective)
@@ -142,6 +141,8 @@ class ObjectivesFragment : Fragment() {
                 holder.verify.visibility = View.GONE
                 holder.progress.visibility = View.GONE
                 holder.accomplished.visibility = View.GONE
+                holder.unFinish.visibility = View.GONE
+                holder.unStart.visibility = View.GONE
                 if (position == 0 || ObjectivesPlugin.objectives[position - 1].isAccomplished)
                     holder.start.visibility = View.VISIBLE
                 else
@@ -152,15 +153,16 @@ class ObjectivesFragment : Fragment() {
                 holder.progress.visibility = View.GONE
                 holder.start.visibility = View.GONE
                 holder.accomplished.visibility = View.VISIBLE
+                holder.unFinish.visibility = View.VISIBLE
+                holder.unStart.visibility = View.GONE
             } else if (objective.isStarted) {
                 holder.gate.setTextColor(-0x1)
                 holder.verify.visibility = View.VISIBLE
                 holder.verify.isEnabled = objective.isCompleted || objectives_fake.isChecked
                 holder.start.visibility = View.GONE
                 holder.accomplished.visibility = View.GONE
-                if (objective.isRevertable) {
+                holder.unFinish.visibility = View.GONE
-                    holder.revert.visibility = View.VISIBLE
+                holder.unStart.visibility = View.VISIBLE
-                }
                 holder.progress.visibility = View.VISIBLE
                 holder.progress.removeAllViews()
                 for (task in objective.tasks) {
@@ -264,13 +266,13 @@ class ObjectivesFragment : Fragment() {
                         }
                     }, NetworkChangeReceiver.isConnected())
             }
-            holder.revert.setOnClickListener {
+            holder.unStart.setOnClickListener {
-                objective.accomplishedOn = 0
                 objective.startedOn = 0
-                if (position > 0) {
+                scrollToCurrentObjective()
-                    val prevObj = ObjectivesPlugin.objectives[position - 1]
+                RxBus.send(EventObjectivesUpdateGui())
-                    prevObj.accomplishedOn = 0
             }
+            holder.unFinish.setOnClickListener {
+                objective.accomplishedOn = 0
                 scrollToCurrentObjective()
                 RxBus.send(EventObjectivesUpdateGui())
             }
@@ -309,7 +311,8 @@ class ObjectivesFragment : Fragment() {
             val progress: LinearLayout = itemView.findViewById(R.id.objective_progress)
             val verify: Button = itemView.findViewById(R.id.objective_verify)
             val start: Button = itemView.findViewById(R.id.objective_start)
-            val revert: Button = itemView.findViewById(R.id.objective_back)
+            val unFinish: Button = itemView.findViewById(R.id.objective_unfinish)
+            val unStart: Button = itemView.findViewById(R.id.objective_unstart)
             val inputHint: TextView = itemView.findViewById(R.id.objective_inputhint)
             val input: EditText = itemView.findViewById(R.id.objective_input)
             val enterButton: Button = itemView.findViewById(R.id.objective_enterbutton)

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java

@@ -61,10 +61,6 @@ public abstract class Objective {
         return true;
     }
 
-    public boolean isRevertable() {
-        return false;
-    }
-
     public boolean isAccomplished() {
         return accomplishedOn != 0 && accomplishedOn < DateUtil.now();
     }

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.java

@@ -25,9 +25,4 @@ public class Objective5 extends Objective {
             }
         });
     }
-
-    @Override
-    public boolean isRevertable() {
-        return true;
-    }
 }

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

@@ -68,11 +68,18 @@
             android:text="@string/objectives_button_start" />
 
         <Button
-            android:id="@+id/objective_back"
+            android:id="@+id/objective_unfinish"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/objectives_button_back" />
+            android:text="@string/objectives_button_unfinish" />
+
+        <Button
+            android:id="@+id/objective_unstart"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/objectives_button_unstart" />
 
         <TextView
             android:id="@+id/objective_inputhint"

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

@@ -1631,5 +1631,7 @@
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">On</string>
     <string name="common_off">Off</string>
+    <string name="objectives_button_unfinish">Clear finished</string>
+    <string name="objectives_button_unstart">Clear started</string>
 
 </resources>