Skip to content
Snippets Groups Projects
Commit 0cd69e60 authored by wieseoli's avatar wieseoli
Browse files

Merge branch 'swift3' into 'master' 

Swift3

See merge request !1
parents 09178a67 c0963fb5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 812 additions and 551 deletions
Podfile.lock
+ 1
− 1
View file @ 0cd69e60
...@@ -27,4 +27,4 @@ SPEC CHECKSUMS: ...@@ -27,4 +27,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: d91a8bb487191b547b9ddc6870d3067a9a2cbe8b PODFILE CHECKSUM: d91a8bb487191b547b9ddc6870d3067a9a2cbe8b
COCOAPODS: 1.0.1 COCOAPODS: 1.2.1
Pods/Manifest.lock
+ 1
− 1
View file @ 0cd69e60
...@@ -27,4 +27,4 @@ SPEC CHECKSUMS: ...@@ -27,4 +27,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: d91a8bb487191b547b9ddc6870d3067a9a2cbe8b PODFILE CHECKSUM: d91a8bb487191b547b9ddc6870d3067a9a2cbe8b
COCOAPODS: 1.0.1 COCOAPODS: 1.2.1
Pods/Onboard/Source/OnboardingContentViewController.h
+ 5
− 0
View file @ 0cd69e60
...@@ -38,6 +38,11 @@ typedef void (^action_callback)(OnboardingViewController *onboardController); ...@@ -38,6 +38,11 @@ typedef void (^action_callback)(OnboardingViewController *onboardController);
*/ */
@property (nonatomic) BOOL movesToNextViewController; @property (nonatomic) BOOL movesToNextViewController;
/**
* @brief Determines if only the inpuview will be shown.
*/
@property (nonatomic) BOOL onlyInputView;
/** /**
* @brief The image view used to show the top icon. * @brief The image view used to show the top icon.
......
Pods/Onboard/Source/OnboardingContentViewController.m
+ 45
− 29
View file @ 0cd69e60
...@@ -103,6 +103,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -103,6 +103,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
if (self == nil) { if (self == nil) {
return nil; return nil;
} }
self.onlyInputView = false;
// Icon image view // Icon image view
self.iconImageView = [[UIImageView alloc] initWithImage:image]; self.iconImageView = [[UIImageView alloc] initWithImage:image];
...@@ -168,6 +170,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -168,6 +170,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
return nil; return nil;
} }
self.onlyInputView = false;
// Icon image view // Icon image view
self.iconImageView = [[UIImageView alloc] initWithImage:image]; self.iconImageView = [[UIImageView alloc] initWithImage:image];
self.iconWidth = image ? image.size.width : kDefaultImageViewSize; self.iconWidth = image ? image.size.width : kDefaultImageViewSize;
...@@ -236,6 +240,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -236,6 +240,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
return nil; return nil;
} }
self.onlyInputView = false;
// Icon image view // Icon image view
self.iconImageView = [[UIImageView alloc] initWithImage:image]; self.iconImageView = [[UIImageView alloc] initWithImage:image];
self.iconWidth = image ? image.size.width : kDefaultImageViewSize; self.iconWidth = image ? image.size.width : kDefaultImageViewSize;
...@@ -413,46 +419,56 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -413,46 +419,56 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
- (void)viewWillLayoutSubviews { - (void)viewWillLayoutSubviews {
[super viewWillLayoutSubviews]; [super viewWillLayoutSubviews];
if (!self.onlyInputView) {
if (self.videoURL) {
self.moviePlayerController.view.frame = self.view.frame;
}
if (self.videoURL) { CGFloat viewWidth = CGRectGetWidth(self.view.frame);
self.moviePlayerController.view.frame = self.view.frame; CGFloat contentWidth = viewWidth * kContentWidthMultiplier;
} CGFloat xPadding = (viewWidth - contentWidth) / 2.0;
CGFloat viewWidth = CGRectGetWidth(self.view.frame);
CGFloat contentWidth = viewWidth * kContentWidthMultiplier;
CGFloat xPadding = (viewWidth - contentWidth) / 2.0;
[self.iconImageView setFrame:CGRectMake((viewWidth / 2.0) - (self.iconWidth / 2.0), self.topPadding, self.iconWidth, self.iconHeight)]; [self.iconImageView setFrame:CGRectMake((viewWidth / 2.0) - (self.iconWidth / 2.0), self.topPadding, self.iconWidth, self.iconHeight)];
CGFloat titleYOrigin = CGRectGetMaxY(self.iconImageView.frame) + self.underIconPadding; CGFloat titleYOrigin = CGRectGetMaxY(self.iconImageView.frame) + self.underIconPadding;
self.titleLabel.frame = CGRectMake(xPadding, titleYOrigin, contentWidth, 0); self.titleLabel.frame = CGRectMake(xPadding, titleYOrigin, contentWidth, 0);
[self.titleLabel sizeToFit]; [self.titleLabel sizeToFit];
self.titleLabel.frame = CGRectMake(xPadding, titleYOrigin, contentWidth, CGRectGetHeight(self.titleLabel.frame)); self.titleLabel.frame = CGRectMake(xPadding, titleYOrigin, contentWidth, CGRectGetHeight(self.titleLabel.frame));
CGFloat bodyYOrigin = CGRectGetMaxY(self.titleLabel.frame) + self.underTitlePadding; CGFloat bodyYOrigin = CGRectGetMaxY(self.titleLabel.frame) + self.underTitlePadding;
self.bodyLabel.frame = CGRectMake(xPadding, bodyYOrigin, contentWidth, 0); self.bodyLabel.frame = CGRectMake(xPadding, bodyYOrigin, contentWidth, 0);
[self.bodyLabel sizeToFit]; [self.bodyLabel sizeToFit];
self.bodyLabel.frame = CGRectMake(xPadding, bodyYOrigin, contentWidth, CGRectGetHeight(self.bodyLabel.frame)); self.bodyLabel.frame = CGRectMake(xPadding, bodyYOrigin, contentWidth, CGRectGetHeight(self.bodyLabel.frame));
self.actionButton.frame = CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kMainPageControlHeight - kActionButtonHeight - self.bottomPadding, contentWidth, kActionButtonHeight); self.actionButton.frame = CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kMainPageControlHeight - kActionButtonHeight - self.bottomPadding, contentWidth, kActionButtonHeight);
CGFloat inputYOrigin = CGRectGetMaxY(self.bodyLabel.frame) + self.underTitlePadding; CGFloat inputYOrigin = CGRectGetMaxY(self.bodyLabel.frame) + self.underTitlePadding;
if (self.withPadding != NULL) { if (self.withPadding != NULL) {
if (*self.withPadding == NO) { if (*self.withPadding == NO) {
inputYOrigin = CGRectGetMaxY(self.bodyLabel.frame); inputYOrigin = CGRectGetMaxY(self.bodyLabel.frame);
}
} }
} if (self.inputView) {
if (self.inputView) { self.inputView.frame = CGRectMake(xPadding, inputYOrigin, contentWidth, CGRectGetHeight(self.inputView.frame));
self.inputView.frame = CGRectMake(xPadding, inputYOrigin, contentWidth, CGRectGetHeight(self.inputView.frame)); for (UIView *view in self.inputView.subviews){
for (UIView *view in self.inputView.subviews){ view.frame = CGRectMake(CGRectGetMinX(view.frame), CGRectGetMinY(view.frame), contentWidth, CGRectGetHeight(view.frame));
view.frame = CGRectMake(CGRectGetMinX(view.frame), CGRectGetMinY(view.frame), contentWidth, CGRectGetHeight(view.frame)); }
} }
}
else {
CGFloat viewWidth = CGRectGetWidth(self.view.frame);
CGFloat contentWidth = viewWidth * kContentWidthMultiplier;
CGFloat xPadding = (viewWidth - contentWidth) / 2.0;
if (self.inputView) {
self.actionButton.frame = CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kMainPageControlHeight - kActionButtonHeight - self.bottomPadding - CGRectGetMaxY(self.inputView.frame), contentWidth, kActionButtonHeight); self.inputView.frame = CGRectMake(xPadding, self.topPadding, contentWidth, CGRectGetHeight(self.inputView.frame));
for (UIView *view in self.inputView.subviews){
view.frame = CGRectMake(CGRectGetMinX(view.frame), CGRectGetMinY(view.frame), contentWidth, CGRectGetHeight(view.frame));
}
}
} }
} }
......
Pods/Onboard/Source/OnboardingViewController.h
+ 7
− 0
View file @ 0cd69e60
...@@ -24,6 +24,11 @@ ...@@ -24,6 +24,11 @@
@property (nonatomic, strong) UIImage *backgroundImage; @property (nonatomic, strong) UIImage *backgroundImage;
/**
* @brief The background imageView presented. if a backgroundimage is shown.
*/
@property (nonatomic) UIImageView *backgroundImageView;
/** /**
* @brief Determines whether or not the background will be masked. The default value of this property is YES. * @brief Determines whether or not the background will be masked. The default value of this property is YES.
*/ */
...@@ -135,4 +140,6 @@ ...@@ -135,4 +140,6 @@
*/ */
- (void)moveNextPage; - (void)moveNextPage;
- (void)fadeBackground:(UIImage *) newImage;
@end @end
Pods/Onboard/Source/OnboardingViewController.m
+ 50
− 9
View file @ 0cd69e60
...@@ -52,6 +52,9 @@ static NSString * const kSkipButtonText = @"Skip"; ...@@ -52,6 +52,9 @@ static NSString * const kSkipButtonText = @"Skip";
return nil; return nil;
} }
//self.view.backgroundColor = UIColor.whiteColor;
//self.backgroundImageViewl = [[UIImageView alloc] initWithFrame:self.view.bounds];
self.backgroundImage = backgroundImage; self.backgroundImage = backgroundImage;
return self; return self;
...@@ -90,7 +93,7 @@ static NSString * const kSkipButtonText = @"Skip"; ...@@ -90,7 +93,7 @@ static NSString * const kSkipButtonText = @"Skip";
self.viewControllers = contents; self.viewControllers = contents;
// Set the default properties // Set the default properties
self.shouldMaskBackground = YES; self.shouldMaskBackground = NO;//YES;
self.shouldBlurBackground = NO; self.shouldBlurBackground = NO;
self.shouldFadeTransitions = NO; self.shouldFadeTransitions = NO;
self.fadePageControlOnLastPage = NO; self.fadePageControlOnLastPage = NO;
...@@ -162,15 +165,16 @@ static NSString * const kSkipButtonText = @"Skip"; ...@@ -162,15 +165,16 @@ static NSString * const kSkipButtonText = @"Skip";
[self blurBackground]; [self blurBackground];
} }
UIImageView *backgroundImageView; self.backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
//UIImageView *backgroundImageView = self.backgroundImageViewl;
// create the background image view and set it to aspect fill so it isn't skewed // create the background image view and set it to aspect fill so it isn't skewed
if (self.backgroundImage) { if (self.backgroundImage) {
backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds]; self.backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
backgroundImageView.clipsToBounds = YES; self.backgroundImageView.clipsToBounds = YES;
backgroundImageView.contentMode = UIViewContentModeScaleAspectFill; self.backgroundImageView.contentMode = UIViewContentModeScaleAspectFill;
[backgroundImageView setImage:self.backgroundImage]; [self.backgroundImageView setImage:self.backgroundImage];
[self.view addSubview:backgroundImageView]; //[self.view addSubview:self.backgroundImageView];
} }
// as long as the shouldMaskBackground setting hasn't been set to NO, we want to // as long as the shouldMaskBackground setting hasn't been set to NO, we want to
...@@ -201,8 +205,8 @@ static NSString * const kSkipButtonText = @"Skip"; ...@@ -201,8 +205,8 @@ static NSString * const kSkipButtonText = @"Skip";
[self.pageVC.view sendSubviewToBack:backgroundMaskView]; [self.pageVC.view sendSubviewToBack:backgroundMaskView];
// send the background image view to the back if we have one // send the background image view to the back if we have one
if (backgroundImageView) { if (self.backgroundImageView) {
[self.pageVC.view sendSubviewToBack:backgroundImageView]; [self.pageVC.view sendSubviewToBack:self.backgroundImageView];
} }
// otherwise send the video view to the back if we have one // otherwise send the video view to the back if we have one
...@@ -501,4 +505,41 @@ static NSString * const kSkipButtonText = @"Skip"; ...@@ -501,4 +505,41 @@ static NSString * const kSkipButtonText = @"Skip";
self.backgroundImage = outputImage; self.backgroundImage = outputImage;
} }
- (void) fadeBackground:(UIImage *)newImage {
self.backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
//UIImageView *backgroundImageView = self.backgroundImageViewl;
// create the background image view and set it to aspect fill so it isn't skewed
if (self.backgroundImage) {
self.backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
self.backgroundImageView.clipsToBounds = YES;
self.backgroundImageView.contentMode = UIViewContentModeScaleAspectFill;
[self.backgroundImageView setImage:self.backgroundImage];
[self.view addSubview:self.backgroundImageView];
}
UIImageView *oldImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
[oldImageView setImage:self.backgroundImage];
UIImageView * newImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
[newImageView setImage:newImage];
newImageView.alpha = 0;
oldImageView.clipsToBounds = YES;
oldImageView.contentMode = UIViewContentModeScaleAspectFill;
newImageView.clipsToBounds = YES;
newImageView.contentMode = UIViewContentModeScaleAspectFill;
[self.view insertSubview: newImageView aboveSubview: self.backgroundImageView];
[self.view insertSubview: oldImageView aboveSubview: newImageView];
[UIView animateWithDuration: 10.0 delay: 0.0 options: UIViewAnimationOptionCurveEaseInOut animations: ^{
oldImageView.alpha = 0;
newImageView.alpha = 1;
} completion: ^(BOOL completed){
self.backgroundImageView.image = newImage;
self.backgroundImage = newImage;
[newImageView removeFromSuperview];
[oldImageView removeFromSuperview];
[self.view setNeedsDisplay];
}];
}
@end @end
Pods/Pods.xcodeproj/project.pbxproj
+ 587
− 511
View file @ 0cd69e60
This diff is collapsed.
Pods/Pods.xcodeproj/xcuserdata/jakobsbode.xcuserdatad/xcschemes/xcschememanagement.plist
+ 40
− 0
View file @ 0cd69e60
...@@ -52,16 +52,41 @@ ...@@ -52,16 +52,41 @@
<key>primary</key> <key>primary</key>
<true/> <true/>
</dict> </dict>
<key>4BBD10B16564F31F9E6CB3A46C82B375</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>738FFB5A0A7C642A6657EA5241C1FB7E</key> <key>738FFB5A0A7C642A6657EA5241C1FB7E</key>
<dict> <dict>
<key>primary</key> <key>primary</key>
<true/> <true/>
</dict> </dict>
<key>82BBBA182FED17649112AE9374B4898E</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>83321BF5BD0E06C7F212CF8969A25A33</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>838A2C6DA366DE138E5FDF1AF19D94C0</key> <key>838A2C6DA366DE138E5FDF1AF19D94C0</key>
<dict> <dict>
<key>primary</key> <key>primary</key>
<true/> <true/>
</dict> </dict>
<key>8905DB6521F8FDC34752B69DEE3FDEB7</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>8F5682E0AC126B1910FC04BA8A16F382</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>9ED6B0DBB547C5A9B34F2DDC36242048</key> <key>9ED6B0DBB547C5A9B34F2DDC36242048</key>
<dict> <dict>
<key>primary</key> <key>primary</key>
...@@ -72,6 +97,11 @@ ...@@ -72,6 +97,11 @@
<key>primary</key> <key>primary</key>
<true/> <true/>
</dict> </dict>
<key>BF1258B878BFA89993BC8FEA5ACA97E4</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>D7FF48F3092783E4E42B336F0DEF2D1A</key> <key>D7FF48F3092783E4E42B336F0DEF2D1A</key>
<dict> <dict>
<key>primary</key> <key>primary</key>
...@@ -87,6 +117,16 @@ ...@@ -87,6 +117,16 @@
<key>primary</key> <key>primary</key>
<true/> <true/>
</dict> </dict>
<key>E8B699458103CA9ABE04ABB6069ACD9D</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>FC17CCC069BF20C1FDFA841B915A467B</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict> </dict>
</dict> </dict>
</plist> </plist>
Pods/Target Support Files/BZipCompression/BZipCompression-prefix.pch
+ 8
− 0
View file @ 0cd69e60
#ifdef __OBJC__ #ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif #endif
Pods/Target Support Files/BZipCompression/BZipCompression-umbrella.h
+ 10
− 0
View file @ 0cd69e60
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "BZipCompression.h" #import "BZipCompression.h"
......
Pods/Target Support Files/BZipCompression/BZipCompression.xcconfig
+ 1
− 0
View file @ 0cd69e60
...@@ -5,5 +5,6 @@ OTHER_LDFLAGS = -l"bz2" ...@@ -5,5 +5,6 @@ OTHER_LDFLAGS = -l"bz2"
PODS_BUILD_DIR = $BUILD_DIR PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/BZipCompression
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES SKIP_INSTALL = YES
Pods/Target Support Files/FrameAccessor/FrameAccessor-prefix.pch
+ 8
− 0
View file @ 0cd69e60
#ifdef __OBJC__ #ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif #endif
Pods/Target Support Files/FrameAccessor/FrameAccessor-umbrella.h
+ 10
− 0
View file @ 0cd69e60
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "FrameAccessor.h" #import "FrameAccessor.h"
#import "ScrollViewFrameAccessor.h" #import "ScrollViewFrameAccessor.h"
......
Pods/Target Support Files/FrameAccessor/FrameAccessor.xcconfig
+ 1
− 0
View file @ 0cd69e60
...@@ -4,5 +4,6 @@ HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Publi ...@@ -4,5 +4,6 @@ HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Publi
PODS_BUILD_DIR = $BUILD_DIR PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/FrameAccessor
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES SKIP_INSTALL = YES
Pods/Target Support Files/KeychainAccess/KeychainAccess-prefix.pch
+ 8
− 0
View file @ 0cd69e60
#ifdef __OBJC__ #ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif #endif
Pods/Target Support Files/KeychainAccess/KeychainAccess-umbrella.h
+ 10
− 0
View file @ 0cd69e60
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
FOUNDATION_EXPORT double KeychainAccessVersionNumber; FOUNDATION_EXPORT double KeychainAccessVersionNumber;
......
Pods/Target Support Files/KeychainAccess/KeychainAccess.xcconfig
+ 1
− 0
View file @ 0cd69e60
...@@ -5,6 +5,7 @@ OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" ...@@ -5,6 +5,7 @@ OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
PODS_BUILD_DIR = $BUILD_DIR PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/KeychainAccess
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES SKIP_INSTALL = YES
SWIFT_VERSION = 3.0 SWIFT_VERSION = 3.0
Pods/Target Support Files/Onboard/Onboard-prefix.pch
+ 8
− 0
View file @ 0cd69e60
#ifdef __OBJC__ #ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif #endif
Pods/Target Support Files/Onboard/Onboard-umbrella.h
+ 10
− 0
View file @ 0cd69e60
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "OnboardingViewController.h" #import "OnboardingViewController.h"
#import "OnboardingContentViewController.h" #import "OnboardingContentViewController.h"
......
Pods/Target Support Files/Onboard/Onboard.xcconfig
+ 1
− 0
View file @ 0cd69e60
...@@ -4,5 +4,6 @@ HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Publi ...@@ -4,5 +4,6 @@ HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Publi
PODS_BUILD_DIR = $BUILD_DIR PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/Onboard
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES SKIP_INSTALL = YES
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment