gets rid of a lot of cruft that is no longer used, or is outdated. Al…

…so updated some files and code to make things easier.
izeni-team · Aug 1, 2016 · 38b9f74 · 38b9f74
1 parent 2289a11
commit 38b9f74
Show file tree

Hide file tree

Showing 28 changed files with 188 additions and 2,167 deletions.
diff --git a/Example/IZExample.xcodeproj/project.pbxproj b/Example/IZExample.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		349A34C31BF54F6500725CB2 /* IZExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349A34C21BF54F6500725CB2 /* IZExampleTests.swift */; };
 		349C52961D1B808B0015D5CE /* Izeni.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 349C52921D1B7A970015D5CE /* Izeni.framework */; };
 		8952BFBC84E3CB5BC1015646 /* Pods_IZExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FBFBEBD95B542FC91542896C /* Pods_IZExample.framework */; };
-		F3B9BFFE1CA2F8AB00114961 /* IZImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B9BFFD1CA2F8AB00114961 /* IZImagePicker.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -42,7 +41,6 @@
 		349C52921D1B7A970015D5CE /* Izeni.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Izeni.framework; path = Carthage/Build/iOS/Izeni.framework; sourceTree = "<group>"; };
 		8482029412CFB0FE2FEC0B5E /* Pods-IZExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IZExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IZExample/Pods-IZExample.debug.xcconfig"; sourceTree = "<group>"; };
 		C5E367BD269EB8D51276A0EF /* Pods-IZExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IZExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-IZExample/Pods-IZExample.release.xcconfig"; sourceTree = "<group>"; };
-		F3B9BFFD1CA2F8AB00114961 /* IZImagePicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IZImagePicker.swift; path = ../../Pod/Classes/IZImagePicker.swift; sourceTree = "<group>"; };
 		FBFBEBD95B542FC91542896C /* Pods_IZExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IZExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -91,7 +89,6 @@
 			children = (
 				349A34AA1BF54EE100725CB2 /* AppDelegate.swift */,
 				349A34AC1BF54EE100725CB2 /* ViewController.swift */,
-				F3B9BFFD1CA2F8AB00114961 /* IZImagePicker.swift */,
 				349A34AE1BF54EE100725CB2 /* Main.storyboard */,
 				349A34B11BF54EE100725CB2 /* Assets.xcassets */,
 				349A34B31BF54EE100725CB2 /* LaunchScreen.storyboard */,
@@ -140,8 +137,6 @@
 				349A34A51BF54EE100725CB2 /* Resources */,
 				B70F54C8C65D40DCFDFBD853 /* [CP] Embed Pods Frameworks */,
 				ADAC934E572BF3AC727253AE /* [CP] Copy Pods Resources */,
-				349C52951D1B7CFE0015D5CE /* ShellScript */,
-				349C52941D1B7A9F0015D5CE /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -230,33 +225,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		349C52941D1B7A9F0015D5CE /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/Izeni.framework",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks";
-		};
-		349C52951D1B7CFE0015D5CE /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "#/usr/local/bin/carthage build --platform \"$PLATFORM_NAME\" --project-directory \"$SRCROOT\"";
-		};
 		ADAC934E572BF3AC727253AE /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -309,7 +277,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F3B9BFFE1CA2F8AB00114961 /* IZImagePicker.swift in Sources */,
 				349A34AD1BF54EE100725CB2 /* ViewController.swift in Sources */,
 				349A34AB1BF54EE100725CB2 /* AppDelegate.swift in Sources */,
 			);

diff --git a/Example/IZExample/AppDelegate.swift b/Example/IZExample/AppDelegate.swift
@@ -10,7 +10,7 @@ import UIKit
 import Izeni
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate, IZNotificationUnifiedDelegate {
+class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
@@ -20,12 +20,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, IZNotificationUnifiedDele
 
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
         // Override point for customization after application launch.
-
-        let types: UIUserNotificationType = [.Badge, .Sound, .Alert]
-        let settings = UIUserNotificationSettings(forTypes: types, categories: nil)
-        UIApplication.sharedApplication().registerUserNotificationSettings(settings)
 
-        IZNotification.unifiedDelegate = self
 
         return true
     }
@@ -40,24 +35,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, IZNotificationUnifiedDele
 
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-
-        NSTimer.scheduledTimerWithTimeInterval(5, target: self, selector: #selector(AppDelegate.doThing), userInfo: nil, repeats: false)
-        task = application.beginBackgroundTaskWithExpirationHandler { () -> Void in
-
-        }
+
     }
 
-    var task = UIBackgroundTaskInvalid
 
     func applicationDidEnterBackground(application: UIApplication) {
 
     }
 
-    func doThing() {
-//        print("SHOW")
-//        IZNotification.showUnified("Title?", subtitle: "Subtitle?", data: ["String": "hello world"])
-    }
-
     func applicationWillEnterForeground(application: UIApplication) {
         // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
     }
@@ -69,7 +54,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate, IZNotificationUnifiedDele
     func applicationWillTerminate(application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
-
-
-}
-
+}
diff --git a/Example/IZExample/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/IZExample/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -59,6 +59,11 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/Example/IZExample/Assets.xcassets/Delicatearch1.imageset/Contents.json b/Example/IZExample/Assets.xcassets/Delicatearch1.imageset/Contents.json
diff --git a/Example/IZExample/Assets.xcassets/Delicatearch1.imageset/Delicatearch1.jpg b/Example/IZExample/Assets.xcassets/Delicatearch1.imageset/Delicatearch1.jpg
diff --git a/Example/IZExample/Base.lproj/LaunchScreen.storyboard b/Example/IZExample/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -15,7 +16,6 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <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>

diff --git a/Example/IZExample/Base.lproj/Main.storyboard b/Example/IZExample/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" 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="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -8,59 +8,10 @@
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="IZExample" 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"/>
-                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Delicatearch1" translatesAutoresizingMaskIntoConstraints="NO" id="xF4-dO-Csh">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                            </imageView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J8Q-Ge-hvs">
-                                <rect key="frame" x="235" y="285" width="130" height="30"/>
-                                <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <state key="normal" title="Open Image Picker"/>
-                                <connections>
-                                    <action selector="openImagePicker" destination="BYZ-38-t0r" eventType="touchUpInside" id="nzq-q3-Ass"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5xU-zJ-Vje">
-                                <rect key="frame" x="215" y="323" width="171" height="30"/>
-                                <state key="normal" title="Show Infinite Notification">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="showInfiniteNotification" destination="BYZ-38-t0r" eventType="touchUpInside" id="Ptv-lG-HPr"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="xF4-dO-Csh" firstAttribute="height" secondItem="8bC-Xf-vdC" secondAttribute="height" id="125-Oe-izd"/>
-                            <constraint firstItem="J8Q-Ge-hvs" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="B76-Mz-Yb3"/>
-                            <constraint firstItem="xF4-dO-Csh" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="DhW-7i-lzZ"/>
-                            <constraint firstItem="xF4-dO-Csh" firstAttribute="width" secondItem="8bC-Xf-vdC" secondAttribute="width" id="Osn-hF-rD5"/>
-                            <constraint firstItem="5xU-zJ-Vje" firstAttribute="top" secondItem="J8Q-Ge-hvs" secondAttribute="bottom" constant="8" id="dQ1-JL-Sh8"/>
-                            <constraint firstItem="xF4-dO-Csh" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="dRZ-HQ-t9g"/>
-                            <constraint firstItem="J8Q-Ge-hvs" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="kAL-ic-PZH"/>
-                            <constraint firstItem="5xU-zJ-Vje" firstAttribute="centerX" secondItem="J8Q-Ge-hvs" secondAttribute="centerX" id="mHN-gu-yn5"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="backgroundImage" destination="xF4-dO-Csh" id="eIq-om-0hn"/>
-                        <outlet property="openImagePickerButton" destination="J8Q-Ge-hvs" id="udk-eE-BLr"/>
-                    </connections>
-                </viewController>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="IZExample" customModuleProvider="target" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="598" y="325"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="Delicatearch1" width="1156" height="1045"/>
-    </resources>
 </document>
diff --git a/Example/IZExample/ViewController.swift b/Example/IZExample/ViewController.swift
@@ -28,35 +28,10 @@ class C: UIView, IZCellDynamicHeight {
     }
 }
 
-class ViewController: UIViewController, IZImagePickerDelegate {
-    @IBOutlet var openImagePickerButton: UIButton!
-    @IBOutlet weak var backgroundImage: UIImageView!
-
-    @IBAction func openImagePicker() {
-//        let picker = IZImagePicker.instance
-//        if picker.isIpad {
-//            picker.setPopoverSourceForIPad(openImagePickerButton)
-//        }
-//        picker.setCameraEnabled(false)
-//        picker.setLibraryEnabled(false)
-//        picker.pickImage(delegate: self, vc: self)
-//        
-//        
-        IZImagePicker.pickImage(delegate: self, vc: self, useCamera: true, useLibrary: true, preferFrontCamera: true, iPadPopoverSource: openImagePickerButton, aspectRatio: 1)
-
-
-//                ImagePicker.pickImage(from: self, popoverSource: openImagePickerButton, delegate: self)
-    }
-
-    @IBAction func showInfiniteNotification() {
-        IZNotification.showUnified("Title", subtitle: "Subtitle", data: [:], duration: NSTimeInterval.infinity, customizations: nil)
-    }
-
-    func imagePicked(image: UIImage) {
-        backgroundImage.image = image
-    }
-
-    func imagePickCancelled() {
-        print("Cancelled image pick")
+class ViewController: UIViewController {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        print("LOADED")
+        print(UIColor(hex: (0xFFFFFF + 1)))
     }
 }
diff --git a/Izeni.podspec b/Izeni.podspec
@@ -9,24 +9,23 @@
 
 Pod::Spec.new do |s|
   s.name             = "Izeni"
-  s.version          = "0.9.1"
+  s.version          = "0.10.0"
   s.summary          = "Izeni's common iOS code."
   s.description      = <<-DESC
                        All of izeni's common code for iOS.
                        DESC
-  s.homepage         = "https://dev.izeni.net/izeni/izcommon"
+  s.homepage         = "https://github.com/izeni-team/izeni-ios"
   s.license          = 'MIT'
   s.author           = { "bhenderson@izeni.com" => "bhenderson@izeni.com" }
-  s.source           = { :git => "https://dev.izeni.net/izeni/izcommon.git" }
+  s.source           = { :git => "https://github.com/izeni-team/izeni-ios.git" }
 
   s.platform     = :ios, '8.0'
   s.requires_arc = true
 
-  s.source_files = ['Pod/Classes/**/*', 'PEPhotoCropEditor/*.{h,m}']
+  s.source_files = ['Pod/Classes/**/*']
   s.resource_bundles = {
-    'Izeni' => ['Pod/Assets/*.png'],
-    'PEPhotoCropEditor' => ['PEPhotoCropEditor/PEPhotoCropEditor.bundle/**/*']
+    'Izeni' => ['Pod/Assets/*.png']
   }
 
-  s.frameworks = 'UIKit', 'MapKit'
+  s.frameworks = 'UIKit'
 end
diff --git a/Pod/Classes/ArrayMagic.swift b/Pod/Classes/ArrayMagic.swift