Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Podfile to support CocoaPods 1.0. #60

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions CYNCamera.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Pod::Spec.new do |s|
s.name = "CYNCamera"
s.version = "0.0.1"
s.summary = "Cynny fork of FastttCamera project."
s.homepage = "https://github.com/maross/CYNCamera"
s.license = 'MIT'
s.author = {
"Laura Skelton" => "[email protected]",
"Jonathan Hersh" => "[email protected]",
"Max Meyers" => "[email protected]",
"Devin Foley" => "[email protected]",
"Marco Rossi" => "[email protected]"
}
s.source = { :git => "https://github.com/maross/CYNCamera.git", :tag => s.version.to_s }
s.social_media_url = ''
s.platform = :ios, '7.0'
s.requires_arc = true
s.compiler_flags = '-fmodules'
s.frameworks = 'UIKit', 'AVFoundation', 'CoreMotion'

s.subspec 'Default' do |ss|
ss.source_files = 'FastttCamera/*.{h,m}'
end

s.subspec 'Filters' do |ss|
ss.dependency 'GPUImage', '~> 0.1.0'
ss.dependency 'FastttCamera/Default'
ss.source_files = 'FastttCamera/Filters/*.{h,m}'
end

s.default_subspec = 'Default'
end
16 changes: 10 additions & 6 deletions Example/Example/ExampleViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@

#import "ExampleViewController.h"
#import <FastttCamera/FastttCamera.h>
#import <FastttCamera/CYNCamera.h>
#import <Masonry/Masonry.h>
#import "ConfirmViewController.h"

@interface ExampleViewController () <FastttCameraDelegate, ConfirmControllerDelegate>

@property (nonatomic, strong) FastttCamera *fastCamera;
//@property (nonatomic, strong) FastttCamera *fastCamera;
@property (nonatomic, strong) CYNCamera *fastCamera;
@property (nonatomic, strong) UIButton *takePhotoButton;
@property (nonatomic, strong) UIButton *flashButton;
@property (nonatomic, strong) UIButton *torchButton;
Expand All @@ -39,18 +41,20 @@ - (void)viewDidLoad
{
[super viewDidLoad];

_fastCamera = [FastttCamera new];
// _fastCamera = [FastttCamera new];
_fastCamera = [CYNCamera new];
self.fastCamera.delegate = self;
self.fastCamera.maxScaledDimension = 600.f;
self.fastCamera.showsFocusView = YES;

[self fastttAddChildViewController:self.fastCamera];

[self.fastCamera.view mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.equalTo(self.view);
make.height.and.width.lessThanOrEqualTo(self.view.mas_width).with.priorityHigh();
make.height.and.width.lessThanOrEqualTo(self.view.mas_height).with.priorityHigh();
make.height.and.width.equalTo(self.view.mas_width).with.priorityLow();
make.height.and.width.equalTo(self.view.mas_height).with.priorityLow();
// make.height.and.width.lessThanOrEqualTo(self.view.mas_width).with.priorityHigh();
// make.height.and.width.lessThanOrEqualTo(self.view.mas_height).with.priorityHigh();
make.width.equalTo(self.view.mas_width).with.priorityLow();
make.height.equalTo(self.view.mas_height).with.priorityLow();
}];

_takePhotoButton = [UIButton new];
Expand Down
10 changes: 10 additions & 0 deletions Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
Expand Down
6 changes: 6 additions & 0 deletions Example/Example/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
129 changes: 129 additions & 0 deletions Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,144 @@
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "736h",
"scale" : "3x"
},
{
"orientation" : "landscape",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "736h",
"scale" : "3x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "667h",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "1366h",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
}
],
"info" : {
Expand Down
6 changes: 3 additions & 3 deletions Example/Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>ifttt.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand All @@ -22,15 +22,15 @@
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>Launch Screen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
Loading