Swift 2.0

MarkingMenu.xcodeproj/project.pbxproj

@@ -189,7 +189,8 @@
 		3E628E521B248BDB00A9E560 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Simon Gladman";
 				TargetAttributes = {
 					3E628E591B248BDB00A9E560 = {
@@ -314,6 +315,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -329,7 +331,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -369,7 +371,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = MarkingMenu/Header.h;
@@ -384,6 +386,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = MarkingMenu/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.flexmonkey.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 2;
 			};
@@ -395,6 +398,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = MarkingMenu/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.flexmonkey.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 2;
 			};
@@ -414,6 +418,7 @@
 				);
 				INFOPLIST_FILE = MarkingMenuTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.flexmonkey.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarkingMenu.app/MarkingMenu";
 			};
@@ -429,6 +434,7 @@
 				);
 				INFOPLIST_FILE = MarkingMenuTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.flexmonkey.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarkingMenu.app/MarkingMenu";
 			};

MarkingMenu/Base.lproj/Main.storyboard

@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8121.20" systemVersion="15A204h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8101.16"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="MarkingMenu" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                 </viewController>

MarkingMenu/FMMarkingMenu.swift

@@ -22,15 +22,17 @@ import UIKit
 
 class FMMarkingMenu: NSObject
 {
-    let markingMenuContentViewController: FMMarkingMenuContentViewController
-
-    let markingMenuItems:[FMMarkingMenuItem]
+    var markingMenuItems:[FMMarkingMenuItem]
+    var layoutMode = FMMarkingMenuLayoutMode.SemiCircular
+    var launchMode = FMMarkingMenuLaunchMode.OpenAtTouchLocation
+    var visualiseTouches: Bool = false
 
+    let markingMenuContentViewController: FMMarkingMenuContentViewController
     let viewController: UIViewController
     let view: UIView
 
-    var tap: FMMarkingMenuPanGestureRecognizer!
-    var previousTouchLocation = CGPointZero
+    private var tap: FMMarkingMenuPanGestureRecognizer!
+    private var previousTouchLocation = CGPointZero
 
     weak var markingMenuDelegate: FMMarkingMenuDelegate?
     {
@@ -44,8 +46,7 @@ class FMMarkingMenu: NSObject
     {
         self.markingMenuItems = markingMenuItems
 
-        let markingMenuOrigin = CGPoint(x: view.frame.width / 2, y: view.frame.height / 2)
-        markingMenuContentViewController = FMMarkingMenuContentViewController(origin: markingMenuOrigin)
+        markingMenuContentViewController = FMMarkingMenuContentViewController()
 
         self.viewController = viewController
         self.view = view
@@ -55,7 +56,8 @@ class FMMarkingMenu: NSObject
 
         markingMenuContentViewController.markingMenu = self
 
-        tap = FMMarkingMenuPanGestureRecognizer(target: self, action: "tapHandler:")
+        tap = FMMarkingMenuPanGestureRecognizer(target: self, action: "tapHandler:", markingMenu: self)
+
         view.addGestureRecognizer(tap)
     }
 
@@ -68,11 +70,12 @@ class FMMarkingMenu: NSObject
     {
         if recognizer.state == UIGestureRecognizerState.Began
         {
-            open(recognizer.locationInView(view))
+            // nothing to do here, FMMarkingMenuPanGestureRecognizer
+            // invokes open() on touchesBegan
         }
         else if recognizer.state == UIGestureRecognizerState.Changed
         {
-            markingMenuContentViewController.handleMovement(recognizer.locationInView(view))
+            markingMenuContentViewController.handleMovement(recognizer.locationInView(view), targetView: view)
         }
         else
         {
@@ -86,20 +89,66 @@ class FMMarkingMenu: NSObject
         viewController.dismissViewControllerAnimated(false, completion: nil)
     }
 
-    private func open(locationInView: CGPoint)
-    {
+    func open(locationInView: CGPoint)
+    {        
         markingMenuContentViewController.modalPresentationStyle = UIModalPresentationStyle.OverCurrentContext
         markingMenuContentViewController.modalTransitionStyle = UIModalTransitionStyle.CrossDissolve
 
         markingMenuContentViewController.view.frame = view.bounds
 
+        markingMenuContentViewController.layoutMode = layoutMode
+
         viewController.presentViewController(markingMenuContentViewController, animated: false)
         {
-            let markingMenuOrigin = CGPoint(x: self.view.frame.width / 2, y: self.view.frame.height / 2)
+            let markingMenuOrigin: CGPoint
+
+            if self.launchMode == .OpenAtScreenCentre
+            {
+                markingMenuOrigin = CGPoint(x: self.view.frame.width / 2, y: self.view.frame.height / 2)
+            }
+            else
+            {
+                markingMenuOrigin = self.view.convertPoint(locationInView, toView: self.viewController.view)
+            }
+
             self.markingMenuContentViewController.origin = markingMenuOrigin
-            self.markingMenuContentViewController.openMarkingMenu(locationInView, markingMenuItems: self.markingMenuItems)
+            self.markingMenuContentViewController.openMarkingMenu(locationInView, markingMenuItems: self.markingMenuItems, targetView: self.view)
         }
     }
+
+    // MARK: Utilities...
+
+    static func setExclusivelySelected(markingMenuItem: FMMarkingMenuItem, markingMenuItems: [FMMarkingMenuItem])
+    {
+        let items = getMenuItemsByCategory(markingMenuItem.category!, markingMenuItems: markingMenuItems)
+
+        for item in items where item !== markingMenuItem
+        {
+            item.isSelected = false
+        }
+
+        markingMenuItem.isSelected = true
+    }
+
+    static func getMenuItemsByCategory(category:String, markingMenuItems: [FMMarkingMenuItem]) -> [FMMarkingMenuItem]
+    {
+        var returnArray = [FMMarkingMenuItem]()
+
+        for item in markingMenuItems
+        {
+            if item.category == category
+            {
+                returnArray.append(item)
+            }
+
+            if let subItems = item.subItems
+            {
+                returnArray.appendContentsOf(FMMarkingMenu.getMenuItemsByCategory(category, markingMenuItems: subItems))
+            }
+        }
+
+        return returnArray
+    }
 }