diff --git a/CHANGELOG.md b/CHANGELOG.md
index bae5d51..443560d 100644
--- 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
index a17705f..cf5e2e9 100755
--- 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
index 2c49d1a..c11c46a 100644
--- 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
index 94cd1c5..5a6d884 100644
--- 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
index 8ba7c21..09d04ae 100644
--- 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
index e2f30ec..0f6d03d 100644
--- 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
index 8cc4c66..d5df4ca 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -49,6 +49,8 @@
- true
- true
- @android:style/Animation
+ - true
+ - false
- @color/ym_palette_accent
diff --git a/sample/build.gradle b/sample/build.gradle
index 1c2a48b..0be7d2c 100644
--- 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
index fbbd5f1..e79ba5b 100644
--- 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">
+
+