Refactor AddEditTaskActivity / Fragment to use Controller

Author: grepx

todoapp/app/src/main/AndroidManifest.xml

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

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

@@ -4,6 +4,7 @@
 import android.support.annotation.NonNull;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
+import android.view.MenuItem;
 import android.view.View;
 
 import com.bluelinelabs.conductor.Controller;
@@ -34,11 +35,23 @@ protected void onAttach(@NonNull View view) {
         ActionBar actionBar = getActionBar();
         actionBar.setTitle("");
         actionBar.setDisplayHomeAsUpEnabled(false);
+        actionBar.setHomeAsUpIndicator(0);
 
         DrawerLayout drawerLayout = getDrawerLayout();
         drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // Set the default behavior to be back navigation
+                getRouter().popCurrentController();
+                break;
+        }
+        return true;
+    }
+
     @Override
     protected void onDestroyView(View view) {
         super.onDestroyView(view);

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

@@ -20,7 +20,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.NavigationView;
 import android.support.test.espresso.IdlingResource;
-import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -71,17 +70,6 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                // Open the navigation drawer when the home icon is selected from the toolbar.
-                mDrawerLayout.openDrawer(GravityCompat.START);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     @Override
     public void onBackPressed() {
         if (!router.handleBack()) {

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

@@ -16,91 +16,110 @@
 
 package com.example.android.architecture.blueprints.todoapp.addedittask;
 
-import android.app.Activity;
 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.View;
 import android.view.ViewGroup;
 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 static com.google.common.base.Preconditions.checkNotNull;
+import com.example.android.architecture.blueprints.todoapp.util.BundleBuilder;
 
 /**
  * Main UI for the add task screen. Users can enter a task title and description.
  */
-public class AddEditTaskFragment extends Fragment implements AddEditTaskContract.View {
+public class AddEditTaskFragment extends BaseController implements AddEditTaskContract.View {
 
-    public static final String ARGUMENT_EDIT_TASK_ID = "EDIT_TASK_ID";
+    private static final String ARGUMENT_EDIT_TASK_ID = "EDIT_TASK_ID";
 
     private AddEditTaskContract.Presenter mPresenter;
 
+    private final String mTaskId;
+
     private TextView mTitle;
 
     private TextView mDescription;
 
-    public static AddEditTaskFragment newInstance() {
-        return new AddEditTaskFragment();
+    public AddEditTaskFragment() {
+        this(new Bundle());
     }
 
-    public AddEditTaskFragment() {
-        // Required empty public constructor
+    public AddEditTaskFragment(String taskId) {
+        this(new BundleBuilder(new Bundle())
+                .putString(ARGUMENT_EDIT_TASK_ID, taskId)
+                .build());
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        mPresenter.start();
+    public AddEditTaskFragment(Bundle args) {
+        super(args);
+        mTaskId = args.getString(ARGUMENT_EDIT_TASK_ID);
     }
 
     @Override
     public void setPresenter(@NonNull AddEditTaskContract.Presenter presenter) {
-        mPresenter = checkNotNull(presenter);
+        // todo: remove
     }
 
+    @NonNull
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
+        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);
 
         FloatingActionButton fab =
-                (FloatingActionButton) getActivity().findViewById(R.id.fab_edit_task_done);
+                (FloatingActionButton) root.findViewById(R.id.fab_edit_task_done);
         fab.setImageResource(R.drawable.ic_done);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 mPresenter.saveTask(mTitle.getText().toString(), mDescription.getText().toString());
             }
         });
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             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);
 
         setHasOptionsMenu(true);
-        setRetainInstance(true);
+
+        // Create the presenter
+        mPresenter = new AddEditTaskPresenter(
+                mTaskId,
+                Injection.provideTasksRepository(getApplicationContext()),
+                this);
+
         return root;
     }
 
+    @Override
+    protected void onAttach(@NonNull View view) {
+        super.onAttach(view);
+
+        // Configure Activity level UI.
+        ActionBar actionBar = getActionBar();
+        if (mTaskId == null) {
+            actionBar.setTitle(R.string.add_task);
+        } else {
+            actionBar.setTitle(R.string.edit_task);
+        }
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowHomeEnabled(true);
+
+        // Start Presenter
+        mPresenter.start();
+    }
+
     @Override
     public void showEmptyTaskError() {
-        Snackbar.make(mTitle, getString(R.string.empty_task_message), Snackbar.LENGTH_LONG).show();
+        Snackbar.make(mTitle, getResources().getString(R.string.empty_task_message), Snackbar.LENGTH_LONG).show();
     }
 
     @Override
     public void showTasksList() {
-        getActivity().setResult(Activity.RESULT_OK);
-        getActivity().finish();
+        getRouter().popCurrentController();
     }
 
     @Override
@@ -112,9 +131,4 @@ public void setTitle(String title) {
     public void setDescription(String description) {
         mDescription.setText(description);
     }
-
-    @Override
-    public boolean isActive() {
-        return isAdded();
-    }
-}
+}

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

@@ -17,9 +17,11 @@
 package com.example.android.architecture.blueprints.todoapp.statistics;
 
 import android.support.annotation.NonNull;
+import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -49,6 +51,8 @@ protected View onCreateView(@NonNull final LayoutInflater inflater,
         View root = inflater.inflate(R.layout.statistics_frag, container, false);
         mStatisticsTV = (TextView) root.findViewById(R.id.statistics);
 
+        setHasOptionsMenu(true);
+
         setActive(true);
 
         mPresenter = new StatisticsPresenter(
@@ -73,6 +77,17 @@ protected void onAttach(@NonNull View view) {
         mPresenter.start();
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // Open the navigation drawer when the home icon is selected from the toolbar.
+                getDrawerLayout().openDrawer(GravityCompat.START);
+                break;
+        }
+        return true;
+    }
+
     @Override
     public void setProgressIndicator(boolean active) {
         if (active) {

todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsController.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;
@@ -35,12 +37,8 @@
 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 com.google.common.base.Preconditions;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Main UI for the task detail screen.
  */
@@ -162,9 +160,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
     @Override
     public void showEditTask(@NonNull String taskId) {
-        Intent intent = new Intent(getContext(), AddEditTaskActivity.class);
-        intent.putExtra(AddEditTaskFragment.ARGUMENT_EDIT_TASK_ID, taskId);
-        startActivityForResult(intent, REQUEST_EDIT_TASK);
+        // todo: implement task editing
     }
 
     @Override