Refactor Tasks Activity/Fragment to Controller.

Author: grepx

todoapp/app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-                android:name="com.example.android.architecture.blueprints.todoapp.tasks.TasksActivity"
+                android:name="com.example.android.architecture.blueprints.todoapp.MainActivity"
                 android:theme="@style/AppTheme.OverlapSystemBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -35,7 +35,6 @@
         </activity>
         <activity android:name="com.example.android.architecture.blueprints.todoapp.taskdetail.TaskDetailActivity" />
         <activity android:name="com.example.android.architecture.blueprints.todoapp.addedittask.AddEditTaskActivity" />
-        <activity android:name=".MainActivity" />
     </application>
 
 </manifest>

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

@@ -1,5 +1,6 @@
 package com.example.android.architecture.blueprints.todoapp;
 
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
@@ -10,6 +11,12 @@
 public abstract class BaseController extends Controller {
     private boolean mActive = false;
 
+    public BaseController() {
+    }
+
+    public BaseController(Bundle args) {
+    }
+
     protected ActionBar getActionBar() {
         ActionBarProvider actionBarProvider = ((ActionBarProvider)getActivity());
         return actionBarProvider != null ? actionBarProvider.getSupportActionBar() : null;

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

@@ -16,9 +16,10 @@
 
 package com.example.android.architecture.blueprints.todoapp;
 
-import android.content.Intent;
 import android.os.Bundle;
+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;
@@ -30,7 +31,8 @@
 import com.bluelinelabs.conductor.Router;
 import com.bluelinelabs.conductor.RouterTransaction;
 import com.example.android.architecture.blueprints.todoapp.statistics.StatisticsController;
-import com.example.android.architecture.blueprints.todoapp.tasks.TasksActivity;
+import com.example.android.architecture.blueprints.todoapp.tasks.TasksFragment;
+import com.example.android.architecture.blueprints.todoapp.util.EspressoIdlingResource;
 
 /**
  * The activity for the app.
@@ -65,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         router = Conductor.attachRouter(this, mContainer, savedInstanceState);
         if (!router.hasRootController()) {
-            router.setRoot(RouterTransaction.with(new StatisticsController()));
+            router.setRoot(RouterTransaction.with(new TasksFragment()));
         }
     }
 
@@ -94,14 +96,10 @@ private void setupDrawerContent(NavigationView navigationView) {
                     public boolean onNavigationItemSelected(MenuItem menuItem) {
                         switch (menuItem.getItemId()) {
                             case R.id.list_navigation_menu_item:
-                                Intent intent =
-                                        new Intent(MainActivity.this, TasksActivity.class);
-                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                                startActivity(intent);
+                                router.setRoot(RouterTransaction.with(new TasksFragment()));
                                 break;
                             case R.id.statistics_navigation_menu_item:
-                                // Do nothing, we're already on that screen
+                                router.setRoot(RouterTransaction.with(new StatisticsController()));
                                 break;
                             default:
                                 break;
@@ -118,4 +116,9 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
     public DrawerLayout getDrawerLayout() {
         return mDrawerLayout;
     }
+
+    @VisibleForTesting
+    public IdlingResource getCountingIdlingResource() {
+        return EspressoIdlingResource.getIdlingResource();
+    }
 }