fixing some bugs & preparing for new release

roiacult · Dec 29, 2019 · f434877 · f434877
1 parent 6b52db2
commit f434877
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
@@ -20,6 +20,7 @@
             app:toolbarId="@id/toolbar"
             app:peekHeight="200dp"
             app:menuDrawable="@drawable/filter_variant"
+            app:disable_when_open="false"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
         <include

diff --git a/backdrop/src/main/java/com/roacult/backdrop/BackdropLayout.kt b/backdrop/src/main/java/com/roacult/backdrop/BackdropLayout.kt
@@ -126,17 +126,18 @@ class BackdropLayout @JvmOverloads constructor(context: Context, attribute : Att
 
         onBackdropChangeStateListener?.invoke(state)
 
-        if(disableWhenOpened) disableFrontLayout(state == State.OPEN)
         when(state) {
             State.OPEN -> {
                 getToolbar()?.setNavigationIcon(closeIcon)
                 val transitionHeight = getTransitionHeight()
                 if(withAnimation) startTranslateAnimation(transitionHeight)
                 else {
                     getFrontLayout().translationY = transitionHeight
-                    getDisablingView().translationY = transitionHeight
-                    getDisablingView().alpha = calculateAlphaVlue(transitionHeight)
-                    getDisablingView().visible(true)
+                    if(disableWhenOpened) {
+                        getDisablingView().translationY = transitionHeight
+                        getDisablingView().alpha = calculateAlphaVlue(transitionHeight)
+                        getDisablingView().visible(true)
+                    }
                 }
             }
 
@@ -145,9 +146,11 @@ class BackdropLayout @JvmOverloads constructor(context: Context, attribute : Att
                 if(withAnimation) startTranslateAnimation(0F)
                 else {
                     getFrontLayout().translationY = 0F
-                    getDisablingView().translationY = 0F
-                    getDisablingView().alpha = 0F
-                    getDisablingView().visible(false)
+                    if(disableWhenOpened) {
+                        getDisablingView().translationY = 0F
+                        getDisablingView().alpha = 0F
+                        getDisablingView().visible(false)
+                    }
                 }
             }
         }
@@ -210,9 +213,11 @@ class BackdropLayout @JvmOverloads constructor(context: Context, attribute : Att
             addUpdateListener {
                 val translation = it.animatedValue as Float
                 getFrontLayout().translationY = translation
-                getDisablingView().visible(translation != 0F )
-                getDisablingView().translationY = translation
-                getDisablingView().alpha = calculateAlphaVlue(translation)
+                if(disableWhenOpened) {
+                    getDisablingView().visible(translation != 0F)
+                    getDisablingView().translationY = translation
+                    getDisablingView().alpha = calculateAlphaVlue(translation)
+                }
             }
             start()
         }
@@ -225,8 +230,4 @@ class BackdropLayout @JvmOverloads constructor(context: Context, attribute : Att
     private fun getTransitionHeight(): Float {
         return Math.min(getBackLayout().height.toFloat(),height - peeckHeight)
     }
-
-    private fun disableFrontLayout(disable:Boolean ){
-        //TODO disable
-    }
 }