Skip to content

Swift 3 update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
borisyurkevich wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Swift 3 update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions LandscapeController_Swift/LandscapeController_Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
TargetAttributes = {
B28BDDD41D1866E100F071FB = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0830;
};
};
};
Expand Down Expand Up @@ -257,6 +258,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.olxios.landscape.LandscapeController-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -268,6 +270,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.olxios.landscape.LandscapeController-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
20 changes: 10 additions & 10 deletions LandscapeController_Swift/LandscapeController_Swift/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,36 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

// MARK: Application State

func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}

func applicationWillResignActive(application: UIApplication) {}
func applicationWillResignActive(_ application: UIApplication) {}

func applicationDidEnterBackground(application: UIApplication) {}
func applicationDidEnterBackground(_ application: UIApplication) {}

func applicationWillEnterForeground(application: UIApplication) {}
func applicationWillEnterForeground(_ application: UIApplication) {}

func applicationDidBecomeActive(application: UIApplication) {}
func applicationDidBecomeActive(_ application: UIApplication) {}

func applicationWillTerminate(application: UIApplication) {}
func applicationWillTerminate(_ application: UIApplication) {}

// MARK: Orientation

func application(application: UIApplication, supportedInterfaceOrientationsForWindow window: UIWindow?) -> UIInterfaceOrientationMask {
func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {

if self.window?.rootViewController?.presentedViewController is SecondViewController {

let secondController = self.window!.rootViewController!.presentedViewController as! SecondViewController

if secondController.isPresented {
return UIInterfaceOrientationMask.All;
return UIInterfaceOrientationMask.all;
} else {
return UIInterfaceOrientationMask.Portrait;
return UIInterfaceOrientationMask.portrait;
}
} else {
return UIInterfaceOrientationMask.Portrait;
return UIInterfaceOrientationMask.portrait;
}

}
Expand Down
2 changes: 1 addition & 1 deletion LandscapeController_Swift/LandscapeController_Swift/SecondViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class SecondViewController: UIViewController {
func dismiss() {

isPresented = false
self.presentingViewController!.dismissViewControllerAnimated(true, completion: nil);
self.presentingViewController!.dismiss(animated: true, completion: nil);
}

}