Merge pull request #1420 from tanja3981/improvement/#1269

[2.0] Improvement: Allow some objectives to go back.

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

@@ -120,6 +120,7 @@ public class ObjectivesFragment extends SubscriberFragment {
         public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
             Objective objective = ObjectivesPlugin.getPlugin().getObjectives().get(position);
             holder.title.setText(MainApp.gs(R.string.nth_objective, position + 1));
+            holder.revert.setVisibility(View.INVISIBLE);
             if (objective.getObjective() != 0) {
                 holder.objective.setVisibility(View.VISIBLE);
                 holder.objective.setText(MainApp.gs(objective.getObjective()));
@@ -145,6 +146,9 @@ public class ObjectivesFragment extends SubscriberFragment {
                 holder.verify.setVisibility(View.VISIBLE);
                 holder.verify.setEnabled(objective.isCompleted() || enableFake.isChecked());
                 holder.start.setVisibility(View.GONE);
+                if(objective.isRevertable()) {
+                    holder.revert.setVisibility(View.VISIBLE);
+                }
                 holder.progress.setVisibility(View.VISIBLE);
                 holder.progress.removeAllViews();
                 for (Objective.Task task : objective.getTasks()) {
@@ -169,7 +173,19 @@ public class ObjectivesFragment extends SubscriberFragment {
                 scrollToCurrentObjective();
                 startUpdateTimer();
             });
+            holder.revert.setOnClickListener((view) -> {
+                objective.setAccomplishedOn(null);
+                objective.setStartedOn(null);
+                if (position > 0) {
+                    Objective prevObj = ObjectivesPlugin.getPlugin().getObjectives().get(position - 1);
+                    prevObj.setAccomplishedOn(null);
                 }
+                notifyDataSetChanged();
+                scrollToCurrentObjective();
+            });
+        }
+
+
 
         @Override
         public int getItemCount() {
@@ -185,6 +201,7 @@ public class ObjectivesFragment extends SubscriberFragment {
             public LinearLayout progress;
             public Button verify;
             public Button start;
+            public Button revert;
 
             public ViewHolder(View itemView) {
                 super(itemView);
@@ -195,6 +212,7 @@ public class ObjectivesFragment extends SubscriberFragment {
                 progress = itemView.findViewById(R.id.objective_progress);
                 verify = itemView.findViewById(R.id.objective_verify);
                 start = itemView.findViewById(R.id.objective_start);
+                revert = itemView.findViewById(R.id.objective_back);
             }
         }
     }

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

@@ -42,6 +42,10 @@ public abstract class Objective {
         return true;
     }
 
+    public boolean isRevertable() {
+        return false;
+    }
+
     public boolean isAccomplished() {
         return accomplishedOn != null;
     }

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

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

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

@@ -65,6 +65,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/objectives_button_start" />
+
+        <Button
+            android:id="@+id/objective_back"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/objectives_button_back" />
     </LinearLayout>
 
 </android.support.v7.widget.CardView>

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

@@ -55,6 +55,7 @@
     <string name="description_xdrip_status_line">Show information about your loop on your xDrip+ watchface.</string>
     <string name="description_sms_communicator">Remote control AndroidAPS using SMS commands.</string>
 
+    <string name="objectives_button_back">Back</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Verify</string>
     <string name="nsprofileview_units_label">Units</string>