Skip to content

Commit e95aad8

Browse files
Have a single framework
1 parent e45d5c1 commit e95aad8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+688
-909
lines changed

Diff for: C4Core/C4Core.h renamed to C4/C4.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#import <Foundation/Foundation.h>
2121
#import <CoreGraphics/CoreGraphics.h>
2222

23-
//! Project version number for C4Core.
24-
FOUNDATION_EXPORT double C4CoreVersionNumber;
23+
//! Project version number for C4.
24+
FOUNDATION_EXPORT double C4VersionNumber;
2525

26-
//! Project version string for C4Core.
27-
FOUNDATION_EXPORT const unsigned char C4CoreVersionString[];
26+
//! Project version string for C4.
27+
FOUNDATION_EXPORT const unsigned char C4VersionString[];
2828

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: C4Core/Info.plist renamed to C4/Info.plist

File renamed without changes.

Diff for: C4UI/C4Animation.swift renamed to C4/UI/C4Animation.swift

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
21-
import C4Core
2220
import Foundation
2321

2422
private let C4AnimationCompletedEvent = "C4AnimationCompleted"
File renamed without changes.

Diff for: C4UI/C4Arc.swift renamed to C4/UI/C4Arc.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
public class C4Arc : C4Shape {
2524
/**

Diff for: C4UI/C4AudioPlayer.swift renamed to C4/UI/C4AudioPlayer.swift

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
2120
import UIKit
2221
import AVFoundation
2322

Diff for: C4UI/C4CanvasController.swift renamed to C4/UI/C4CanvasController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
// IN THE SOFTWARE.
1919

2020
import UIKit
21-
import C4Core
2221

2322
public class C4CanvasController : UIViewController {
2423
/**

Diff for: C4UI/C4Circle.swift renamed to C4/UI/C4Circle.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4Circle: C4Ellipse {
2524
/**

Diff for: C4UI/C4Curve.swift renamed to C4/UI/C4Curve.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
public class C4Curve : C4Shape {
2524
/**

Diff for: C4UI/C4Ellipse.swift renamed to C4/UI/C4Ellipse.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4Ellipse: C4Shape {
2524
/**
File renamed without changes.

Diff for: C4UI/C4Font.swift renamed to C4/UI/C4Font.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
public class C4Font : NSObject {
2524
internal var internalFont: UIFont?
File renamed without changes.

Diff for: C4UI/C4Image+Crop.swift renamed to C4/UI/C4Image+Crop.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
extension C4Image {
2524
public func crop(rect: C4Rect) {

Diff for: C4UI/C4Image+Filter.swift renamed to C4/UI/C4Image+Filter.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
extension C4Image {
2524
public func apply(filter: C4Filter) {

Diff for: C4UI/C4Image+Generator.swift renamed to C4/UI/C4Image+Generator.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
extension C4Image {
2524
public func generate(generator: C4Generator) {

Diff for: C4UI/C4Image.swift renamed to C4/UI/C4Image.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
public class C4Image: C4View {
2524
//MARK: Initializers

Diff for: C4UI/C4Line.swift renamed to C4/UI/C4Line.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4Line: C4Polygon {
2524
/**

Diff for: C4UI/C4Movie.swift renamed to C4/UI/C4Movie.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322
import AVFoundation
2423
import CoreMedia
2524

Diff for: C4UI/C4Polygon.swift renamed to C4/UI/C4Polygon.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4Polygon: C4Shape {
2524
/**

Diff for: C4UI/C4QuadCurve.swift renamed to C4/UI/C4QuadCurve.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
public class C4QuadCurve : C4Curve {
2524
/**

Diff for: C4UI/C4Rectangle.swift renamed to C4/UI/C4Rectangle.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4Rectangle: C4Shape {
2524

Diff for: C4UI/C4RegularPolygon.swift renamed to C4/UI/C4RegularPolygon.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4RegularPolygon: C4Shape {
2524

Diff for: C4UI/C4Shape+Creation.swift renamed to C4/UI/C4Shape+Creation.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
/**
2524
Extension for C4Shape that provides functionality for adding elements to a receiver's path.

Diff for: C4UI/C4Shape.swift renamed to C4/UI/C4Shape.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
public class C4Shape: C4View {
2524

File renamed without changes.

Diff for: C4UI/C4Star.swift renamed to C4/UI/C4Star.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4Star: C4Polygon {
2524

Diff for: C4UI/C4TextShape.swift renamed to C4/UI/C4TextShape.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322
import Foundation
2423

2524
public class C4TextShape : C4Shape {

Diff for: C4UI/C4Triangle.swift renamed to C4/UI/C4Triangle.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import Foundation
2121
import CoreGraphics
22-
import C4Core
2322

2423
public class C4Triangle: C4Polygon {
2524
/**
File renamed without changes.

Diff for: C4UI/C4View+Border.swift renamed to C4/UI/C4View+Border.swift

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
2120
import CoreGraphics
2221

2322
/**

Diff for: C4UI/C4View+Shadow.swift renamed to C4/UI/C4View+Shadow.swift

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
2120
import CoreGraphics
2221

2322
/**

Diff for: C4UI/C4View.swift renamed to C4/UI/C4View.swift

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
2120
import UIKit
2221

2322
public class C4View : NSObject {
File renamed without changes.

Diff for: C4UI/C4Wedge.swift renamed to C4/UI/C4Wedge.swift

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import QuartzCore
2121
import UIKit
22-
import C4Core
2322

2423
public class C4Wedge : C4Shape {
2524
/**

Diff for: C4UI/Filters/C4Bloom.swift renamed to C4/UI/Filters/C4Bloom.swift

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20+
import CoreImage
21+
2022
public struct C4Bloom : C4Filter {
2123
public let filterName = "CIBloom"
2224
public var radius: Double = 10.0

Diff for: C4UI/Filters/C4Checkerboard.swift renamed to C4/UI/Filters/C4Checkerboard.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
20+
import CoreImage
2121

2222
public struct C4Checkerboard : C4Generator {
2323
public let filterName = "CICheckerboardGenerator"

Diff for: C4UI/Filters/C4ColorBurn.swift renamed to C4/UI/Filters/C4ColorBurn.swift

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20+
import CoreImage
21+
2022
public struct C4ColorBurn : C4Filter {
2123
public let filterName = "CIColorBurnBlendMode"
2224
public var background: C4Image = C4Image()

Diff for: C4UI/Filters/C4DotScreen.swift renamed to C4/UI/Filters/C4DotScreen.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
20+
import CoreImage
2121

2222
public struct C4DotScreen : C4Filter {
2323
public let filterName = "CIDotScreen"

Diff for: C4UI/Filters/C4GaussianBlur.swift renamed to C4/UI/Filters/C4GaussianBlur.swift

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20+
import CoreImage
21+
2022
public struct C4GaussianBlur : C4Filter {
2123
public let filterName = "CIGaussianBlur"
2224
public var radius: Double = 10

Diff for: C4UI/Filters/C4HueAdjust.swift renamed to C4/UI/Filters/C4HueAdjust.swift

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20+
import CoreImage
21+
2022
public struct C4Hue : C4Filter {
2123
public let filterName = "CIHueAdjust"
2224
public var angle: Double = 1.0

Diff for: C4UI/Filters/C4LinearGradient.swift renamed to C4/UI/Filters/C4LinearGradient.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
20+
import CoreImage
2121

2222
public struct C4LinearGradient : C4Generator {
2323
public let filterName = "CISmoothLinearGradient"

Diff for: C4UI/Filters/C4Sepia.swift renamed to C4/UI/Filters/C4Sepia.swift

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20+
import CoreImage
21+
2022
public struct C4Sepia : C4Filter {
2123
public let filterName = "CISepiaTone"
2224
public var intensity: Double = 1.0

Diff for: C4UI/Filters/C4Sharpen.swift renamed to C4/UI/Filters/C4Sharpen.swift

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20+
import CoreImage
21+
2022
public struct C4Sharpen : C4Filter {
2123
public let filterName = "CISharpenLuminance"
2224
public var sharpness: Double = 0.4

Diff for: C4UI/Filters/C4Twirl.swift renamed to C4/UI/Filters/C4Twirl.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1818
// IN THE SOFTWARE.
1919

20-
import C4Core
20+
import CoreImage
2121

2222
public struct C4Twirl : C4Filter {
2323
public let filterName = "CITwirlDistortion"

Diff for: C4UI/UIGestureRecognizer+Closure.swift renamed to C4/UI/UIGestureRecognizer+Closure.swift

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Copyright (c) 2014 C4. All rights reserved.
33

44
import Foundation
5-
import C4Core
65
import UIKit
76

87
private var handlerAssociationKey: UInt8 = 0

Diff for: C4UI/UIViewController+C4View.swift renamed to C4/UI/UIViewController+C4View.swift

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
// IN THE SOFTWARE.
1919

2020
import Foundation
21-
import C4Core
2221
import ObjectiveC
2322
import UIKit
2423

Diff for: C4App/AppDelegate.swift

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright © 2014 C4
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a copy
4+
// of this software and associated documentation files (the "Software"), to
5+
// deal in the Software without restriction, including without limitation the
6+
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
// sell copies of the Software, and to permit persons to whom the Software is
8+
// furnished to do so, subject to the following conditions: The above copyright
9+
// notice and this permission notice shall be included in all copies or
10+
// substantial portions of the Software.
11+
//
12+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
13+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
15+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
16+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
17+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
18+
// IN THE SOFTWARE.
19+
20+
import UIKit
21+
22+
@UIApplicationMain
23+
class AppDelegate: UIResponder, UIApplicationDelegate {
24+
25+
var window: UIWindow?
26+
27+
28+
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
29+
// Override point for customization after application launch.
30+
return true
31+
}
32+
}

0 commit comments

Comments
 (0)