Fix dimming animation exit on back press with search view without sug…

…gestions
mars885 · Mar 9, 2019 · e4a2607 · e4a2607
1 parent 8d3f5f0
commit e4a2607
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/...searchview/src/main/java/com/paulrybitskyi/persistentsearchview/PersistentSearchView.java b/...searchview/src/main/java/com/paulrybitskyi/persistentsearchview/PersistentSearchView.java
@@ -1395,13 +1395,13 @@ public final void expand(boolean animate) {
 
         showKeyboard();
 
-        if(!areSuggestionsDisabled()) {
-            // Cancelling any pending events
-            cancelExitAnimationEndActionEvent();
+        // Cancelling any pending events
+        cancelExitAnimationEndActionEvent();
 
-            // Background dimming related
-            updateBackground(mState, animate);
+        // Background dimming related
+        updateBackground(mState, animate);
 
+        if(!areSuggestionsDisabled()) {
             // Suggestions container related
             makeVisible(mSuggestionsContainerLL);
             mSuggestionsContainerLL.measure(
@@ -1456,16 +1456,16 @@ public final void collapse(boolean animate) {
 
         hideKeyboard();
 
-        if(!areSuggestionsDisabled()) {
-            // Cancelling any pending events
-            cancelExitAnimationEndActionEvent();
+        // Cancelling any pending events
+        cancelExitAnimationEndActionEvent();
 
-            // Animation related
-            final long duration = getSuggestionsContainerAnimationDuration(mSuggestionsContainerLL.getMeasuredHeight(), 0);
+        // Animation related
+        final long duration = getSuggestionsContainerAnimationDuration(mSuggestionsContainerLL.getMeasuredHeight(), 0);
 
-            // Background dimming related
-            updateBackgroundWithAnimation(mState, duration);
+        // Background dimming related
+        updateBackgroundWithAnimation(mState, duration);
 
+        if(!areSuggestionsDisabled()) {
             // Suggestions container related
             makeInvisible(mDividerView);
             updateSuggestionsContainerHeightWithAnimation(

diff --git a/sample/src/main/java/com/paulrybitskyi/sample/DemoActivity.kt b/sample/src/main/java/com/paulrybitskyi/sample/DemoActivity.kt
@@ -205,15 +205,6 @@ class DemoActivity : AppCompatActivity(), View.OnClickListener {
     }
 
 
-    private fun isSearchViewExpanded(): Boolean {
-        return when(mMode) {
-            DemoModes.SIMPLE -> false
-
-            else -> persistentSearchView.isExpanded
-        }
-    }
-
-
     private fun canSaveQuery(): Boolean {
         return when(mMode) {
             DemoModes.RECENT_SEARCH_QUERIES -> true
@@ -238,7 +229,7 @@ class DemoActivity : AppCompatActivity(), View.OnClickListener {
 
 
     override fun onBackPressed() {
-        if(isSearchViewExpanded()) {
+        if(persistentSearchView.isExpanded) {
             persistentSearchView.collapse()
             return
         }