Skip to content
This repository was archived by the owner on Jan 12, 2019. It is now read-only.

Carthage Support #36

Merged
merged 5 commits into from
Oct 30, 2015
Merged

Carthage Support #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52d1c16
Add framework target, rename `CardIO` to `CardIO-static`
cybertk Aug 25, 2015
f0e37bc
Update shared scheme per Carthage's requirement
cybertk Aug 25, 2015
9f86d45
Fix compiling issue related to UIDeviceOrientation
cybertk Aug 25, 2015
e16906c
Fix: Cannot find `CardIOIccVersion.h`
cybertk Aug 25, 2015
32edc85
Add missing headers into Framework
cybertk Aug 25, 2015
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
6 changes: 3 additions & 3 deletions Classes/CardIOCameraView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,13 +540,13 @@ - (UIInterfaceOrientation)defaultSupportedOverlayOrientation {
return UIInterfaceOrientationPortrait;
}
else {
UIInterfaceOrientation defaultOrientation = UIDeviceOrientationUnknown;
UIInterfaceOrientation defaultOrientation = UIInterfaceOrientationUnknown;
UIInterfaceOrientationMask supportedOverlayOrientationsMask = [self supportedOverlayOrientationsMask];
for (UIInterfaceOrientationMask orientation = UIInterfaceOrientationPortrait;
for (NSInteger orientation = UIInterfaceOrientationPortrait;
orientation <= UIInterfaceOrientationLandscapeRight;
orientation++) {
if ((supportedOverlayOrientationsMask & (1 << orientation)) != 0) {
defaultOrientation = orientation;
defaultOrientation = (UIInterfaceOrientation)orientation;
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ - (void)successfulScan:(CardIOCreditCardInfo *)cardInfo {
if (deviceOrientation == UIDeviceOrientationFaceUp || deviceOrientation == UIDeviceOrientationFaceDown) {
deviceOrientation = (UIDeviceOrientation) vc.initialInterfaceOrientationForViewcontroller;
}
InterfaceToDeviceOrientationDelta delta = orientationDelta(UIDeviceOrientationPortrait, deviceOrientation);
InterfaceToDeviceOrientationDelta delta = orientationDelta(UIInterfaceOrientationPortrait, deviceOrientation);
CGFloat rotation = -rotationForOrientationDelta(delta); // undo the orientation delta
r = CGAffineTransformMakeRotation(rotation);
}
Expand Down
12 changes: 6 additions & 6 deletions Classes/CardIOViewController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,13 +390,13 @@ - (UIInterfaceOrientation)defaultSupportedOverlayOrientation {
return UIInterfaceOrientationPortrait;
}
else {
UIInterfaceOrientation defaultOrientation = UIDeviceOrientationUnknown;
UIInterfaceOrientation defaultOrientation = UIInterfaceOrientationUnknown;
UIInterfaceOrientationMask supportedOverlayOrientationsMask = [self supportedOverlayOrientationsMask];
for (UIInterfaceOrientationMask orientation = UIInterfaceOrientationPortrait;
for (NSInteger orientation = UIInterfaceOrientationMaskPortrait;
orientation <= UIInterfaceOrientationLandscapeRight;
orientation++) {
if ((supportedOverlayOrientationsMask & (1 << orientation)) != 0) {
defaultOrientation = orientation;
defaultOrientation = (UIInterfaceOrientation)orientation;
break;
}
}
Expand All @@ -416,7 +416,7 @@ - (BOOL)prefersStatusBarHidden {
}

- (UIStatusBarStyle) preferredStatusBarStyle {
return /*UIStatusBarStyleLightContent*/1;
return UIStatusBarStyleLightContent;
}

#pragma mark - Handle button taps
Expand All @@ -429,7 +429,7 @@ - (void)manualEntry:(id)sender {
CardIODataEntryViewController *manualEntryViewController = [[CardIODataEntryViewController alloc] initWithContext:self.context withStatusBarHidden:self.statusBarWasOriginallyHidden];
manualEntryViewController.manualEntry = YES;
root.currentViewControllerIsDataEntry = YES;
root.initialInterfaceOrientationForViewcontroller = (UIDeviceOrientation)self.deviceOrientation;
root.initialInterfaceOrientationForViewcontroller = (UIInterfaceOrientation)self.deviceOrientation;

if (iOS_8_PLUS) {
// The presentViewController:/dismissViewControllerAnimated: kludge was necessary for
Expand Down Expand Up @@ -539,7 +539,7 @@ - (void)cardIOView:(CardIOView *)cardIOView didScanCard:(CardIOCreditCardInfo *)

CardIOPaymentViewController *root = (CardIOPaymentViewController *)self.navigationController;
root.currentViewControllerIsDataEntry = YES;
root.initialInterfaceOrientationForViewcontroller = (UIDeviceOrientation)self.deviceOrientation;
root.initialInterfaceOrientationForViewcontroller = (UIInterfaceOrientation)self.deviceOrientation;

if (iOS_8_PLUS) {
// The presentViewController:/dismissViewControllerAnimated: kludge was necessary for
Expand Down
26 changes: 26 additions & 0 deletions Classes/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Loading