Sync stats for real this time + method injection to bind presenter and view

JoseAlcerreca · JoseAlcerreca · commit 7b889f12b4e2 · 2016-04-22T14:41:02.000+01:00
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskFragment.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskFragment.java
@@ -16,8 +16,6 @@
 
 package com.example.android.architecture.blueprints.todoapp.addedittask;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -32,6 +30,8 @@
 
 import com.example.android.architecture.blueprints.todoapp.R;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Main UI for the add task screen. Users can enter a task title and description.
  */
@@ -95,7 +95,7 @@ public void onClick(View v) {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.addtask_frag, container, false);
         mTitle = (TextView) root.findViewById(R.id.add_task_title);
         mDescription = (TextView) root.findViewById(R.id.add_task_description);
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsActivity.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsActivity.java
@@ -16,10 +16,6 @@
 
 package com.example.android.architecture.blueprints.todoapp.statistics;
 
-import com.example.android.architecture.blueprints.todoapp.R;
-import com.example.android.architecture.blueprints.todoapp.tasks.TasksActivity;
-import com.example.android.architecture.blueprints.todoapp.util.ActivityUtils;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.NavigationView;
@@ -30,6 +26,11 @@
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
+import com.example.android.architecture.blueprints.todoapp.R;
+import com.example.android.architecture.blueprints.todoapp.ToDoApplication;
+import com.example.android.architecture.blueprints.todoapp.tasks.TasksActivity;
+import com.example.android.architecture.blueprints.todoapp.util.ActivityUtils;
+
 /**
  * Show statistics for tasks.
  */
@@ -59,8 +60,19 @@ protected void onCreate(Bundle savedInstanceState) {
             setupDrawerContent(navigationView);
         }
 
-        ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
-                StatisticsFragment.newInstance(), R.id.contentFrame);
+        StatisticsFragment statisticsFragment = (StatisticsFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.contentFrame);
+        if (statisticsFragment == null) {
+            statisticsFragment = StatisticsFragment.newInstance();
+            ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
+                    statisticsFragment, R.id.contentFrame);
+        }
+
+        DaggerStatisticsFragmentComponent.builder()
+            .statisticsPresenterModule(new StatisticsPresenterModule(statisticsFragment))
+            .tasksRepositoryComponent(((ToDoApplication) getApplication())
+                    .getTasksRepositoryComponent())
+            .build().getStatisticsPresenter();
     }
 
     @Override
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsFragment.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsFragment.java
@@ -28,7 +28,6 @@
 import android.widget.TextView;
 
 import com.example.android.architecture.blueprints.todoapp.R;
-import com.example.android.architecture.blueprints.todoapp.ToDoApplication;
 
 /**
  * Main UI for the statistics screen.
@@ -43,16 +42,6 @@ public static StatisticsFragment newInstance() {
         return new StatisticsFragment();
     }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mPresenter  = DaggerStatisticsFragmentComponent.builder()
-                .statisticsPresenterModule(new StatisticsPresenterModule(this))
-                .tasksRepositoryComponent(((ToDoApplication) getActivity().getApplication())
-                        .getTasksRepositoryComponent())
-                .build().getStatisticsPresenter();
-    }
-
     @Override
     public void setPresenter(@NonNull StatisticsContract.Presenter presenter) {
         mPresenter = checkNotNull(presenter);
@@ -61,7 +50,7 @@ public void setPresenter(@NonNull StatisticsContract.Presenter presenter) {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.statistics_frag, container, false);
         mStatisticsTV = (TextView) root.findViewById(R.id.statistics);
         return root;
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsPresenter.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsPresenter.java
@@ -55,12 +55,21 @@ final class StatisticsPresenter implements StatisticsContract.Presenter {
         mStatisticsView = statisticsView;
     }
 
+    /**
+     * Method injection is used here to safely reference {@code this} after the object is created.
+     * For more information, see Java Concurrency in Practice.
+     */
+    @Inject
+    void setupListeners() {
+        mStatisticsView.setPresenter(this);
+    }
+
     @Override
     public void start() {
         loadStatistics();
     }
 
-    public void loadStatistics() {
+    private void loadStatistics() {
         mStatisticsView.setProgressIndicator(true);
 
         // The network request might be handled in a different thread so make sure Espresso knows
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
@@ -74,7 +74,7 @@ public void onResume() {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.taskdetail_frag, container, false);
         setHasOptionsMenu(true);
         mDetailTitle = (TextView) root.findViewById(R.id.task_detail_title);
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenter.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenter.java
@@ -58,16 +58,17 @@ final class TaskDetailPresenter implements TaskDetailContract.Presenter {
         mTasksRepository = tasksRepository;
         mTaskDetailView = taskDetailView;
         mTaskId = taskId;
+    }
 
+    /**
+     * Method injection is used here to safely reference {@code this} after the object is created.
+     * For more information, see Java Concurrency in Practice.
+     */
+    @Inject
+    void setupListeners() {
         mTaskDetailView.setPresenter(this);
     }
 
-//
-//    TaskDetailPresenter(TaskDetailComponent component) {
-//        component.inject(this);
-//        mTaskDetailView.setPresenter(this);
-//    }
-
     @Override
     public void start() {
         openTask();
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java
@@ -75,7 +75,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mTasksPresenter = DaggerTasksComponent.builder()
                 .tasksRepositoryComponent(((ToDoApplication) getApplication())
                         .getTasksRepositoryComponent())
-                .tasksPresenterModule(new TasksPresenterModule(tasksFragment)).build().getTasksPresenter();
+                .tasksPresenterModule(new TasksPresenterModule(tasksFragment)).build()
+                .getTasksPresenter();
 
         // Load previously saved state, if available.
         if (savedInstanceState != null) {
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.java
@@ -16,8 +16,6 @@
 
 package com.example.android.architecture.blueprints.todoapp.tasks;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -49,6 +47,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Display a grid of {@link Task}s. User can choose to view all, active or completed tasks.
  */
@@ -443,4 +443,4 @@ public interface TaskItemListener {
         void onActivateTaskClick(Task activatedTask);
     }
 
-}
+}
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java
@@ -64,7 +64,14 @@ final class TasksPresenter implements TasksContract.Presenter {
     TasksPresenter(TasksRepository tasksRepository, TasksContract.View tasksView) {
         mTasksRepository = tasksRepository;
         mTasksView = tasksView;
+    }
 
+    /**
+     * Method injection is used here to safely reference {@code this} after the object is created.
+     * For more information, see Java Concurrency in Practice.
+     */
+    @Inject
+    void setupListeners() {
         mTasksView.setPresenter(this);
     }
 
diff --git a/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenterTest.java b/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenterTest.java
@@ -16,11 +16,6 @@
 
 package com.example.android.architecture.blueprints.todoapp.taskdetail;
 
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import com.example.android.architecture.blueprints.todoapp.data.Task;
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksDataSource;
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository;
@@ -32,6 +27,11 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 /**
  * Unit tests for the implementation of {@link TaskDetailPresenter}
  */
