Merge pull request #94 from Tinkoff/2.5.9

Fixed displaying of dialog with keyboard
tinkoff-mobile-tech · Jun 9, 2022 · 20f6991 · 20f6991
2 parents 7b7c078 + f3d15dc
commit 20f6991
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+## 2.5.9
+
+#### Fixed
+Fixed displaying of dialog with keyboard
+#### Changes
+#### Additions
+
 ## 2.5.8
 
 #### Fixed

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.5.8
+VERSION_NAME=2.5.9
 VERSION_CODE=15
 GROUP=ru.tinkoff.acquiring
 

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/customview/BottomContainer.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/customview/BottomContainer.kt
@@ -63,6 +63,7 @@ internal class BottomContainer @JvmOverloads constructor(
     private var layoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
     private var velocityTracker: VelocityTracker? = null
     private var initAnimation: AnimatorSet? = null
+    private var expandAnimation: Animator? = null
     private var scrollableView: View? = null
     private var background: FrameLayout? = null
     private var isFullScreenOpened = false
@@ -187,7 +188,9 @@ internal class BottomContainer @JvmOverloads constructor(
                 }
             } else {
                 if (isExpanded) {
-                    setToPosition(expandedPositionY)
+                    if (expandAnimation?.isRunning != true) {
+                        setToPosition(expandedPositionY)
+                    }
                 } else {
                     if (initialPositionY <= topPositionY || containerState == STATE_FULLSCREEN) {
                         openFullScreen()
@@ -361,7 +364,7 @@ internal class BottomContainer @JvmOverloads constructor(
             return
         }
 
-        getTranslationYAnimator(this, expandedPositionY, MOVING_ANIMATION_DURATION,
+        expandAnimation = getTranslationYAnimator(this, expandedPositionY, MOVING_ANIMATION_DURATION,
                 DecelerateInterpolator())
                 .apply {
                     addListener(object : AnimatorListenerAdapter() {
@@ -370,7 +373,8 @@ internal class BottomContainer @JvmOverloads constructor(
                             resizeScrollContainer()
                         }
                     })
-                }.start()
+                    start()
+                }
     }
 
     fun collapse() {
@@ -424,7 +428,7 @@ internal class BottomContainer @JvmOverloads constructor(
             scrollContainer.layoutParams.height = heightParam
             isScrollDisabled = false
         } else {
-            scrollContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            scrollContainer.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
             isScrollDisabled = true
         }
         scrollContainer.requestLayout()