Skip to content

Commit

Permalink
Release 6.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins committed Aug 6, 2021
1 parent f2e9a9c commit 330f7fc
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.2.0
6.2.5
2 changes: 1 addition & 1 deletion .version_code
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6020000
6020500
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -62,7 +62,7 @@ SPEC CHECKSUMS:
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
ThreatMetrixAdapter: 309bc3d0afff4706c882844203df6d3f89a6bf0c
YandexMobileMetrica: 9e713c16bb6aca0ba63b84c8d7b8b86d32f4ecc4
YooKassaPayments: be592e6c59983d42dc0673a7e5d018ec3557c626
YooKassaPayments: 6305b342c6cd599b787604e5291b5d9d8ace3b5f
YooKassaPaymentsApi: 50d9ff8a3e76f3aaf01efe5ff7dcd1b813635044
YooKassaWalletApi: c1916b692ad842ae04917a10ce66d6d2f971c653
YooMoneyCoreApi: d228ca30d6936bc81642988c93d26eba271261f8
Expand Down
2 changes: 1 addition & 1 deletion YooKassaPayments.podspec
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
18 changes: 17 additions & 1 deletion YooKassaPayments/Private/SheetView/SheetTransition.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?()
},
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion YooKassaPaymentsDemoApp/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>6.2.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand Down
Empty file added deliver/screenshots/.gitkeep
Empty file.

0 comments on commit 330f7fc

Please sign in to comment.