Merge pull request #96 from Tinkoff/2.5.10

2.5.10
tinkoff-mobile-tech · Jul 11, 2022 · cc7378d · cc7378d
2 parents 8a34483 + 778a9fc
commit cc7378d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,11 @@
+## 2.5.10
+
+#### Fixed
+Fixed opening of payment dialog on some devices
+#### Changes
+Tinkoff Pay payment form opens in a separate window now
+#### Additions
+
 ## 2.5.9
 
 #### Fixed

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

diff --git a/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/PaymentActivity.kt b/ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/activities/PaymentActivity.kt
@@ -236,6 +236,7 @@ internal class PaymentActivity : TransparentActivity() {
     private fun openTinkoffPayDeepLinkInBank(deepLink: String) {
         val intent = Intent(Intent.ACTION_VIEW)
         intent.data = Uri.parse(deepLink)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivityForResult(intent, TINKOFF_PAY_REQUEST_CODE)
     }
 

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
@@ -178,7 +178,7 @@ internal class BottomContainer @JvmOverloads constructor(
         super.onLayout(changed, left, top, right, bottom)
         val prevInitialPositionY = initialPositionY
         initialPositionY = height - getChildHeight()
-        if (prevInitialPositionY != initialPositionY) {
+        if (prevInitialPositionY == 0 || prevInitialPositionY != initialPositionY) {
             if (showInitAnimation) {
                 if (initialPositionY <= topPositionY) {
                     initialPositionY = statusBarHeight
@@ -389,7 +389,13 @@ internal class BottomContainer @JvmOverloads constructor(
     }
 
     private fun getChildHeight(): Int {
-        return getChildAt(0).height
+        var childHeight = 0
+        for (index in 0 until this.childCount) {
+            val child = this.getChildAt(index)
+            childHeight += child.height
+        }
+
+        return childHeight
     }
 
     private fun getPositionInParent(child: View?): IntArray {