diff --git a/LandscapeController_Swift/LandscapeController_Swift.xcodeproj/project.pbxproj b/LandscapeController_Swift/LandscapeController_Swift.xcodeproj/project.pbxproj index 7599245..1279755 100644 --- a/LandscapeController_Swift/LandscapeController_Swift.xcodeproj/project.pbxproj +++ b/LandscapeController_Swift/LandscapeController_Swift.xcodeproj/project.pbxproj @@ -94,7 +94,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0730; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = "Olga Dalton"; TargetAttributes = { B28BDDD41D1866E100F071FB = { @@ -175,13 +175,21 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -220,13 +228,21 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -245,6 +261,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.3; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -257,6 +274,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.olxios.landscape.LandscapeController-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -268,6 +286,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.olxios.landscape.LandscapeController-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/LandscapeController_Swift/LandscapeController_Swift/AppDelegate.swift b/LandscapeController_Swift/LandscapeController_Swift/AppDelegate.swift index d530e95..08f8ce9 100644 --- a/LandscapeController_Swift/LandscapeController_Swift/AppDelegate.swift +++ b/LandscapeController_Swift/LandscapeController_Swift/AppDelegate.swift @@ -15,36 +15,36 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // MARK: Application State - func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { + private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> 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; } } diff --git a/LandscapeController_Swift/LandscapeController_Swift/Assets.xcassets/AppIcon.appiconset/Contents.json b/LandscapeController_Swift/LandscapeController_Swift/Assets.xcassets/AppIcon.appiconset/Contents.json index 118c98f..19882d5 100644 --- a/LandscapeController_Swift/LandscapeController_Swift/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LandscapeController_Swift/LandscapeController_Swift/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -29,6 +39,11 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/LandscapeController_Swift/LandscapeController_Swift/SecondViewController.swift b/LandscapeController_Swift/LandscapeController_Swift/SecondViewController.swift index 68fd8c3..3ab3763 100644 --- a/LandscapeController_Swift/LandscapeController_Swift/SecondViewController.swift +++ b/LandscapeController_Swift/LandscapeController_Swift/SecondViewController.swift @@ -16,7 +16,7 @@ class SecondViewController: UIViewController { func dismiss() { isPresented = false - self.presentingViewController!.dismissViewControllerAnimated(true, completion: nil); + self.presentingViewController!.dismiss(animated: true, completion: nil); } }