Merge branch 'todo-mvp' into todo-mvp-loaders

JoseAlcerreca · JoseAlcerreca · commit f58e7baeffe6 · 2016-04-14T12:07:17.000+01:00
diff --git a/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.java b/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.java
@@ -345,6 +345,55 @@ public void markTaskAsActiveOnDetailScreen_taskIsActiveInList() {
                 hasSibling(withText(TITLE1)))).check(matches(not(isChecked())));
     }
 
+    @Test
+    public void markTaskAsAcompleteAndActiveOnDetailScreen_taskIsActiveInList() {
+        viewAllTasks();
+
+        // Add 1 active task
+        createTask(TITLE1, DESCRIPTION);
+
+        // Click on the task on the list
+        onView(withText(TITLE1)).perform(click());
+
+        // Click on the checkbox in task details screen
+        onView(withId(R.id.task_detail_complete)).perform(click());
+
+        // Click again to restore it to original state
+        onView(withId(R.id.task_detail_complete)).perform(click());
+
+        // Click on the navigation up button to go back to the list
+        onView(withContentDescription("Navigate up")).perform(click());
+
+        // Check that the task is marked as active
+        onView(allOf(withId(R.id.complete),
+                hasSibling(withText(TITLE1)))).check(matches(not(isChecked())));
+    }
+
+    @Test
+    public void markTaskAsActiveAndCompleteOnDetailScreen_taskIsCompleteInList() {
+        viewAllTasks();
+
+        // Add 1 completed task
+        createTask(TITLE1, DESCRIPTION);
+        clickCheckBoxForTask(TITLE1);
+
+        // Click on the task on the list
+        onView(withText(TITLE1)).perform(click());
+
+        // Click on the checkbox in task details screen
+        onView(withId(R.id.task_detail_complete)).perform(click());
+
+        // Click again to restore it to original state
+        onView(withId(R.id.task_detail_complete)).perform(click());
+
+        // Click on the navigation up button to go back to the list
+        onView(withContentDescription("Navigate up")).perform(click());
+
+        // Check that the task is marked as active
+        onView(allOf(withId(R.id.complete),
+                hasSibling(withText(TITLE1)))).check(matches(isChecked()));
+    }
+
     @Test
     public void orientationChange_FilterActivePersists() {
 
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.java
@@ -16,6 +16,8 @@
 
 package com.example.android.architecture.blueprints.todoapp.taskdetail;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -31,14 +33,13 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.TextView;
 
 import com.example.android.architecture.blueprints.todoapp.R;
 import com.example.android.architecture.blueprints.todoapp.addedittask.AddEditTaskActivity;
 import com.example.android.architecture.blueprints.todoapp.addedittask.AddEditTaskFragment;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Main UI for the task detail screen.
  */
@@ -142,16 +143,17 @@ public void showDescription(String description) {
     @Override
     public void showCompletionStatus(final boolean complete) {
         mDetailCompleteStatus.setChecked(complete);
-        mDetailCompleteStatus.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (complete) {
-                    mPresenter.activateTask();
-                } else {
-                    mPresenter.completeTask();
-                }
-            }
-        });
+        mDetailCompleteStatus.setOnCheckedChangeListener(
+                new CompoundButton.OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        if (isChecked) {
+                            mPresenter.completeTask();
+                        } else {
+                            mPresenter.activateTask();
+                        }
+                    }
+                });
     }
 
     @Override
