Synced latest changes from parent repo.

androidstarters · Oct 28, 2016 · 66a0c54 · 66a0c54
1 parent f5ba64f
commit 66a0c54
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/generators/app/templates/todo-mvp-dagger/app/build.gradle b/generators/app/templates/todo-mvp-dagger/app/build.gradle
@@ -89,8 +89,8 @@ dependencies {
     // Dependencies for Android unit tests
     androidTestCompile "junit:junit:$rootProject.ext.junitVersion"
     androidTestCompile "org.mockito:mockito-core:$rootProject.ext.mockitoVersion"
-    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestCompile "com.google.dexmaker:dexmaker:$rootProject.ext.dexmakerVersion"
+    androidTestCompile "com.google.dexmaker:dexmaker-mockito:$rootProject.ext.dexmakerVersion"
 
     // Espresso UI Testing
     androidTestCompile "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"

diff --git a/...pp/src/main/java/com/example/android/architecture/blueprints/todoapp/ToDoApplication.java b/...pp/src/main/java/com/example/android/architecture/blueprints/todoapp/ToDoApplication.java
@@ -35,7 +35,7 @@ public void onCreate() {
 
         mRepositoryComponent = DaggerTasksRepositoryComponent.builder()
                 .applicationModule(new ApplicationModule((getApplicationContext())))
-                .tasksRepositoryModule(new TasksRepositoryModule()).build();
+                .build();
 
     }
 

diff --git a/generators/app/templates/todo-mvp-dagger/build.gradle b/generators/app/templates/todo-mvp-dagger/build.gradle
@@ -41,4 +41,5 @@ ext {
     rulesVersion = '0.5'
     espressoVersion = '2.2.2'
     daggerVersion = '2.2'
+    dexmakerVersion = '1.2'
 }
diff --git a/...java/com/example/android/architecture/blueprints/todoapp/data/source/TasksRepository.java b/...java/com/example/android/architecture/blueprints/todoapp/data/source/TasksRepository.java
@@ -199,7 +199,7 @@ public void clearCompletedTasks() {
      * Gets tasks from local data source (sqlite) unless the table is new or empty. In that case it
      * uses the network data source. This is done to simplify the sample.
      * <p>
-     * Note: {@link LoadTasksCallback#onDataNotAvailable()} is fired if both data sources fail to
+     * Note: {@link GetTaskCallback#onDataNotAvailable()} is fired if both data sources fail to
      * get the data.
      */
     @Override
@@ -221,6 +221,11 @@ public void getTask(@NonNull final String taskId, @NonNull final GetTaskCallback
         mTasksLocalDataSource.getTask(taskId, new GetTaskCallback() {
             @Override
             public void onTaskLoaded(Task task) {
+                // Do in memory cache update to keep the app UI up to date
+                if (mCachedTasks == null) {
+                    mCachedTasks = new LinkedHashMap<>();
+                }
+                mCachedTasks.put(task.getId(), task);
                 callback.onTaskLoaded(task);
             }
 
@@ -229,6 +234,11 @@ public void onDataNotAvailable() {
                 mTasksRemoteDataSource.getTask(taskId, new GetTaskCallback() {
                     @Override
                     public void onTaskLoaded(Task task) {
+                        // Do in memory cache update to keep the app UI up to date
+                        if (mCachedTasks == null) {
+                            mCachedTasks = new LinkedHashMap<>();
+                        }
+                        mCachedTasks.put(task.getId(), task);
                         callback.onTaskLoaded(task);
                     }
 

diff --git a/generators/app/templates/todo-mvp/app/src/main/res/layout/tasks_frag.xml b/generators/app/templates/todo-mvp/app/src/main/res/layout/tasks_frag.xml
@@ -23,6 +23,7 @@
         android:id="@+id/tasksContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clickable="true"
         android:orientation="vertical">
 
         <LinearLayout