Adds tablet mode, using a tablet presenter

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailContract.java

@@ -16,7 +16,6 @@
 
 package com.example.android.architecture.blueprints.todoapp.taskdetail;
 
-import com.example.android.architecture.blueprints.todoapp.BasePresenter;
 import com.example.android.architecture.blueprints.todoapp.BaseView;
 
 /**
@@ -51,7 +50,7 @@ interface View extends BaseView<Presenter> {
         boolean isActive();
     }
 
-    interface Presenter extends BasePresenter {
+    interface Presenter {
 
         void editTask();
 
@@ -60,5 +59,7 @@ interface Presenter extends BasePresenter {
         void completeTask();
 
         void activateTask();
+
+        void startTaskDetailPresenter();
     }
 }

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.java

@@ -68,7 +68,7 @@ public static TaskDetailFragment newInstance(String taskId) {
     @Override
     public void onResume() {
         super.onResume();
-        mPresenter.start();
+        mPresenter.startTaskDetailPresenter();
     }
 
     @Nullable

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenter.java

@@ -24,38 +24,30 @@
 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;
-import com.example.android.architecture.blueprints.todoapp.tasks.TasksNavigator;
-import com.example.android.architecture.blueprints.todoapp.tasks.TasksPresenter;
 
 /**
  * Listens to user actions from the UI ({@link TaskDetailFragment}), retrieves the data and updates
  * the UI as required.
  */
 public class TaskDetailPresenter implements TaskDetailContract.Presenter {
 
-    @NonNull private final TasksRepository mTasksRepository;
+    private final TasksRepository mTasksRepository;
 
     private final TaskDetailContract.View mTaskDetailView;
 
-    @NonNull private TasksPresenter mTasksPresenter;
-
-    @NonNull  private TasksNavigator mTasksNavigator;
-
     @Nullable
     private String mTaskId;
 
     public TaskDetailPresenter(@Nullable String taskId,
             @NonNull TasksRepository tasksRepository,
-            @NonNull TaskDetailContract.View taskDetailView,
-            @NonNull TasksNavigator tasksNavigator) {
+            @NonNull TaskDetailContract.View taskDetailView) {
         this.mTaskId = taskId;
         mTasksRepository = checkNotNull(tasksRepository, "tasksRepository cannot be null!");
         mTaskDetailView = checkNotNull(taskDetailView, "taskDetailView cannot be null!");
-        mTasksNavigator = checkNotNull(tasksNavigator);
     }
 
     @Override
-    public void start() {
+    public void startTaskDetailPresenter() {
         if (mTaskDetailView.isActive()) {
             openTask();
         }
@@ -107,12 +99,7 @@ public void editTask() {
     @Override
     public void deleteTask() {
         mTasksRepository.deleteTask(mTaskId);
-        if (isTablet()) {
-            mTasksPresenter.start();
-            mTasksNavigator.removeDetailPane();
-        } else {
-            mTaskDetailView.showTaskDeleted();
-        }
+        mTaskDetailView.showTaskDeleted();
     }
 
     @Override
@@ -123,11 +110,6 @@ public void completeTask() {
         }
         mTasksRepository.completeTask(mTaskId);
         showTaskMarkedComplete();
-
-        // In tablet mode, ping the other presenter in case it needs to update
-        if (mTasksPresenter != null) {
-            mTasksPresenter.start();
-        }
     }
 
     public void showTaskMarkedComplete() {
@@ -142,11 +124,6 @@ public void activateTask() {
         }
         mTasksRepository.activateTask(mTaskId);
         mTaskDetailView.showTaskMarkedActive();
-
-        // In tablet mode, ping the other presenter in case it needs to update
-        if (mTasksPresenter != null) {
-            mTasksPresenter.start();
-        }
     }
 
     private void showTask(Task task) {
@@ -171,12 +148,4 @@ private void showTask(Task task) {
     public String getTaskId() {
         return mTaskId;
     }
-
-    public void setTasksPresenter(TasksPresenter tasksPresenter) {
-        mTasksPresenter = tasksPresenter;
-    }
-
-    private boolean isTablet() {
-        return mTasksPresenter != null;
-    }
 }

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksContract.java

@@ -20,7 +20,6 @@
 
 import com.example.android.architecture.blueprints.todoapp.BaseView;
 import com.example.android.architecture.blueprints.todoapp.data.Task;
-import com.example.android.architecture.blueprints.todoapp.BasePresenter;
 
 import java.util.List;
 
@@ -66,7 +65,7 @@ interface View extends BaseView<Presenter> {
         void showFilteringPopUpMenu();
     }
 
-    interface Presenter extends BasePresenter {
+    interface Presenter {
 
         void result(int requestCode, int resultCode);
 
@@ -85,5 +84,7 @@ interface Presenter extends BasePresenter {
         void setFiltering(TasksFilterType requestType);
 
         TasksFilterType getFiltering();
+
+        void startTasksPresenter();
     }
 }

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.java

@@ -87,7 +87,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
-        mPresenter.start();
+        mPresenter.startTasksPresenter();
     }
 
     @Override

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksMvpController.java

@@ -35,6 +35,8 @@ public class TasksMvpController {
 
     private final FragmentActivity mFragmentActivity;
 
+    private TasksTabletPresenter mTasksTabletPresenter;
+
     private TasksPresenter mTasksPresenter;
 
     private TaskDetailPresenter mTaskDetailPresenter;
@@ -103,33 +105,44 @@ public TaskDetailFragment createDetailViewForTablet(String taskId) {
         TaskDetailFragment taskDetailFragment = TaskDetailFragment.newInstance(taskId);
 
         // Create the Presenter
-        mTaskDetailPresenter = createTaskDetailPresenter(taskId,
+        TaskDetailPresenter taskDetailPresenter = createTaskDetailPresenter(taskId,
                 taskDetailFragment);
 
         // Wire presenters
-        taskDetailFragment.setPresenter(mTaskDetailPresenter);
-        mTasksPresenter.setTaskDetailPresenter(mTaskDetailPresenter);
-        mTaskDetailPresenter.setTasksPresenter(mTasksPresenter);
-
+        mTasksTabletPresenter.setTaskDetailPresenter(taskDetailPresenter);
+        taskDetailFragment.setPresenter(mTasksTabletPresenter);
         return taskDetailFragment;
     }
 
     private void createTabletElements() {
         TasksFragment tasksFragment;// Tablet presenter rule all presenters
 
+        mTasksTabletPresenter = new TasksTabletPresenter(
+                Injection.provideTasksRepository(mFragmentActivity),
+                new TasksNavigator(mFragmentActivity, this));
+
         tasksFragment = findOrCreateTasksFragment();
         mTasksPresenter = createListPresenter(tasksFragment);
+        mTasksTabletPresenter.setTasksPresenter(mTasksPresenter);
 
-        tasksFragment.setPresenter(mTasksPresenter);
+        tasksFragment.setPresenter(mTasksTabletPresenter);
 
         // TaskDetailFragment is retained, so let's reuse its presenter.
         TaskDetailFragment taskDetailFragment = getDetailFragment();
         if (taskDetailFragment != null && taskDetailFragment.isAdded()) {
-                mTaskDetailPresenter =
-                        (TaskDetailPresenter) taskDetailFragment.getPresenter();
 
-                mTasksPresenter.setTaskDetailPresenter(mTaskDetailPresenter);
-                mTaskDetailPresenter.setTasksPresenter(mTasksPresenter);
+            if (taskDetailFragment.getPresenter() instanceof TasksTabletPresenter) {
+                TasksTabletPresenter retainedPresenter =
+                        (TasksTabletPresenter) taskDetailFragment.getPresenter();
+
+                TaskDetailPresenter retainedTaskDetailPresenter =
+                        retainedPresenter.getTaskDetailPresenter();
+
+                mTasksTabletPresenter.setTaskDetailPresenter(retainedTaskDetailPresenter);
+
+                // Replace retained presenter with new one.
+                taskDetailFragment.setPresenter(mTasksTabletPresenter);
+            }
         }
     }
 
@@ -139,15 +152,13 @@ private TaskDetailPresenter createTaskDetailPresenter(
         return new TaskDetailPresenter(
                 taskId,
                 Injection.provideTasksRepository(mFragmentActivity.getApplicationContext()),
-                taskDetailFragment,
-                new TasksNavigator(mFragmentActivity, this));
+                taskDetailFragment);
     }
 
     private TasksPresenter createListPresenter(TasksFragment tasksFragment) {
         mTasksPresenter = new TasksPresenter(
                 Injection.provideTasksRepository(mFragmentActivity.getApplicationContext()),
-                tasksFragment,
-                new TasksNavigator(mFragmentActivity, this));
+                tasksFragment);
 
         return mTasksPresenter;
     }

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksNavigator.java

@@ -77,7 +77,7 @@ public boolean isTablet() {
         return mFragmentActivity.getResources().getBoolean(R.bool.isTablet);
     }
 
-    public void removeDetailPane() {
+    private void removeDetailPane() {
         Fragment detailFragment = getDetailFragment();
         FragmentTransaction transaction = mFragmentActivity.getSupportFragmentManager().beginTransaction();
         transaction.remove(detailFragment);

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java

@@ -20,13 +20,11 @@
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import com.example.android.architecture.blueprints.todoapp.addedittask.AddEditTaskActivity;
 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;
-import com.example.android.architecture.blueprints.todoapp.taskdetail.TaskDetailPresenter;
 import com.example.android.architecture.blueprints.todoapp.util.EspressoIdlingResource;
 
 import java.util.ArrayList;
@@ -36,39 +34,28 @@
  * Listens to user actions from the UI ({@link TasksFragment}), retrieves the data and updates the
  * UI as required.
  */
-public class TasksPresenter implements TasksContract.Presenter {
+class TasksPresenter implements TasksContract.Presenter {
 
     private final TasksRepository mTasksRepository;
 
     private final TasksContract.View mTasksView;
-    @NonNull
-    private final TasksNavigator mTasksNavigator;
 
     private TasksFilterType mCurrentFiltering = TasksFilterType.ALL_TASKS;
 
     private boolean mFirstLoad = true;
 
-    @Nullable
-    private TaskDetailPresenter mTaskDetailPresenter;
-
     TasksPresenter(
             @NonNull TasksRepository tasksRepository,
-            @NonNull TasksContract.View tasksView,
-            @NonNull TasksNavigator tasksNavigator) {
+            @NonNull TasksContract.View tasksView) {
         mTasksRepository = checkNotNull(tasksRepository, "tasksRepository cannot be null");
         mTasksView = checkNotNull(tasksView, "tasksView cannot be null!");
-        mTasksNavigator = checkNotNull(tasksNavigator);
     }
 
     @Override
-    public void start() {
+    public void startTasksPresenter() {
         loadTasks(false);
     }
 
-    public void setTaskDetailPresenter(@Nullable TaskDetailPresenter presenter) {
-        mTaskDetailPresenter = presenter;
-    }
-
     @Override
     public void result(int requestCode, int resultCode) {
         // If a task was successfully added, show snackbar
@@ -203,7 +190,7 @@ public void addNewTask() {
     @Override
     public void openTaskDetails(@NonNull Task requestedTask) {
         checkNotNull(requestedTask, "requestedTask cannot be null!");
-        mTasksNavigator.startTaskDetail(requestedTask.getId());
+        mTasksView.showTaskDetailsUi(requestedTask.getId());
     }
 
     @Override
@@ -212,12 +199,6 @@ public void completeTask(@NonNull Task completedTask) {
         mTasksRepository.completeTask(completedTask);
         mTasksView.showTaskMarkedComplete();
         loadTasks(false, false);
-
-        // In tablet mode, ping the other presenter in case it needs to update
-        if (mTaskDetailPresenter != null
-                && mTaskDetailPresenter.getTaskId().equals(completedTask.getId())) {
-            mTaskDetailPresenter.start();
-        }
     }
 
     @Override
@@ -226,42 +207,13 @@ public void activateTask(@NonNull Task activeTask) {
         mTasksRepository.activateTask(activeTask);
         mTasksView.showTaskMarkedActive();
         loadTasks(false, false);
-        // In tablet mode, ping the other presenter in case it needs to update
-        if (mTaskDetailPresenter != null
-                && mTaskDetailPresenter.getTaskId().equals(activeTask.getId())) {
-            mTaskDetailPresenter.start();
-        }
     }
 
     @Override
     public void clearCompletedTasks() {
         mTasksRepository.clearCompletedTasks();
         mTasksView.showCompletedTasksCleared();
         loadTasks(false, false);
-
-        // In tablet mode, ping the other presenter in case it needs to update
-        if (mTaskDetailPresenter != null) {
-
-            // If task on detail has just been cleared, remove fragment.
-            String taskId = mTaskDetailPresenter.getTaskId();
-            if (taskId != null) {
-                mTasksRepository.getTask(taskId,
-                        new TasksDataSource.GetTaskCallback() {
-                            @Override
-                            public void onTaskLoaded(Task task) {
-                                // No-op
-                                if (task == null) {
-                                    mTasksNavigator.onTaskDeleted();
-                                }
-                            }
-
-                            @Override
-                            public void onDataNotAvailable() {
-                                mTasksNavigator.onTaskDeleted();
-                            }
-                        });
-            }
-        }
     }
 
     /**