Enables snackbar again

Change-Id: I57b4291dbf7064d17b5b3a559d20fbb85003aa4d
danaimset · May 3, 2019 · eb01baa · eb01baa
1 parent 0204a31
commit eb01baa
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/...va/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskFragment.kt b/...va/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskFragment.kt
@@ -59,7 +59,7 @@ class AddEditTaskFragment : Fragment() {
 
     private fun setupSnackbar() {
         viewDataBinding.viewmodel?.let {
-            view?.setupSnackbar(this, it.snackbarMessage, Snackbar.LENGTH_LONG)
+            view?.setupSnackbar(this, it.snackbarMessage, Snackbar.LENGTH_SHORT)
         }
     }
 

diff --git a/...java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.kt b/...java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.kt
@@ -45,7 +45,7 @@ class TaskDetailFragment : Fragment() {
         super.onActivityCreated(savedInstanceState)
         setupFab()
         viewDataBinding.viewmodel?.let {
-            view?.setupSnackbar(this, it.snackbarMessage, Snackbar.LENGTH_LONG)
+            view?.setupSnackbar(this, it.snackbarMessage, Snackbar.LENGTH_SHORT)
         }
 
         setupNavigation()

diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt
@@ -100,7 +100,7 @@ class TasksFragment : Fragment() {
 
     private fun setupSnackbar() {
         viewDataBinding.viewmodel?.let {
-            view?.setupSnackbar(this, it.snackbarMessage, Snackbar.LENGTH_LONG)
+            view?.setupSnackbar(this, it.snackbarMessage, Snackbar.LENGTH_SHORT)
         }
         arguments?.let {
             val message = TasksFragmentArgs.fromBundle(it).userMessage

diff --git a/...n/java/com/example/android/architecture/blueprints/todoapp/util/EspressoIdlingResource.kt b/...n/java/com/example/android/architecture/blueprints/todoapp/util/EspressoIdlingResource.kt
@@ -31,6 +31,8 @@ object EspressoIdlingResource {
     }
 
     fun decrement() {
-        countingIdlingResource.decrement()
+        if (!countingIdlingResource.isIdleNow) {
+            countingIdlingResource.decrement()
+        }
     }
 }
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ViewExt.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ViewExt.kt
@@ -34,7 +34,18 @@ import com.google.android.material.snackbar.Snackbar
  * Transforms static java function Snackbar.make() to an extension function on View.
  */
 fun View.showSnackbar(snackbarText: String, timeLength: Int) {
-    Snackbar.make(this, snackbarText, timeLength)
+    Snackbar.make(this, snackbarText, timeLength).run {
+        addCallback(object: Snackbar.Callback() {
+            override fun onShown(sb: Snackbar?) {
+                EspressoIdlingResource.increment()
+            }
+
+            override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
+                EspressoIdlingResource.decrement()
+            }
+        })
+        show()
+    }
 }
 
 /**