Refactor TaskDetailActivity / Fragment to use Controller

Author: grepx

todoapp/app/src/main/AndroidManifest.xml

@@ -33,7 +33,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.example.android.architecture.blueprints.todoapp.taskdetail.TaskDetailActivity" />
     </application>
 
 </manifest>

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskController.java

@@ -85,6 +85,8 @@ public void onClick(View v) {
 
         setHasOptionsMenu(true);
 
+        setActive(true);
+
         // Create the presenter
         mPresenter = new AddEditTaskPresenter(
                 mTaskId,

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

@@ -16,16 +16,13 @@
 
 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;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -36,13 +33,16 @@
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
+import com.example.android.architecture.blueprints.todoapp.BaseController;
+import com.example.android.architecture.blueprints.todoapp.Injection;
 import com.example.android.architecture.blueprints.todoapp.R;
+import com.example.android.architecture.blueprints.todoapp.util.BundleBuilder;
 import com.google.common.base.Preconditions;
 
 /**
  * Main UI for the task detail screen.
  */
-public class TaskDetailFragment extends Fragment implements TaskDetailContract.View {
+public class TaskDetailFragment extends BaseController implements TaskDetailContract.View {
 
     @NonNull
     private static final String ARGUMENT_TASK_ID = "TASK_ID";
@@ -52,30 +52,28 @@ public class TaskDetailFragment extends Fragment implements TaskDetailContract.V
 
     private TaskDetailContract.Presenter mPresenter;
 
+    private final String mTaskId;
+
     private TextView mDetailTitle;
 
     private TextView mDetailDescription;
 
     private CheckBox mDetailCompleteStatus;
 
-    public static TaskDetailFragment newInstance(@Nullable String taskId) {
-        Bundle arguments = new Bundle();
-        arguments.putString(ARGUMENT_TASK_ID, taskId);
-        TaskDetailFragment fragment = new TaskDetailFragment();
-        fragment.setArguments(arguments);
-        return fragment;
+    public TaskDetailFragment(String taskId) {
+        this(new BundleBuilder(new Bundle())
+                .putString(ARGUMENT_TASK_ID, taskId)
+                .build());
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        mPresenter.start();
+    public TaskDetailFragment(Bundle args) {
+        super(args);
+        mTaskId = args.getString(ARGUMENT_TASK_ID);
     }
 
-    @Nullable
+    @NonNull
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
         View root = inflater.inflate(R.layout.taskdetail_frag, container, false);
         setHasOptionsMenu(true);
         mDetailTitle = (TextView) root.findViewById(R.id.task_detail_title);
@@ -84,7 +82,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         // Set up floating action button
         FloatingActionButton fab =
-                (FloatingActionButton) getActivity().findViewById(R.id.fab_edit_task);
+                (FloatingActionButton) root.findViewById(R.id.fab_edit_task);
 
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -93,12 +91,33 @@ public void onClick(View v) {
             }
         });
 
+        setActive(true);
+
+        mPresenter = new TaskDetailPresenter(
+                mTaskId,
+                Injection.provideTasksRepository(getApplicationContext()),
+                this);
+
         return root;
     }
 
+    @Override
+    protected void onAttach(@NonNull View view) {
+        super.onAttach(view);
+
+        // Configure Activity level UI.
+        ActionBar actionBar = getActionBar();
+        actionBar.setTitle(R.string.app_name);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowHomeEnabled(true);
+
+        // Start Presenter
+        mPresenter.start();
+    }
+
     @Override
     public void setPresenter(@NonNull TaskDetailContract.Presenter presenter) {
-        mPresenter = checkNotNull(presenter);
+        // todo: remove method
     }
 
     @Override
@@ -120,7 +139,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     public void setLoadingIndicator(boolean active) {
         if (active) {
             mDetailTitle.setText("");
-            mDetailDescription.setText(getString(R.string.loading));
+            mDetailDescription.setText(getResources().getString(R.string.loading));
         }
     }
 
@@ -165,17 +184,17 @@ public void showEditTask(@NonNull String taskId) {
 
     @Override
     public void showTaskDeleted() {
-        getActivity().finish();
+        getRouter().popCurrentController();
     }
 
     public void showTaskMarkedComplete() {
-        Snackbar.make(getView(), getString(R.string.task_marked_complete), Snackbar.LENGTH_LONG)
+        Snackbar.make(getView(), getResources().getString(R.string.task_marked_complete), Snackbar.LENGTH_LONG)
                 .show();
     }
 
     @Override
     public void showTaskMarkedActive() {
-        Snackbar.make(getView(), getString(R.string.task_marked_active), Snackbar.LENGTH_LONG)
+        Snackbar.make(getView(), getResources().getString(R.string.task_marked_active), Snackbar.LENGTH_LONG)
                 .show();
     }
 
@@ -198,12 +217,6 @@ public void showTitle(@NonNull String title) {
     @Override
     public void showMissingTask() {
         mDetailTitle.setText("");
-        mDetailDescription.setText(getString(R.string.no_data));
+        mDetailDescription.setText(getResources().getString(R.string.no_data));
     }
-
-    @Override
-    public boolean isActive() {
-        return isAdded();
-    }
-
-}
+}

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

@@ -49,7 +49,7 @@
 import com.example.android.architecture.blueprints.todoapp.R;
 import com.example.android.architecture.blueprints.todoapp.addedittask.AddEditTaskController;
 import com.example.android.architecture.blueprints.todoapp.data.Task;
-import com.example.android.architecture.blueprints.todoapp.taskdetail.TaskDetailActivity;
+import com.example.android.architecture.blueprints.todoapp.taskdetail.TaskDetailFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -357,11 +357,9 @@ public void showAddTask() {
 
     @Override
     public void showTaskDetailsUi(String taskId) {
-        // in it's own Activity, since it makes more sense that way and it gives us the flexibility
-        // to show some Intent stubbing.
-        Intent intent = new Intent(getActivity(), TaskDetailActivity.class);
-        intent.putExtra(TaskDetailActivity.EXTRA_TASK_ID, taskId);
-        startActivity(intent);
+        getRouter().pushController(RouterTransaction.with(new TaskDetailFragment(taskId))
+                .pushChangeHandler(new HorizontalChangeHandler())
+                .popChangeHandler(new HorizontalChangeHandler()));
     }
 
     @Override