Swift 2 updated

Updated Panoramic control to be compatible with Swift 2.
iSame7 · Oct 27, 2015 · 21aba06 · 21aba06
1 parent bc35228
commit 21aba06
Show file tree

Hide file tree

Showing 14 changed files with 236 additions and 238 deletions.
diff --git a/Panoramic/Panoramic.xcodeproj/project.pbxproj b/Panoramic/Panoramic.xcodeproj/project.pbxproj
diff --git a/Panoramic/Panoramic.xcodeproj/project.xcworkspace/xcshareddata/Panoramic.xccheckout b/Panoramic/Panoramic.xcodeproj/project.xcworkspace/xcshareddata/Panoramic.xccheckout
diff --git a/Panoramic/Panoramic.xcodeproj/project.xcworkspace/xcshareddata/Panoramic.xcscmblueprint b/Panoramic/Panoramic.xcodeproj/project.xcworkspace/xcshareddata/Panoramic.xcscmblueprint
@@ -0,0 +1,27 @@
+{
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "D359FF3C54B1BAF14FF22A745D45A8C0CA649396" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "9E50FD57-17B8-4739-907B-CD1BBEC451FB",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "D359FF3C54B1BAF14FF22A745D45A8C0CA649396" : "Panoramic\/Panoramic\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "Panoramic",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Panoramic.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/iSame7\/Panoramic.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D359FF3C54B1BAF14FF22A745D45A8C0CA649396"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/iSame7\/Panoramic.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D359FF3C54B1BAF14FF22A745D45A8C0CA649396"
+    }
+  ]
+}
diff --git a/...codeproj/project.xcworkspace/xcuserdata/gbahig.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/gbahig.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Panoramic/Panoramic.xcodeproj/xcuserdata/gbahig.xcuserdatad/xcschemes/Panoramic.xcscheme b/Panoramic/Panoramic.xcodeproj/xcuserdata/gbahig.xcuserdatad/xcschemes/Panoramic.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "29C36C481A409688006A83A2"
+               BlueprintIdentifier = "29C36B461A3F5FC9006A83A2"
                BuildableName = "Panoramic.app"
                BlueprintName = "Panoramic"
                ReferencedContainer = "container:Panoramic.xcodeproj">
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "29C36C5D1A409688006A83A2"
+               BlueprintIdentifier = "29C36B5B1A3F5FC9006A83A2"
                BuildableName = "PanoramicTests.xctest"
                BlueprintName = "PanoramicTests"
                ReferencedContainer = "container:Panoramic.xcodeproj">
@@ -37,16 +37,16 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "29C36C5D1A409688006A83A2"
+               BlueprintIdentifier = "29C36B5B1A3F5FC9006A83A2"
                BuildableName = "PanoramicTests.xctest"
                BlueprintName = "PanoramicTests"
                ReferencedContainer = "container:Panoramic.xcodeproj">
@@ -56,27 +56,30 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C36C481A409688006A83A2"
+            BlueprintIdentifier = "29C36B461A3F5FC9006A83A2"
             BuildableName = "Panoramic.app"
             BlueprintName = "Panoramic"
             ReferencedContainer = "container:Panoramic.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C36C481A409688006A83A2"
+            BlueprintIdentifier = "29C36B461A3F5FC9006A83A2"
             BuildableName = "Panoramic.app"
             BlueprintName = "Panoramic"
             ReferencedContainer = "container:Panoramic.xcodeproj">
@@ -86,16 +89,16 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "29C36C481A409688006A83A2"
+            BlueprintIdentifier = "29C36B461A3F5FC9006A83A2"
             BuildableName = "Panoramic.app"
             BlueprintName = "Panoramic"
             ReferencedContainer = "container:Panoramic.xcodeproj">

diff --git a/...amic/Panoramic.xcodeproj/xcuserdata/gbahig.xcuserdatad/xcschemes/xcschememanagement.plist b/...amic/Panoramic.xcodeproj/xcuserdata/gbahig.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,12 +12,12 @@
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
-		<key>29C36C481A409688006A83A2</key>
+		<key>29C36B461A3F5FC9006A83A2</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
-		<key>29C36C5D1A409688006A83A2</key>
+		<key>29C36B5B1A3F5FC9006A83A2</key>
 		<dict>
 			<key>primary</key>
 			<true/>

diff --git a/Panoramic/Panoramic/AppDelegate.swift b/Panoramic/Panoramic/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  Panoramic
 //
-//  Created by Sameh Mabrouk on 12/16/14.
+//  Created by Sameh Mabrouk on 12/15/14.
 //  Copyright (c) 2014 SMApps. All rights reserved.
 //
 
@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-     var panoramaVC : PanoramaViewController? = PanoramaViewController()
+        let panoramaVC : PanoramaViewController? = PanoramaViewController()
         window = UIWindow(frame: UIScreen.mainScreen().bounds)
         if let window = window {
             window.backgroundColor = UIColor.orangeColor()

diff --git a/Panoramic/Panoramic/Info.plist b/Panoramic/Panoramic/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.smapps.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Panoramic/Panoramic/PanoramaIndicator.swift b/Panoramic/Panoramic/PanoramaIndicator.swift
@@ -21,7 +21,7 @@ extension UIScrollView{
 
     //MARK: Getters/Setters
     func setViewForPanoramaIndicator(viewScrollIndicator:UIView){
-        objc_setAssociatedObject(self, &viewScrollIndicatorKey, viewScrollIndicator, UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+        objc_setAssociatedObject(self, &viewScrollIndicatorKey, viewScrollIndicator, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
     }
 
     func getViewForPanoramaIndicator() -> UIView?{
@@ -30,7 +30,8 @@ extension UIScrollView{
     }
     func setBackgroundViewForPanoramaIndicator(backgroundViewScrollIndicator:UIView){
 
-        objc_setAssociatedObject(self, &backgroundViewScrollIndicatorKey, backgroundViewScrollIndicator, UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+        objc_setAssociatedObject(self, &backgroundViewScrollIndicatorKey, backgroundViewScrollIndicator, .OBJC_ASSOCIATION_RETAIN)
+        objc_setAssociatedObject(dismissed, &key, nil, .OBJC_ASSOCIATION_RETAIN)
 
     }
     func getBackgroundViewForPanoramaIndicator()-> UIView?{
@@ -85,7 +86,7 @@ extension UIScrollView{
     func refreshBackgroundPanoramaIndicator(){
 
         let backgroundViewScrollIndicator:UIView = self.getBackgroundViewForPanoramaIndicator()!
-        var x:CGFloat = self.contentOffset.x + ScrollIndicatorLeftRightThreshold
+        let x:CGFloat = self.contentOffset.x + ScrollIndicatorLeftRightThreshold
         let rect:CGRect = CGRect(x: x, y: backgroundViewScrollIndicator.frame.origin.y, width: backgroundViewScrollIndicator.frame.width, height: backgroundViewScrollIndicator.frame.height)
         backgroundViewScrollIndicator.frame = rect
     }
@@ -94,14 +95,14 @@ extension UIScrollView{
 
         let viewScrollIndicator:UIView = self.getViewForPanoramaIndicator()!
         let percent:CGFloat = self.contentOffset.x / self.contentSize.width
-        var x:CGFloat =  self.contentOffset.x + ((self.bounds.size.width - ScrollIndicatorLeftRightThreshold) * percent) + ScrollIndicatorLeftRightThreshold
+        let x:CGFloat =  self.contentOffset.x + ((self.bounds.size.width - ScrollIndicatorLeftRightThreshold) * percent) + ScrollIndicatorLeftRightThreshold
         let rect:CGRect = CGRect(x: x, y: viewScrollIndicator.frame.origin.y, width: viewScrollIndicator.frame.width, height: viewScrollIndicator.frame.height)
         viewScrollIndicator.frame = rect
 
     }
 
     func disablePanoramaIndicator(){
-    println("disablePanoramaIndicator")
+    print("disablePanoramaIndicator")
         self.stopObservers()
         self.getBackgroundViewForPanoramaIndicator()?.removeFromSuperview()
         self.getViewForPanoramaIndicator()?.removeFromSuperview()
@@ -110,8 +111,8 @@ extension UIScrollView{
     //MARK: KVO
     func setupObservers(){
 
-        self.addObserver(self, forKeyPath:"contentSize", options: NSKeyValueObservingOptions.New | NSKeyValueObservingOptions.Old , context: nil)
-        self.addObserver(self, forKeyPath:"contentOffset", options: NSKeyValueObservingOptions.New | NSKeyValueObservingOptions.Old , context: nil)
+        self.addObserver(self, forKeyPath:"contentSize", options: [NSKeyValueObservingOptions.New, NSKeyValueObservingOptions.Old] , context: nil)
+        self.addObserver(self, forKeyPath:"contentOffset", options: [NSKeyValueObservingOptions.New, NSKeyValueObservingOptions.Old] , context: nil)
     }
 
     func stopObservers(){
@@ -121,7 +122,7 @@ extension UIScrollView{
 
     }
 
-    override public func observeValueForKeyPath(keyPath: String, ofObject object: AnyObject, change: [NSObject : AnyObject], context: UnsafeMutablePointer<Void>) {
+    override public func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>) {
 
         if self.contentSize.width > 0.0{