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

[cleanup] [ios] Code cleanup.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-01-20 16:57:34 +03:00
parent f011bb26c4
commit b9c2653a79
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
iphone/Maps/Common/Common.swift
View file

@ -1,5 +1,18 @@
import Foundation
func IPAD() -> Bool { return UI_USER_INTERFACE_IDIOM() == .pad }
fileprivate func IPAD() -> Bool { return UI_USER_INTERFACE_IDIOM() == .pad }
func L(_ key: String) -> String { return NSLocalizedString(key, comment: "") }
func val<T>(iPhone: T, iPad: T) -> T { return IPAD() ? iPad : iPhone }
func iPadSpecific( _ f: () -> Void) {
if IPAD() {
f()
}
}
func iPhoneSpecific( _ f: () -> Void) {
if !IPAD() {
f()
}
}

2
iphone/Maps/UI/Search/SearchBar.swift
View file

@ -2,5 +2,5 @@ import UIKit
class SearchBar: SolidTouchView {
override var visibleAreaAffectDirection: VisibleArea.Direction { return IPAD() ? .left : .top }
override var visibleAreaAffectDirection: VisibleArea.Direction { return val(iPhone: .top, iPad: .left) }
}

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

@ -50,7 +50,7 @@ final class WelcomePageController: UIPageViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor.white()
if IPAD() {
iPadSpecific {
let parentView = parentController.view!
iPadBackgroundView = SolidTouchView(frame: parentView.bounds)
iPadBackgroundView!.backgroundColor = UIColor.fadeBackground()
@ -105,7 +105,8 @@ final class WelcomePageController: UIPageViewController {
private func updateFrame() {
let parentView = parentController.view!
view.frame = IPAD() ? CGRect(x: parentView.center.x - 260, y: parentView.center.y - 300, width: 520, height: 600) : CGRect(origin: CGPoint(), size: parentView.size)
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))
(currentController as! WelcomeProtocolBase).updateSize()
}