Version update: 2.4.1

yoomoney · Nov 18, 2019 · 1b6f00d · 1b6f00d
1 parent 15734a7
commit 1b6f00d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ## Changelog
 
+### 2.4.1
+2019-11-15
+- Fix screen artifacts on closing mSDK.
+
 ### 2.4.0
+2019-09-06
 - Add bank icons for card screen.
 - Add tokenization flow for saved bank cards.
 

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 
 #  Документация
 
-Android Checkout mobile SDK - версия 2.4.0 ([changelog](https://github.com/yandex-money/yandex-checkout-android-sdk/blob/master/CHANGELOG.md))
+Android Checkout mobile SDK - версия 2.4.1 ([changelog](https://github.com/yandex-money/yandex-checkout-android-sdk/blob/master/CHANGELOG.md))
 
 * [Подключение зависимостей](#подключение-зависимостей)
     * [Подключение через Gradle](#подключение-через-gradle)
@@ -41,7 +41,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.yandex.money:checkout:2.4.0'
+    implementation 'com.yandex.money:checkout:2.4.1'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -60,6 +60,7 @@ allprojects {
         google()
         jcenter()
         mavenCentral()
+        maven { url "http://pay.cards/maven" }
         maven { url "https://jitpack.io" }
     }
 }

diff --git a/common.gradle b/common.gradle
@@ -24,7 +24,7 @@ apply from: rootProject.file("sensitive.gradle")
 ext {
     versionMajor = 2
     versionMinor = 4
-    versionPatch = 0
+    versionPatch = 1
 
     versionAlpha = null
 

diff --git a/library/src/main/java/ru/yandex/money/android/sdk/impl/CheckoutActivity.kt b/library/src/main/java/ru/yandex/money/android/sdk/impl/CheckoutActivity.kt
@@ -124,19 +124,10 @@ internal class CheckoutActivity : AppCompatActivity() {
     }
 
     private fun showDialog(supportFragmentManager: FragmentManager) {
-        val mainDialog = findDialog(supportFragmentManager) ?: MainDialogFragment().apply {
+        findDialog(supportFragmentManager) ?: MainDialogFragment().apply {
             show(supportFragmentManager, TAG_BOTTOM_SHEET)
             supportFragmentManager.executePendingTransactions()
         }
-
-        mainDialog.apply {
-            dialog.setOnDismissListener {
-                finish()
-            }
-            dialog.setOnCancelListener {
-                finish()
-            }
-        }
     }
 
     private fun findDialog(supportFragmentManager: FragmentManager) =

diff --git a/library/src/main/java/ru/yandex/money/android/sdk/impl/MainDialogFragment.kt b/library/src/main/java/ru/yandex/money/android/sdk/impl/MainDialogFragment.kt
@@ -251,12 +251,14 @@ internal class MainDialogFragment : BottomSheetDialogFragment() {
     override fun onCancel(dialog: DialogInterface?) {
         super.onCancel(dialog)
         AppModel.reset()
+        activity?.finish()
     }
 
     override fun onDismiss(dialog: DialogInterface?) {
         view?.hideSoftKeyboard()
 
         super.onDismiss(dialog)
+        activity?.finish()
     }
 
     private fun hideBankCardDialog() {

diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
@@ -49,6 +49,8 @@
         <item name="android:windowTranslucentNavigation" tools:targetApi="kitkat">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
         <item name="colorAccent">@color/ym_palette_accent</item>
     </style>
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -82,7 +82,7 @@ dependencies {
     releaseImplementation project(':library')
     debugImplementation project(':library')
     implementation 'com.yandex.android:authsdk:2.1.1'
-    implementation project(':pay-cards-sdk')
+    implementation 'cards.pay:paycardsrecognizer:1.1.0'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.mockito:mockito-core:$mockito_version"
     testImplementation "org.robolectric:robolectric:3.8"

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="ru.yandex.money.android.example">
 
+    <uses-sdk tools:overrideLibrary="cards.pay.paycardsrecognizer.sdk" />
+
     <application
         android:name=".App"
         android:allowBackup="false"