From f0cc361833b6303729f843f3d332a2db13db317b Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 20 Jan 2017 18:09:07 +0300 Subject: [PATCH] [cleanup] [ios] Code cleanup. --- iphone/Maps/Common/Common.swift | 2 +- iphone/Maps/UI/Search/SearchBar.swift | 2 +- iphone/Maps/UI/Welcome/WelcomePageController.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iphone/Maps/Common/Common.swift b/iphone/Maps/Common/Common.swift index 418dd226eb..7e370eb4a8 100644 --- a/iphone/Maps/Common/Common.swift +++ b/iphone/Maps/Common/Common.swift @@ -4,7 +4,7 @@ fileprivate func IPAD() -> Bool { return UI_USER_INTERFACE_IDIOM() == .pad } func L(_ key: String) -> String { return NSLocalizedString(key, comment: "") } -func val(iPhone: T, iPad: T) -> T { return IPAD() ? iPad : iPhone } +func alternative(iPhone: T, iPad: T) -> T { return IPAD() ? iPad : iPhone } func iPadSpecific( _ f: () -> Void) { if IPAD() { diff --git a/iphone/Maps/UI/Search/SearchBar.swift b/iphone/Maps/UI/Search/SearchBar.swift index f4e1ba5d51..4340bb5e2d 100644 --- a/iphone/Maps/UI/Search/SearchBar.swift +++ b/iphone/Maps/UI/Search/SearchBar.swift @@ -2,5 +2,5 @@ import UIKit class SearchBar: SolidTouchView { - override var visibleAreaAffectDirection: VisibleArea.Direction { return val(iPhone: .top, iPad: .left) } + override var visibleAreaAffectDirection: VisibleArea.Direction { return alternative(iPhone: .top, iPad: .left) } } diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift index 47dcf37c80..f6d31fa3d5 100644 --- a/iphone/Maps/UI/Welcome/WelcomePageController.swift +++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift @@ -105,8 +105,8 @@ final class WelcomePageController: UIPageViewController { private func updateFrame() { let parentView = parentController.view! - view.frame = val(iPhone: CGRect(origin: CGPoint(), size: parentView.size), - iPad: CGRect(x: parentView.center.x - 260, y: parentView.center.y - 300, width: 520, height: 600)) + view.frame = alternative(iPhone: CGRect(origin: CGPoint(), size: parentView.size), + iPad: CGRect(x: parentView.center.x - 260, y: parentView.center.y - 300, width: 520, height: 600)) (currentController as! WelcomeProtocolBase).updateSize() }