Merge pull request #93 from Tinkoff/2.5.8

Fixed FPS bank selection dialog

changelog.md

@@ -1,3 +1,10 @@
+## 2.5.8
+
+#### Fixed
+Fixed FPS bank selection dialog
+#### Changes
+#### Additions
+
 ## 2.5.7
 
 #### Fixed

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=2.5.7
+VERSION_NAME=2.5.8
 VERSION_CODE=15
 GROUP=ru.tinkoff.acquiring
 

ui/src/main/java/ru/tinkoff/acquiring/sdk/models/options/FeaturesOptions.kt

@@ -129,6 +129,7 @@ class FeaturesOptions() : Options(), Parcelable {
             handleCardListErrorInSdk = readByte().toInt() != 0
             darkThemeMode = DarkThemeMode.valueOf(readString() ?: DarkThemeMode.AUTO.name)
             fpsEnabled = readByte().toInt() != 0
+            tinkoffPayEnabled = readByte().toInt() != 0
             selectedCardId = readString()
             handleErrorsInSdk = readByte().toInt() != 0
             emailRequired = readByte().toInt() != 0
@@ -147,6 +148,7 @@ class FeaturesOptions() : Options(), Parcelable {
             writeByte((if (handleCardListErrorInSdk) 1 else 0).toByte())
             writeString(darkThemeMode.name)
             writeByte((if (fpsEnabled) 1 else 0).toByte())
+            writeByte((if (tinkoffPayEnabled) 1 else 0).toByte())
             writeString(selectedCardId)
             writeByte((if (handleErrorsInSdk) 1 else 0).toByte())
             writeByte((if (emailRequired) 1 else 0).toByte())

ui/src/main/java/ru/tinkoff/acquiring/sdk/ui/customview/BottomContainer.kt

@@ -385,10 +385,7 @@ internal class BottomContainer @JvmOverloads constructor(
     }
 
     private fun getChildHeight(): Int {
-        val widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST)
-        val child = getChildAt(0)
-        child.measure(widthSpec, MeasureSpec.UNSPECIFIED)
-        return child.measuredHeight
+        return getChildAt(0).height
     }
 
     private fun getPositionInParent(child: View?): IntArray {