RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[xcode-9] [ios] Migrated to Swift 4.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-09-21 14:09:55 +03:00 • committed by Vladimir Byko-Ianko
parent 9cb6917793
commit 9a70b67794
69 changed files with 222 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Categories/Bundle+Init.swift
View file

@ -1,5 +1,5 @@
extension Bundle {
func load(viewClass: AnyClass, owner: Any? = nil, options: [AnyHashable: Any]? = nil) -> [Any]? {
@objc func load(viewClass: AnyClass, owner: Any? = nil, options: [AnyHashable: Any]? = nil) -> [Any]? {
return loadNibNamed(toString(viewClass), owner: owner, options: options)
}
}

3
iphone/Maps/Categories/DateComponentsFormatter+ETA.swift
View file

@ -1,6 +1,5 @@
extension DateComponentsFormatter {
static func etaString(from ti: TimeInterval) -> String? {
@objc static func etaString(from ti: TimeInterval) -> String? {
let formatter = DateComponentsFormatter()
formatter.allowedUnits = [.minute, .hour, .day]
formatter.maximumUnitCount = 2

2
iphone/Maps/Categories/String+BoundingRect.swift
View file

@ -5,7 +5,7 @@ extension String {
let maximumHeight = maxNumberOfLines == 0 ? CGFloat.greatestFiniteMagnitude : font.lineHeight * CGFloat(maxNumberOfLines + 1)
let constraintSize = CGSize(width: width, height: maximumHeight)
let options: NSStringDrawingOptions = [.usesLineFragmentOrigin, .usesFontLeading]
let attributes = [NSFontAttributeName: font]
let attributes = [NSAttributedStringKey.font: font]
let rect = (self as NSString).boundingRect(with: constraintSize, options: options, attributes: attributes, context: nil)
var numberOfLines = ceil(rect.height / font.lineHeight)
if maxNumberOfLines != 0 {

4
iphone/Maps/Categories/UICollectionView+Cells.swift
View file

@ -1,9 +1,9 @@
extension UICollectionView {
func register(cellClass: AnyClass) {
@objc func register(cellClass: AnyClass) {
register(UINib(cellClass), forCellWithReuseIdentifier: toString(cellClass))
}
func dequeueReusableCell(withCellClass cellClass: AnyClass, indexPath: IndexPath) -> UICollectionViewCell {
@objc func dequeueReusableCell(withCellClass cellClass: AnyClass, indexPath: IndexPath) -> UICollectionViewCell {
return dequeueReusableCell(withReuseIdentifier: toString(cellClass), for: indexPath)
}
}

2
iphone/Maps/Categories/UINib+Init.swift
View file

@ -1,5 +1,5 @@
extension UINib {
convenience init(_ viewClass: AnyClass, bundle: Bundle? = nil) {
@objc convenience init(_ viewClass: AnyClass, bundle: Bundle? = nil) {
self.init(nibName: toString(viewClass), bundle: bundle)
}
}

6
iphone/Maps/Categories/UITableView+Cells.swift
View file

@ -1,13 +1,13 @@
extension UITableView {
func register(cellClass: AnyClass) {
@objc func register(cellClass: AnyClass) {
register(UINib(cellClass), forCellReuseIdentifier: toString(cellClass))
}
func dequeueReusableCell(withCellClass cellClass: AnyClass) -> UITableViewCell? {
@objc func dequeueReusableCell(withCellClass cellClass: AnyClass) -> UITableViewCell? {
return dequeueReusableCell(withIdentifier: toString(cellClass))
}
func dequeueReusableCell(withCellClass cellClass: AnyClass, indexPath: IndexPath) -> UITableViewCell {
@objc func dequeueReusableCell(withCellClass cellClass: AnyClass, indexPath: IndexPath) -> UITableViewCell {
return dequeueReusableCell(withIdentifier: toString(cellClass), for: indexPath)
}
}

6
iphone/Maps/Categories/UITableView+Updates.swift
View file

@ -2,13 +2,13 @@ extension UITableView {
typealias Updates = () -> Void
typealias Completion = () -> Void
func update(_ updates: Updates) {
@objc func update(_ updates: Updates) {
beginUpdates()
updates()
endUpdates()
}
func update(_ updates: Updates, completion: @escaping Completion) {
@objc func update(_ updates: Updates, completion: @escaping Completion) {
CATransaction.begin()
beginUpdates()
CATransaction.setCompletionBlock(completion)
@ -17,7 +17,7 @@ extension UITableView {
CATransaction.commit()
}
func refresh() {
@objc func refresh() {
update {}
}
}

2
iphone/Maps/Categories/UIView+Hierarchy.swift
View file

@ -1,5 +1,5 @@
extension UIView {
func hasSubview(viewClass: AnyClass) -> Bool {
@objc func hasSubview(viewClass: AnyClass) -> Bool {
return !subviews.filter { type(of: $0) == viewClass }.isEmpty
}
}

2
iphone/Maps/Categories/UIView+Snapshot.swift
View file

@ -1,7 +1,7 @@
import UIKit
extension UIView {
var snapshot: UIView {
@objc var snapshot: UIView {
guard let contents = layer.contents else {
return snapshotView(afterScreenUpdates: true)!
}

2
iphone/Maps/Categories/UIViewController+Hierarchy.swift
View file

@ -1,5 +1,5 @@
extension UIViewController {
static func topViewController() -> UIViewController {
@objc static func topViewController() -> UIViewController {
let window = UIApplication.shared.delegate!.window!!
return (window.rootViewController as! UINavigationController).topViewController!
}

6
iphone/Maps/Classes/Components/BorderedButton.swift
View file

@ -5,15 +5,15 @@ final class BorderedButton: UIButton {
private var borderHighlightedColor: UIColor?
private var borderDisabledColor: UIColor?
func setBorderColor(_ color: UIColor) {
@objc func setBorderColor(_ color: UIColor) {
borderColor = color
}
func setBorderHighlightedColor(_ color: UIColor) {
@objc func setBorderHighlightedColor(_ color: UIColor) {
borderHighlightedColor = color
}
func setBorderDisabledColor(_ color: UIColor) {
@objc func setBorderDisabledColor(_ color: UIColor) {
borderDisabledColor = color
}

5
iphone/Maps/Classes/Components/DimBackground.swift
View file

@ -3,7 +3,7 @@ final class DimBackground: SolidTouchView {
private let mainView: UIView
private var tapAction: (() -> Void)!
init(mainView: UIView) {
@objc init(mainView: UIView) {
self.mainView = mainView
super.init(frame: mainView.superview!.bounds)
backgroundColor = UIColor.fadeBackground()
@ -15,8 +15,7 @@ final class DimBackground: SolidTouchView {
fatalError("init(coder:) has not been implemented")
}
@objc
func setVisible(_ visible: Bool, tapAction: @escaping () -> Void) {
@objc func setVisible(_ visible: Bool, tapAction: @escaping () -> Void) {
self.tapAction = tapAction
if visible {

2
iphone/Maps/Classes/Components/RatingSummaryView/RatingSummaryView.swift
View file

@ -293,7 +293,7 @@ import UIKit
private func createTextLayer() -> CALayer {
let font = textFont.withSize(textSize)
let text = String(format: "%.1f", value)
let size = NSString(string: text).size(attributes: [NSFontAttributeName: font])
let size = NSString(string: text).size(withAttributes: [NSAttributedStringKey.font: font])
let layer = CATextLayer()
layer.bounds = CGRect(origin: CGPoint(),

6
iphone/Maps/Classes/Components/RatingView/RatingView.swift
View file

@ -401,7 +401,7 @@ import UIKit
private func createStarLayers() -> [CALayer] {
var ratingRemainder = value
var starLayers: [CALayer] = (0..<settings.starsCount).map { _ in
var starLayers: [CALayer] = (0 ..< settings.starsCount).map { _ in
let fillLevel = starFillLevel(ratingRemainder: ratingRemainder)
let layer = createCompositeStarLayer(fillLevel: fillLevel)
ratingRemainder -= 1
@ -426,7 +426,7 @@ import UIKit
var layers: [RatingViewSettings.TextSide: CALayer] = [:]
for (side, text) in texts {
let font = settings.textFonts[side]!.withSize(settings.textSizes[side]!)
let size = NSString(string: text).size(attributes: [NSFontAttributeName: font])
let size = NSString(string: text).size(withAttributes: [NSAttributedStringKey.font: font])
let layer = CATextLayer()
layer.bounds = CGRect(origin: CGPoint(),
@ -564,7 +564,7 @@ import UIKit
path = UIBezierPath(roundedRect: CGRect(origin: CGPoint(), size: CGSize(width: size, height: size)), cornerRadius: size / 4)
}
path.move(to: points.first!)
points[1..<points.count].forEach { path.addLine(to: $0) }
points[1 ..< points.count].forEach { path.addLine(to: $0) }
path.close()
return path

6
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationAddPointToastView.swift
View file

@ -7,20 +7,22 @@ final class NavigationAddPointToastView: UIView {
actionButton.titleLabel?.font = UIFont.regular16()
}
}
@IBOutlet private var locationButton: UIButton! {
didSet {
locationButton.tintColor = UIColor.linkBlue()
}
}
@IBOutlet private var separator: UIView! {
didSet {
separator.backgroundColor = UIColor.blackDividers()
}
}
private(set) var isStart = true
@objc private(set) var isStart = true
func config(isStart: Bool, withLocationButton: Bool) {
@objc func config(isStart: Bool, withLocationButton: Bool) {
self.isStart = isStart
let text = isStart ? L("routing_add_start_point") : L("routing_add_finish_point")
actionButton.setTitle(text, for: .normal)

26
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift
View file

@ -39,13 +39,13 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MWMT
DimBackground(mainView: self)
}()
weak var ownerView: UIView!
@objc weak var ownerView: UIView!
private weak var navigationInfo: MWMNavigationDashboardEntity?
private var hiddenConstraint: NSLayoutConstraint!
private var extendedConstraint: NSLayoutConstraint!
var isVisible = false {
@objc var isVisible = false {
didSet {
guard isVisible != oldValue else { return }
if isVisible {
@ -94,15 +94,15 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MWMT
NSLayoutConstraint(item: self, attribute: .right, relatedBy: .equal, toItem: ownerView, attribute: .right, multiplier: 1, constant: 0).isActive = true
hiddenConstraint = NSLayoutConstraint(item: self, attribute: .top, relatedBy: .equal, toItem: ownerView, attribute: .bottom, multiplier: 1, constant: 0)
hiddenConstraint.priority = UILayoutPriorityDefaultHigh
hiddenConstraint.priority = UILayoutPriority.defaultHigh
hiddenConstraint.isActive = true
let visibleConstraint = NSLayoutConstraint(item: progressView, attribute: .bottom, relatedBy: .equal, toItem: ownerView, attribute: .bottom, multiplier: 1, constant: 0)
visibleConstraint.priority = UILayoutPriorityDefaultLow
visibleConstraint.priority = UILayoutPriority.defaultLow
visibleConstraint.isActive = true
extendedConstraint = NSLayoutConstraint(item: self, attribute: .bottom, relatedBy: .equal, toItem: ownerView, attribute: .bottom, multiplier: 1, constant: 0)
extendedConstraint.priority = UILayoutPriorityDefaultHigh - 1
extendedConstraint.priority = UILayoutPriority(rawValue: UILayoutPriority.RawValue(Int(UILayoutPriority.defaultHigh.rawValue) - 1))
}
override func mwm_refreshUI() {
@ -133,14 +133,20 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MWMT
timePageControl.transform = CGAffineTransform(scaleX: pgScale, y: pgScale)
}
func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity) {
@objc func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity) {
navigationInfo = info
guard !MWMRouter.isTaxi() else { return }
let routingNumberAttributes: [String: Any] =
[NSForegroundColorAttributeName: UIColor.blackPrimaryText(), NSFontAttributeName: UIFont.bold24()]
let routingLegendAttributes: [String: Any] =
[NSForegroundColorAttributeName: UIColor.blackSecondaryText(), NSFontAttributeName: UIFont.bold14()]
let routingNumberAttributes: [NSAttributedStringKey: Any] =
[
NSAttributedStringKey.foregroundColor: UIColor.blackPrimaryText(),
NSAttributedStringKey.font: UIFont.bold24(),
]
let routingLegendAttributes: [NSAttributedStringKey: Any] =
[
NSAttributedStringKey.foregroundColor: UIColor.blackSecondaryText(),
NSAttributedStringKey.font: UIFont.bold14(),
]
if timePageControl.currentPage == 0 {
timeLabel.text = info.eta

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerTransitioningManager.swift
View file

@ -7,7 +7,7 @@ final class RouteManagerTransitioningManager: NSObject, UIViewControllerTransiti
super.init()
}
init(popoverSourceView: UIView, permittedArrowDirections: UIPopoverArrowDirection) {
@objc init(popoverSourceView: UIView, permittedArrowDirections: UIPopoverArrowDirection) {
self.popoverSourceView = popoverSourceView
self.permittedArrowDirections = permittedArrowDirections
super.init()

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift
View file

@ -128,7 +128,7 @@ final class RouteManagerViewController: MWMViewController, UITableViewDataSource
var dragCell: DragCell?
init(viewModel: RouteManagerViewModelProtocol) {
@objc init(viewModel: RouteManagerViewModelProtocol) {
self.viewModel = viewModel
super.init(nibName: toString(type(of: self)), bundle: nil)
}

27
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift
View file

@ -37,7 +37,7 @@ final class RoutePreviewStatus: SolidTouchView {
@IBOutlet private var heightBoxBottomManageRouteBoxTop: NSLayoutConstraint!
private var hiddenConstraint: NSLayoutConstraint!
weak var ownerView: UIView!
@objc weak var ownerView: UIView!
weak var navigationInfo: MWMNavigationDashboardEntity?
@ -81,11 +81,11 @@ final class RoutePreviewStatus: SolidTouchView {
NSLayoutConstraint(item: self, attribute: .right, relatedBy: .equal, toItem: ownerView, attribute: .right, multiplier: 1, constant: 0).isActive = true
hiddenConstraint = NSLayoutConstraint(item: self, attribute: .top, relatedBy: .equal, toItem: ownerView, attribute: .bottom, multiplier: 1, constant: 0)
hiddenConstraint.priority = UILayoutPriorityDefaultHigh
hiddenConstraint.priority = UILayoutPriority.defaultHigh
hiddenConstraint.isActive = true
let visibleConstraint = NSLayoutConstraint(item: self, attribute: .bottom, relatedBy: .equal, toItem: ownerView, attribute: .bottom, multiplier: 1, constant: 0)
visibleConstraint.priority = UILayoutPriorityDefaultLow
visibleConstraint.priority = UILayoutPriority.defaultLow
visibleConstraint.isActive = true
}
@ -120,15 +120,15 @@ final class RoutePreviewStatus: SolidTouchView {
manageRouteButtonCompact?.isHidden = !isCompact
}
func stateHidden() {
@objc func stateHidden() {
isVisible = false
}
func statePrepare() {
@objc func statePrepare() {
isVisible = false
}
func stateError(message: String) {
@objc func stateError(message: String) {
isVisible = true
errorBox.isHidden = false
resultsBox.isHidden = true
@ -141,7 +141,7 @@ final class RoutePreviewStatus: SolidTouchView {
updateHeight()
}
func stateReady() {
@objc func stateReady() {
isVisible = true
errorBox.isHidden = true
@ -159,10 +159,11 @@ final class RoutePreviewStatus: SolidTouchView {
completion: { image, elevation in
self.heightProfileImage.image = image
if let elevation = elevation {
let attributes: [String: Any] = [
NSForegroundColorAttributeName: UIColor.linkBlue(),
NSFontAttributeName: UIFont.medium14(),
]
let attributes: [NSAttributedStringKey: Any] =
[
NSAttributedStringKey.foregroundColor: UIColor.linkBlue(),
NSAttributedStringKey.font: UIFont.medium14(),
]
self.elevation = NSAttributedString(string: "▲▼ \(elevation)", attributes: attributes)
}
})
@ -174,7 +175,7 @@ final class RoutePreviewStatus: SolidTouchView {
updateHeight()
}
func stateNavigation() {
@objc func stateNavigation() {
isVisible = false
}
@ -192,7 +193,7 @@ final class RoutePreviewStatus: SolidTouchView {
iPad: { info.estimate })()
}
func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity) {
@objc func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity) {
navigationInfo = info
updateResultsLabel()
arriveLabel?.text = String(coreFormat: L("routing_arrive"), arguments: [info.arrival])

3
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift
View file

@ -8,6 +8,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
title.textColor = UIColor.blackPrimaryText()
}
}
@IBOutlet private weak var info: UILabel! {
didSet {
info.font = UIFont.regular14()
@ -15,7 +16,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
}
}
func config(type: MWMRoutePreviewTaxiCellType, title: String, eta: String, price: String, currency: String) {
@objc func config(type: MWMRoutePreviewTaxiCellType, title: String, eta: String, price: String, currency: String) {
let iconImage = { () -> UIImage in
switch type {
case .taxi: return #imageLiteral(resourceName: "icTaxiTaxi")

6
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteStartButton.swift
View file

@ -1,16 +1,16 @@
@objc(MWMRouteStartButton)
final class RouteStartButton: UIButton {
func statePrepare() {
@objc func statePrepare() {
isHidden = false
isEnabled = false
}
func stateError() {
@objc func stateError() {
isHidden = alternative(iPhone: true, iPad: false)
isEnabled = false
}
func stateReady() {
@objc func stateReady() {
isHidden = false
isEnabled = true
}

4
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -905,7 +905,9 @@ using namespace osm_auth_ios;
- (void)setStandbyCounter:(NSInteger)standbyCounter
{
_standbyCounter = MAX(0, standbyCounter);
UIApplication.sharedApplication.idleTimerDisabled = (_standbyCounter != 0);
dispatch_async(dispatch_get_main_queue(), ^{
[UIApplication sharedApplication].idleTimerDisabled = (self.standbyCounter != 0);
});
}
#pragma mark - Alert logic

11
iphone/Maps/Classes/Share/MWMShareActivityItem.mm
View file

@ -85,12 +85,13 @@ NSString * httpGe0Url(NSString * shortUrl)
itemForActivityType:(NSString *)activityType
{
NSString * event = @"MWMShareLocationActivityItem:activityViewController:itemForActivityType:";
NSString * type = activityType;
[Statistics logEvent:kStatEventName(kStatShare, kStatLocation)
withParameters:@{kStatAction : activityType}];
[Alohalytics logEvent:event withValue:activityType];
if ([UIActivityTypePostToTwitter isEqualToString:activityType])
withParameters:@{kStatAction : type}];
[Alohalytics logEvent:event withValue:type];
if ([UIActivityTypePostToTwitter isEqualToString:type])
return self.itemForTwitter;
return [self itemDefaultWithActivityType:activityType];
return [self itemDefaultWithActivityType:type];
}
- (NSString *)activityViewController:(UIActivityViewController *)activityViewController
@ -136,7 +137,7 @@ NSString * httpGe0Url(NSString * shortUrl)
strings.push_back(self.object.sponsoredDescriptionURL.absoluteString);
}
for (auto const str : strings)
for (auto const & str : strings)
{
if (str.length)
[result appendString:[NSString stringWithFormat:@"\n%@", str]];

2
iphone/Maps/Common/MWMTypes.h
View file

@ -1,4 +1,4 @@
typedef void (^MWMVoidBlock)();
typedef void (^MWMVoidBlock)(void);
typedef void (^MWMStringBlock)(NSString *);
typedef void (^MWMURLBlock)(NSURL *);

6
iphone/Maps/Core/Ads/BannersCache.swift
View file

@ -3,7 +3,7 @@ import MyTrackerSDK
@objc(MWMBannersCache)
final class BannersCache: NSObject {
static let cache = BannersCache()
@objc static let cache = BannersCache()
private override init() {}
private enum LoadState {
@ -43,7 +43,7 @@ final class BannersCache: NSObject {
}
}
func get(coreBanners: [CoreBanner], cacheOnly: Bool, loadNew: Bool = true, completion: @escaping Completion) {
@objc func get(coreBanners: [CoreBanner], cacheOnly: Bool, loadNew: Bool = true, completion: @escaping Completion) {
self.completion = completion
self.cacheOnly = cacheOnly
loadStates = coreBanners.map { coreBanner in
@ -110,7 +110,7 @@ final class BannersCache: NSObject {
onCompletion(isAsync: true)
}
func bannerIsOutOfScreen(coreBanner: MWMBanner) {
@objc func bannerIsOutOfScreen(coreBanner: MWMBanner) {
bannerIsOutOfScreen(bannerType: BannerType(type: coreBanner.mwmType, id: coreBanner.bannerID))
}

2
iphone/Maps/Core/Ads/CoreBanner.swift
View file

@ -3,7 +3,7 @@ final class CoreBanner: NSObject, MWMBanner {
let mwmType: MWMBannerType
let bannerID: String
init(mwmType: MWMBannerType, bannerID: String) {
@objc init(mwmType: MWMBannerType, bannerID: String) {
self.mwmType = mwmType
self.bannerID = bannerID
}

17
iphone/Maps/Core/Location/MWMLocationManager+SpeedAndAltitude.swift
View file

@ -1,14 +1,13 @@
extension MWMLocationManager {
static func speedSymbolFor(_ speed: Double) -> String {
@objc static func speedSymbolFor(_ speed: Double) -> String {
switch max(speed, 0) {
case 0..<1: return "🐢"
case 1..<2: return "🚶"
case 2..<5: return "🏃"
case 5..<10: return "🚲"
case 10..<36: return "🚗"
case 36..<120: return "🚄"
case 120..<278: return "🛩"
case 0 ..< 1: return "🐢"
case 1 ..< 2: return "🚶"
case 2 ..< 5: return "🏃"
case 5 ..< 10: return "🚲"
case 10 ..< 36: return "🚗"
case 36 ..< 120: return "🚄"
case 120 ..< 278: return "🛩"
default: return "🚀"
}
}

6
iphone/Maps/Core/Search/SearchBanners.swift
View file

@ -4,12 +4,12 @@ final class SearchBanners: NSObject {
weak var searchIndex: SearchIndex?
init(searchIndex: SearchIndex) {
@objc init(searchIndex: SearchIndex) {
self.searchIndex = searchIndex
super.init()
}
func add(_ banner: MWMBanner) {
@objc func add(_ banner: MWMBanner) {
guard let searchIndex = searchIndex else { return }
banners.append(banner)
let type: MWMSearchItemType
@ -29,7 +29,7 @@ final class SearchBanners: NSObject {
searchIndex.addItem(type: type, prefferedPosition: prefferedPosition, containerIndex: banners.count - 1)
}
func banner(atIndex index: Int) -> MWMBanner {
@objc func banner(atIndex index: Int) -> MWMBanner {
return banners[index]
}

10
iphone/Maps/Core/Search/SearchIndex.swift
View file

@ -13,11 +13,11 @@ final class SearchIndex: NSObject {
private var positionItems: [PositionItem] = []
private var items: [Item] = []
var count: Int {
@objc var count: Int {
return items.count
}
init(suggestionsCount: Int, resultsCount: Int) {
@objc init(suggestionsCount: Int, resultsCount: Int) {
for index in 0 ..< resultsCount {
let type: MWMSearchItemType = index < suggestionsCount ? .suggestion : .regular
let item = Item(type: type, containerIndex: index)
@ -32,7 +32,7 @@ final class SearchIndex: NSObject {
positionItems.append(PositionItem(item: item, position: prefferedPosition))
}
func build() {
@objc func build() {
positionItems.sort(by: >)
var itemsDict: [Int: Item] = [:]
positionItems.forEach { item in
@ -53,11 +53,11 @@ final class SearchIndex: NSObject {
}
}
func resultType(row: Int) -> MWMSearchItemType {
@objc func resultType(row: Int) -> MWMSearchItemType {
return items[row].type
}
func resultContainerIndex(row: Int) -> Int {
@objc func resultContainerIndex(row: Int) -> Int {
return items[row].containerIndex
}
}

5
iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json
View file

@ -97,6 +97,11 @@
"idiom" : "ipad",
"filename" : "83.5x83.5@2x.png",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {

20
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -4773,7 +4773,7 @@
};
6741A93D1BF340DE002C974C = {
DevelopmentTeam = 3T6FSDE8C7;
LastSwiftMigration = 0820;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.Push = {
@ -7098,7 +7098,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "i386 x86_64";
VERSIONING_SYSTEM = "apple-generic";
@ -7203,7 +7204,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv7 armv7s arm64";
VERSIONING_SYSTEM = "apple-generic";
@ -7310,7 +7312,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv7 armv7s arm64";
@ -7418,7 +7421,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv7 armv7s arm64";
@ -7527,7 +7531,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv7 armv7s arm64";
VERSIONING_SYSTEM = "apple-generic";
@ -7636,7 +7641,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "i386 x86_64";
VERSIONING_SYSTEM = "apple-generic";

4
iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/ci.MAPS.ME.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
@ -45,6 +46,7 @@
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"

6
iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/scheme_cmMAPS.ME.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
@ -42,9 +43,10 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"

38
iphone/Maps/UI/Ads/AdBanner.swift
View file

@ -12,14 +12,14 @@ enum AdBannerState: Int {
switch self {
case .unset:
assert(false)
return (priority: 0, numberOfTitleLines: 0, numberOfBodyLines: 0)
return (priority: UILayoutPriority(rawValue: 0), numberOfTitleLines: 0, numberOfBodyLines: 0)
case .compact:
return alternative(iPhone: (priority: UILayoutPriorityDefaultLow, numberOfTitleLines: 1, numberOfBodyLines: 2),
iPad: (priority: UILayoutPriorityDefaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0))
return alternative(iPhone: (priority: UILayoutPriority.defaultLow, numberOfTitleLines: 1, numberOfBodyLines: 2),
iPad: (priority: UILayoutPriority.defaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0))
case .search:
return (priority: UILayoutPriorityDefaultLow, numberOfTitleLines: 2, numberOfBodyLines: 0)
return (priority: UILayoutPriority.defaultLow, numberOfTitleLines: 2, numberOfBodyLines: 0)
case .detailed:
return (priority: UILayoutPriorityDefaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0)
return (priority: UILayoutPriority.defaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0)
}
}
}
@ -41,9 +41,9 @@ final class AdBanner: UITableViewCell {
@IBOutlet private weak var adCallToActionButtonDetailed: UIButton!
@IBOutlet private weak var adCallToActionButtonCustom: UIButton!
@IBOutlet private weak var adPrivacyButton: UIButton!
static let detailedBannerExcessHeight: Float = 36
@objc static let detailedBannerExcessHeight: Float = 36
var state = AdBannerState.unset {
@objc var state = AdBannerState.unset {
didSet {
guard state != .unset else {
adPrivacyButton.isHidden = true
@ -63,7 +63,7 @@ final class AdBanner: UITableViewCell {
}
}
weak var mpNativeAd: MPNativeAd?
@objc weak var mpNativeAd: MPNativeAd?
override func prepareForReuse() {
adIconImageView.af_cancelImageRequest()
@ -86,7 +86,7 @@ final class AdBanner: UITableViewCell {
state = .unset
}
func config(ad: MWMBanner, containerType: AdBannerContainerType) {
@objc func config(ad: MWMBanner, containerType: AdBannerContainerType) {
reset()
switch containerType {
case .placePage:
@ -110,7 +110,7 @@ final class AdBanner: UITableViewCell {
}
}
func highlightButton() {
@objc func highlightButton() {
adCallToActionButtonDetailed.setBackgroundImage(nil, for: .normal)
adCallToActionButtonCompact.setBackgroundImage(nil, for: .normal)
@ -150,9 +150,9 @@ final class AdBanner: UITableViewCell {
paragraphStyle.lineBreakMode = .byTruncatingTail
let adTitle = NSAttributedString(string: ad.title ?? "",
attributes: [
NSParagraphStyleAttributeName: paragraphStyle,
NSFontAttributeName: UIFont.bold12(),
NSForegroundColorAttributeName: UIColor.blackSecondaryText(),
NSAttributedStringKey.paragraphStyle: paragraphStyle,
NSAttributedStringKey.font: UIFont.bold12(),
NSAttributedStringKey.foregroundColor: UIColor.blackSecondaryText(),
])
adTitleLabel.attributedText = adTitle
adBodyLabel.text = ad.body ?? ""
@ -172,9 +172,9 @@ final class AdBanner: UITableViewCell {
paragraphStyle.lineBreakMode = .byTruncatingTail
let adTitle = NSAttributedString(string: banner.title ?? "",
attributes: [
NSParagraphStyleAttributeName: paragraphStyle,
NSFontAttributeName: UIFont.bold12(),
NSForegroundColorAttributeName: UIColor.blackSecondaryText(),
NSAttributedStringKey.paragraphStyle: paragraphStyle,
NSAttributedStringKey.font: UIFont.bold12(),
NSAttributedStringKey.foregroundColor: UIColor.blackSecondaryText(),
])
adTitleLabel.attributedText = adTitle
adBodyLabel.text = banner.descriptionText ?? ""
@ -204,9 +204,9 @@ final class AdBanner: UITableViewCell {
paragraphStyle.lineBreakMode = .byTruncatingTail
let adTitle = NSAttributedString(string: ad.title,
attributes: [
NSParagraphStyleAttributeName: paragraphStyle,
NSFontAttributeName: UIFont.bold12(),
NSForegroundColorAttributeName: UIColor.blackSecondaryText(),
NSAttributedStringKey.paragraphStyle: paragraphStyle,
NSAttributedStringKey.font: UIFont.bold12(),
NSAttributedStringKey.foregroundColor: UIColor.blackSecondaryText(),
])
adTitleLabel.attributedText = adTitle
adBodyLabel.text = ad.text

4
iphone/Maps/UI/Appearance/ThemeManager.swift
View file

@ -43,11 +43,11 @@ final class ThemeManager: NSObject {
}
}
static func invalidate() {
@objc static func invalidate() {
instance.update(theme: MWMSettings.theme())
}
static var autoUpdates: Bool {
@objc static var autoUpdates: Bool {
get {
return instance.timer != nil
}

2
iphone/Maps/UI/AvailableArea/AvailableArea.swift
View file

@ -88,7 +88,7 @@ class AvailableArea: UIView {
func isAreaAffectingView(_: UIView) -> Bool { return false }
func addAffectingView(_: UIView) {}
func notifyObserver() {}
@objc func notifyObserver() {}
}
extension MWMAvailableAreaAffectDirections: Hashable {

2
iphone/Maps/UI/AvailableArea/MenuArea.swift
View file

@ -15,7 +15,7 @@ final class MenuArea: AvailableArea {
}
extension UIView {
var menuAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
@objc var menuAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
var menuAreaAffectView: UIView { return self }
}

2
iphone/Maps/UI/AvailableArea/PlacePageArea.swift
View file

@ -15,7 +15,7 @@ final class PlacePageArea: AvailableArea {
}
extension UIView {
var placePageAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
@objc var placePageAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
var placePageAreaAffectView: UIView { return self }
}

2
iphone/Maps/UI/AvailableArea/SideButtonsArea.swift
View file

@ -17,7 +17,7 @@ final class SideButtonsArea: AvailableArea {
}
extension UIView {
var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
@objc var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
var sideButtonsAreaAffectView: UIView { return self }
}

2
iphone/Maps/UI/AvailableArea/TrafficButtonArea.swift
View file

@ -15,7 +15,7 @@ final class TrafficButtonArea: AvailableArea {
}
extension UIView {
var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
@objc var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
var trafficButtonAreaAffectView: UIView { return self }
}

2
iphone/Maps/UI/AvailableArea/VisibleArea.swift
View file

@ -15,7 +15,7 @@ final class VisibleArea: AvailableArea {
}
extension UIView {
var visibleAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
@objc var visibleAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
var visibleAreaAffectView: UIView { return self }
}

2
iphone/Maps/UI/AvailableArea/WidgetsArea.swift
View file

@ -15,7 +15,7 @@ final class WidgetsArea: AvailableArea {
}
extension UIView {
var widgetsAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
@objc var widgetsAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] }
var widgetsAreaAffectView: UIView { return self }
}

2
iphone/Maps/UI/Downloader/NoMaps/DownloaderNoResultsEmbedViewController.swift
View file

@ -10,7 +10,7 @@ final class DownloaderNoResultsEmbed: UINavigationController {
case noSearchResults
}
var screen = Screen.noMaps {
@objc var screen = Screen.noMaps {
didSet {
let controller: MWMViewController
switch screen {

2
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View file

@ -270,7 +270,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
auto & f = GetFramework();
auto const & featureID = m_mapObject.GetID();
NSDictionary<NSString *, NSString *> * info = @{
NSDictionary * info = @{
kStatEditorMWMName : @(featureID.GetMwmName().c_str()),
kStatEditorMWMVersion : @(featureID.GetMwmVersion())
};

4
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPFacilityCell.swift
View file

@ -1,8 +1,8 @@
@objc (MWMPPFacilityCell)
@objc(MWMPPFacilityCell)
final class PPFacilityCell: MWMTableViewCell {
@IBOutlet private var facility: UILabel!
func config(with str:String) {
@objc func config(with str: String) {
facility.text = str
}
}

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelCarouselCell.swift
View file

@ -16,7 +16,7 @@ final class PPHotelCarouselCell: MWMTableViewCell {
fileprivate let kMaximumNumberOfPhotos = 5
fileprivate weak var delegate: MWMPlacePageButtonsProtocol?
func config(with ds: [GalleryItemModel], delegate d: MWMPlacePageButtonsProtocol?) {
@objc func config(with ds: [GalleryItemModel], delegate d: MWMPlacePageButtonsProtocol?) {
dataSource = ds
delegate = d
collectionView.contentOffset = .zero

8
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelDescriptionCell.swift
View file

@ -9,7 +9,7 @@ final class PPHotelDescriptionCell: MWMTableViewCell {
private weak var updateDelegate: MWMPlacePageCellUpdateProtocol?
private var isNeedToForceLayout: Bool = false
func config(with description: String, delegate: MWMPlacePageCellUpdateProtocol) {
@objc func config(with description: String, delegate: MWMPlacePageCellUpdateProtocol) {
descriptionText.text = description
descriptionText.sizeToFit()
updateDelegate = delegate
@ -23,7 +23,7 @@ final class PPHotelDescriptionCell: MWMTableViewCell {
isNeedToForceLayout = false
let isCompact = descriptionText.height > kMaximumDescriptionHeight
if isCompact {
compactModeConstraints.forEach { $0.priority = UILayoutPriorityDefaultHigh }
compactModeConstraints.forEach { $0.priority = UILayoutPriority.defaultHigh }
}
hideButton(!isCompact)
@ -32,11 +32,11 @@ final class PPHotelDescriptionCell: MWMTableViewCell {
private func hideButton(_ isHidden: Bool = true) {
button.isHidden = isHidden
buttonZeroHeight.priority = isHidden ? UILayoutPriorityDefaultHigh : UILayoutPriorityDefaultLow
buttonZeroHeight.priority = isHidden ? UILayoutPriority.defaultHigh : UILayoutPriority.defaultLow
}
@IBAction private func tap() {
compactModeConstraints.forEach { $0.priority = UILayoutPriorityDefaultLow }
compactModeConstraints.forEach { $0.priority = UILayoutPriority.defaultLow }
hideButton()
setNeedsLayout()
UIView.animate(withDuration: kDefaultAnimationDuration, animations: { [weak self] in

3
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPReviewHeaderCell.swift
View file

@ -3,9 +3,8 @@ final class PPReviewHeaderCell: UITableViewCell {
@IBOutlet private var rating: UILabel!
@IBOutlet private var count: UILabel!
func config(with rate: String, numberOfReviews: Int) {
@objc func config(with rate: String, numberOfReviews: Int) {
rating.text = rate
count.text = String(format: L("booking_based_on_reviews"), numberOfReviews)
}
}

4
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/CianElement.swift
View file

@ -138,13 +138,13 @@ final class CianElement: UICollectionViewCell {
private func configPending() {
isSpinning = true
details.setTitle(L("preloader_cian_button"), for: .normal)
pendingTitleTopOffset.priority = UILayoutPriorityDefaultLow
pendingTitleTopOffset.priority = UILayoutPriority.defaultLow
}
private func configError() {
isSpinning = false
details.setTitle(L("preloader_cian_button"), for: .normal)
pendingTitleTopOffset.priority = UILayoutPriorityDefaultHigh
pendingTitleTopOffset.priority = UILayoutPriority.defaultHigh
}
private func configOffer(model: CianItemModel?) {

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/CianItemModel.swift
View file

@ -5,7 +5,7 @@ final class CianItemModel: NSObject {
let pageURL: URL
let address: String
init(roomsCount: UInt, priceRur: UInt, pageURL: URL, address: String) {
@objc init(roomsCount: UInt, priceRur: UInt, pageURL: URL, address: String) {
self.roomsCount = roomsCount
self.priceRur = priceRur
self.pageURL = pageURL

4
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Cian/PPCianCarouselCell.swift
View file

@ -19,7 +19,7 @@ final class PPCianCarouselCell: MWMTableViewCell {
}
@IBOutlet private weak var collectionView: UICollectionView!
var data: [CianItemModel]? {
@objc var data: [CianItemModel]? {
didSet {
updateCollectionView { [weak self] in
self?.collectionView.reloadSections(IndexSet(integer: 0))
@ -32,7 +32,7 @@ final class PPCianCarouselCell: MWMTableViewCell {
fileprivate var statisticsParameters: [AnyHashable: Any] { return [kStatProvider: kStatCian] }
func config(delegate d: MWMPlacePageButtonsProtocol?) {
@objc func config(delegate d: MWMPlacePageButtonsProtocol?) {
delegate = d
collectionView.contentOffset = .zero
collectionView.delegate = self

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryViewController.swift
View file

@ -3,7 +3,7 @@ final class GalleryViewController: MWMCollectionViewController {
typealias Cell = GalleryCell
typealias Model = GalleryModel
static func instance(model: Model) -> GalleryViewController {
@objc static func instance(model: Model) -> GalleryViewController {
let vc = GalleryViewController(nibName: toString(self), bundle: nil)
vc.model = model
return vc

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryItemModel.swift
View file

@ -3,7 +3,7 @@ final class GalleryItemModel: NSObject {
let imageURL: URL
let previewURL: URL
init(imageURL: URL, previewURL: URL) {
@objc init(imageURL: URL, previewURL: URL) {
self.imageURL = imageURL
self.previewURL = previewURL
}

4
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryModel.swift
View file

@ -1,9 +1,9 @@
@objc(MWMGalleryModel)
final class GalleryModel: NSObject {
let title: String
let items: [GalleryItemModel]
@objc let items: [GalleryItemModel]
init(title: String, items: [GalleryItemModel]) {
@objc init(title: String, items: [GalleryItemModel]) {
self.title = title
self.items = items
}

50
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Photos/PhotosInteractionAnimator.swift
View file

@ -32,8 +32,36 @@ final class PhotosInteractionAnimator: NSObject {
}
}
private func finalBackgroundAlpha(isDismissing: Bool) -> CGFloat {
return isDismissing ? 0 : 1
}
fileprivate func panEstimation(_ isDismissing: Bool, _ fromViewMidY: CGFloat, _ modifier: CGFloat, _ fromViewHeight: CGFloat, _ fromViewCenterX: CGFloat, _ viewToPanCenterY: CGFloat, _ velocityY: CGFloat, _ anchorPoint: CGPoint) -> (CGPoint, TimeInterval) {
let finalPageViewCenterPoint: CGPoint
let animationDuration: TimeInterval
if isDismissing {
let finalCenterY = fromViewMidY + modifier * fromViewHeight
finalPageViewCenterPoint = CGPoint(x: fromViewCenterX, y: finalCenterY)
let duration = TimeInterval(abs((finalPageViewCenterPoint.y - viewToPanCenterY) / velocityY))
animationDuration = min(duration, Settings.panDismissMaximumDuration)
} else {
finalPageViewCenterPoint = anchorPoint
animationDuration = TimeInterval(abs(velocityY) * Settings.returnToCenterVelocityAnimationRatio) + kDefaultAnimationDuration
}
return (finalPageViewCenterPoint, animationDuration)
}
private func finishPanWith(transitionContext: UIViewControllerContextTransitioning, velocityY: CGFloat, verticalDelta: CGFloat, viewToPan: UIView, fromView: UIView, anchorPoint: CGPoint) {
let dismissDistance = Settings.panDismissDistanceRatio * fromView.bounds.height
let fromViewHeight = fromView.bounds.height
let fromViewMidY = fromView.bounds.midY
let fromViewCenterX = fromView.center.x
let viewToPanCenterY = viewToPan.center.y
let modifier: CGFloat = verticalDelta.sign == .plus ? 1 : -1
let dismissDistance = Settings.panDismissDistanceRatio * fromViewHeight
let isDismissing = abs(verticalDelta) > dismissDistance
if isDismissing, shouldAnimateUsingAnimator, let animator = animator {
@ -42,24 +70,8 @@ final class PhotosInteractionAnimator: NSObject {
return
}
let finalPageViewCenterPoint: CGPoint
let animationDuration: TimeInterval
let finalBackgroundAlpha: CGFloat
if isDismissing {
let modifier: CGFloat = verticalDelta.sign == .plus ? 1 : -1
let finalCenterY = fromView.bounds.midY + modifier * fromView.bounds.height
finalPageViewCenterPoint = CGPoint(x: fromView.center.x, y: finalCenterY)
let duration = TimeInterval(abs(finalPageViewCenterPoint.y - viewToPan.center.y) / abs(velocityY))
animationDuration = min(duration, Settings.panDismissMaximumDuration)
finalBackgroundAlpha = 0.0
} else {
finalPageViewCenterPoint = anchorPoint
animationDuration = TimeInterval(abs(velocityY) * Settings.returnToCenterVelocityAnimationRatio) + kDefaultAnimationDuration
finalBackgroundAlpha = 1.0
}
let finalBackgroundColor = fromView.backgroundColor?.withAlphaComponent(finalBackgroundAlpha)
let (finalPageViewCenterPoint, animationDuration) = panEstimation(isDismissing, fromViewMidY, modifier, fromViewHeight, fromViewCenterX, viewToPanCenterY, velocityY, anchorPoint)
let finalBackgroundColor = fromView.backgroundColor?.withAlphaComponent(finalBackgroundAlpha(isDismissing: isDismissing))
finishPanWithoutAnimator(duration: animationDuration,
viewToPan: viewToPan,
fromView: fromView,

4
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Photos/PhotosViewController.swift
View file

@ -2,7 +2,7 @@ import UIKit
@objc(MWMPhotosViewController)
final class PhotosViewController: MWMViewController {
var referenceViewForPhotoWhenDismissingHandler: ((GalleryItemModel) -> UIView?)?
@objc var referenceViewForPhotoWhenDismissingHandler: ((GalleryItemModel) -> UIView?)?
private let pageViewController = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [UIPageViewControllerOptionInterPageSpacingKey: 16.0])
private(set) var photos: GalleryModel
@ -30,7 +30,7 @@ final class PhotosViewController: MWMViewController {
return currentPhotoViewController?.photo
}
init(photos: GalleryModel, initialPhoto: GalleryItemModel? = nil, referenceView: UIView? = nil) {
@objc init(photos: GalleryModel, initialPhoto: GalleryItemModel? = nil, referenceView: UIView? = nil) {
self.photos = photos
super.init(nibName: nil, bundle: nil)
initialSetupWithInitialPhoto(initialPhoto)

4
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift
View file

@ -1,6 +1,5 @@
@objc(MWMPlacePageTaxiCell)
final class PlacePageTaxiCell: MWMTableViewCell {
@IBOutlet private weak var icon: UIImageView!
@IBOutlet private weak var title: UILabel! {
didSet {
@ -8,6 +7,7 @@ final class PlacePageTaxiCell: MWMTableViewCell {
title.textColor = UIColor.blackPrimaryText()
}
}
@IBOutlet private weak var orderButton: UIButton! {
didSet {
let l = orderButton.layer
@ -24,7 +24,7 @@ final class PlacePageTaxiCell: MWMTableViewCell {
private weak var delegate: MWMPlacePageButtonsProtocol!
private var type: MWMPlacePageTaxiProvider!
func config(type: MWMPlacePageTaxiProvider, delegate: MWMPlacePageButtonsProtocol) {
@objc func config(type: MWMPlacePageTaxiProvider, delegate: MWMPlacePageButtonsProtocol) {
self.delegate = delegate
self.type = type
switch type {

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSelectImpressionCell.swift
View file

@ -3,7 +3,7 @@ final class UGCSelectImpressionCell: MWMTableViewCell {
@IBOutlet private var buttons: [UIButton]!
private weak var delegate: MWMPlacePageButtonsProtocol?
func configWith(delegate: MWMPlacePageButtonsProtocol?) {
@objc func configWith(delegate: MWMPlacePageButtonsProtocol?) {
self.delegate = delegate
}

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSpecificReviewCell.swift
View file

@ -10,7 +10,7 @@ final class UGCSpecificReviewCell: MWMTableViewCell {
private var indexPath: NSIndexPath = NSIndexPath()
private var delegate: UGCSpecificReviewDelegate?
func configWith(specification: String, rate: Int, atIndexPath: NSIndexPath, delegate: UGCSpecificReviewDelegate?) {
@objc func configWith(specification: String, rate: Int, atIndexPath: NSIndexPath, delegate: UGCSpecificReviewDelegate?) {
self.specification.text = specification
self.delegate = delegate
indexPath = atIndexPath

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCTextReviewCell.swift
View file

@ -14,7 +14,7 @@ final class UGCTextReviewCell: MWMTableViewCell, UITextViewDelegate {
private weak var delegate: UGCTextReviewDelegate?
private var indexPath: NSIndexPath = NSIndexPath()
func configWith(delegate: UGCTextReviewDelegate?) {
@objc func configWith(delegate: UGCTextReviewDelegate?) {
self.delegate = delegate
setCount(textView.text.characters.count)
}

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ViatorCells/PPViatorCarouselCell.swift
View file

@ -23,7 +23,7 @@ final class PPViatorCarouselCell: MWMTableViewCell {
fileprivate var statisticsParameters: [AnyHashable: Any] { return [kStatProvider: kStatViator] }
func config(with ds: [ViatorItemModel], delegate d: MWMPlacePageButtonsProtocol?) {
@objc func config(with ds: [ViatorItemModel], delegate d: MWMPlacePageButtonsProtocol?) {
if ds.isEmpty {
Statistics.logEvent(kStatPlacepageSponsoredError, withParameters: statisticsParameters)
}

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ViatorCells/ViatorItemModel.swift
View file

@ -7,7 +7,7 @@ final class ViatorItemModel: NSObject {
let duration: String
let price: String
init(imageURL: URL, pageURL: URL, title: String, rating: Double, duration: String, price: String) {
@objc init(imageURL: URL, pageURL: URL, title: String, rating: Double, duration: String, price: String) {
self.imageURL = imageURL
self.pageURL = pageURL
self.title = title

3
iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift
View file

@ -1,6 +1,5 @@
@objc(MWMFilterCollectionHolderCell)
final class FilterCollectionHolderCell: MWMTableViewCell {
@IBOutlet weak var collectionView: UICollectionView!
@IBOutlet private weak var collectionViewHeight: NSLayoutConstraint!
private weak var tableView: UITableView?
@ -22,7 +21,7 @@ final class FilterCollectionHolderCell: MWMTableViewCell {
collectionViewHeight.constant = collectionView.contentSize.height
}
func config(tableView: UITableView?) {
@objc func config(tableView: UITableView?) {
layout()
collectionView.allowsMultipleSelection = true
isSeparatorHidden = true

6
iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift
View file

@ -1,9 +1,9 @@
@objc final class SettingsTableViewLinkCell: MWMTableViewCell {
@objc
final class SettingsTableViewLinkCell: MWMTableViewCell {
@IBOutlet fileprivate weak var title: UILabel!
@IBOutlet fileprivate weak var info: UILabel!
func config(title: String, info: String?) {
@objc func config(title: String, info: String?) {
backgroundColor = UIColor.white()
self.title.text = title

6
iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift
View file

@ -1,8 +1,8 @@
@objc final class SettingsTableViewSelectableCell: MWMTableViewCell {
@objc
final class SettingsTableViewSelectableCell: MWMTableViewCell {
@IBOutlet fileprivate weak var title: UILabel!
func config(title: String) {
@objc func config(title: String) {
backgroundColor = UIColor.white()
self.title.text = title

10
iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift
View file

@ -1,10 +1,10 @@
@objc protocol SettingsTableViewSwitchCellDelegate {
@objc
protocol SettingsTableViewSwitchCellDelegate {
func switchCell(_ cell: SettingsTableViewSwitchCell, didChangeValue value: Bool)
}
@objc final class SettingsTableViewSwitchCell: MWMTableViewCell {
@objc
final class SettingsTableViewSwitchCell: MWMTableViewCell {
@IBOutlet fileprivate weak var title: UILabel!
@IBOutlet fileprivate weak var switchButton: UISwitch! {
didSet {
@ -14,7 +14,7 @@
weak var delegate: SettingsTableViewSwitchCellDelegate?
func config(delegate: SettingsTableViewSwitchCellDelegate, title: String, isOn: Bool) {
@objc func config(delegate: SettingsTableViewSwitchCellDelegate, title: String, isOn: Bool) {
backgroundColor = UIColor.white()
self.delegate = delegate

3
iphone/Maps/UI/Storyboard/Storyboard.swift
View file

@ -12,8 +12,7 @@ enum Storyboard: Int {
}
extension UIStoryboard {
static func instance(_ id: Storyboard) -> UIStoryboard {
@objc static func instance(_ id: Storyboard) -> UIStoryboard {
let name: String
switch id {
case .authorization: name = "Authorization"

2
iphone/Maps/UI/Welcome/WelcomePageController.swift
View file

@ -33,7 +33,7 @@ final class WelcomePageController: UIPageViewController {
}
}
static func controller(parent: WelcomePageControllerProtocol) -> WelcomePageController? {
@objc static func controller(parent: WelcomePageControllerProtocol) -> WelcomePageController? {
let isFirstSession = Alohalytics.isFirstSession()
let welcomeKey = isFirstSession ? FirstLaunchController.key : WhatsNewController.key
guard UserDefaults.standard.bool(forKey: welcomeKey) == false else { return nil }

2
iphone/Maps/UI/Welcome/WelcomeProtocol.swift
View file

@ -39,7 +39,7 @@ extension WelcomeProtocolBase {
let size = pageController.view!.size
let (width, height) = (size.width, size.height)
let hideImage = (imageHeight.multiplier * height <= imageMinHeight.constant)
titleImageOffset.priority = hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh
titleImageOffset.priority = hideImage ? UILayoutPriority.defaultLow : UILayoutPriority.defaultHigh
image.isHidden = hideImage
containerWidth.constant = width
containerHeight.constant = height