diff --git a/.version b/.version
index 4ac4fded..03825cde 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-6.2.0
\ No newline at end of file
+6.2.5
\ No newline at end of file
diff --git a/.version_code b/.version_code
index dd474ccb..f1ef71b4 100644
--- a/.version_code
+++ b/.version_code
@@ -1 +1 @@
-6020000
\ No newline at end of file
+6020500
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1708c1d5..be36cded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@
### NEXT_VERSION_DESCRIPTION_BEGIN
### NEXT_VERSION_DESCRIPTION_END
+## [6.2.5] (06-08-2021)
+
+* Исправление вёрстки для корнер кейса с неполностью сконфигурированным навбаром презентующего контроллера.
+
+## [6.2.4] (04-08-2021)
+
+* исправления для CI
+
## [6.2.3] (04-08-2021)
* исправления для CI
diff --git a/Podfile.lock b/Podfile.lock
index fc2a6dd0..14741c99 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -14,7 +14,7 @@ PODS:
- YandexMobileMetrica/Dynamic/Core (3.17.0)
- YandexMobileMetrica/Dynamic/Crashes (3.17.0):
- YandexMobileMetrica/Dynamic/Core
- - YooKassaPayments (6.2.3):
+ - YooKassaPayments (6.2.5):
- MoneyAuth (~> 2.34.1)
- ThreatMetrixAdapter (~> 3.3.0)
- YandexMobileMetrica/Dynamic (~> 3.0)
@@ -62,7 +62,7 @@ SPEC CHECKSUMS:
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
ThreatMetrixAdapter: 309bc3d0afff4706c882844203df6d3f89a6bf0c
YandexMobileMetrica: 9e713c16bb6aca0ba63b84c8d7b8b86d32f4ecc4
- YooKassaPayments: be592e6c59983d42dc0673a7e5d018ec3557c626
+ YooKassaPayments: 6305b342c6cd599b787604e5291b5d9d8ace3b5f
YooKassaPaymentsApi: 50d9ff8a3e76f3aaf01efe5ff7dcd1b813635044
YooKassaWalletApi: c1916b692ad842ae04917a10ce66d6d2f971c653
YooMoneyCoreApi: d228ca30d6936bc81642988c93d26eba271261f8
diff --git a/YooKassaPayments.podspec b/YooKassaPayments.podspec
index 82681c2a..f2edeee1 100644
--- a/YooKassaPayments.podspec
+++ b/YooKassaPayments.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'YooKassaPayments'
- s.version = '6.2.3'
+ s.version = '6.2.5'
s.homepage = 'https://github.com/yoomoney/yookassa-payments-swift'
s.license = {
:type => "MIT",
diff --git a/YooKassaPayments/Private/SheetView/SheetTransition.swift b/YooKassaPayments/Private/SheetView/SheetTransition.swift
index 0c664719..313b8580 100644
--- a/YooKassaPayments/Private/SheetView/SheetTransition.swift
+++ b/YooKassaPayments/Private/SheetView/SheetTransition.swift
@@ -7,6 +7,8 @@ final class SheetTransition: NSObject {
weak var presenter: UIViewController?
var presenting = true
+ private var extendedLayoutIncludesOpaqueBars: Bool?
+
// MARK: - Initialization
private let contentViewController: SheetContentViewController
@@ -31,10 +33,13 @@ extension SheetTransition {
animations: (() -> Void)? = nil,
completion: ((Bool) -> Void)? = nil
) {
+ extendedLayoutIncludesOpaqueBars.map {
+ presenter.extendedLayoutIncludesOpaqueBars = $0
+ }
UIView.animate(
withDuration: options.transitionDuration,
animations: {
- presenter.view.layer.transform = CATransform3DMakeScale(1, 1, 1)
+ presenter.view.layer.transform = CATransform3DIdentity
presenter.view.layer.cornerRadius = 0
animations?()
},
@@ -80,6 +85,17 @@ extension SheetTransition: UIViewControllerAnimatedTransitioning {
}
self.presenter = presenter
+ if
+ !UINavigationBar.appearance().isTranslucent,
+ presenter.extendedLayoutIncludesOpaqueBars == false,
+ let container = presenter as? UINavigationController,
+ let top = container.topViewController,
+ container.navigationBar.backgroundImage(for: .default) == nil
+ {
+ top.extendedLayoutIncludesOpaqueBars = true
+ extendedLayoutIncludesOpaqueBars = false
+ }
+
contentViewController.view.transform = .identity
containerView.addSubview(sheet.view)
sheet.view.setNeedsLayout()
diff --git a/YooKassaPaymentsDemoApp/Resources/Info.plist b/YooKassaPaymentsDemoApp/Resources/Info.plist
index 8d7bfbc2..e6e8bb6e 100644
--- a/YooKassaPaymentsDemoApp/Resources/Info.plist
+++ b/YooKassaPaymentsDemoApp/Resources/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
$(PRODUCT_BUNDLE_PACKAGE_TYPE)
CFBundleShortVersionString
- 6.2.0
+ $(MARKETING_VERSION)
CFBundleURLTypes
diff --git a/deliver/screenshots/.gitkeep b/deliver/screenshots/.gitkeep
new file mode 100644
index 00000000..e69de29b