Skip to content
Snippets Groups Projects
Commit e3db960b authored by Oliver Wiese's avatar Oliver Wiese
Browse files

Merge remote-tracking branch 'origin/master'

parents 9c99f2a7 4183e751
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 602 additions and 622 deletions
Pods/Onboard/Source/OnboardingContentViewController.h
+ 5
− 0
View file @ e3db960b
...@@ -173,6 +173,8 @@ NS_ASSUME_NONNULL_END ...@@ -173,6 +173,8 @@ NS_ASSUME_NONNULL_END
*/ */
+ (nonnull instancetype)contentWithTitle:(nullable NSString *)title body:(nullable NSString *)body videoURL:(nullable NSURL *)videoURL inputView:(UIView *)inputView buttonText:(nullable NSString *)buttonText actionBlock:(nullable dispatch_block_t)actionBlock; + (nonnull instancetype)contentWithTitle:(nullable NSString *)title body:(nullable NSString *)body videoURL:(nullable NSURL *)videoURL inputView:(UIView *)inputView buttonText:(nullable NSString *)buttonText actionBlock:(nullable dispatch_block_t)actionBlock;
+ (nonnull instancetype)contentWithTitle:(nullable NSString *)title body:(nullable NSString *)body videoURL:(nullable NSURL *)videoURL inputView:(UIView *)inputView buttonText:(nullable NSString *)buttonText actionBlock:(nullable dispatch_block_t)actionBlock withPadding:(nonnull BOOL*)withPadding;
/** /**
* @brief Initializer for creating an onboarding content view controller with a video. * @brief Initializer for creating an onboarding content view controller with a video.
...@@ -203,6 +205,9 @@ NS_ASSUME_NONNULL_END ...@@ -203,6 +205,9 @@ NS_ASSUME_NONNULL_END
- (nonnull instancetype)initWithTitle:(nullable NSString *)title body:(nullable NSString *)body image:(nullable UIImage *)image videoURL:(nullable NSURL *)videoURL inputView:(nullable UIView *)inputView buttonText:(nullable NSString *)buttonText actionBlock:(nullable dispatch_block_t)actionBlock; - (nonnull instancetype)initWithTitle:(nullable NSString *)title body:(nullable NSString *)body image:(nullable UIImage *)image videoURL:(nullable NSURL *)videoURL inputView:(nullable UIView *)inputView buttonText:(nullable NSString *)buttonText actionBlock:(nullable dispatch_block_t)actionBlock;
- (nonnull instancetype)initWithTitle:(nullable NSString *)title body:(nullable NSString *)body image:(nullable UIImage *)image videoURL:(nullable NSURL *)videoURL inputView:(nullable UIView *)inputView buttonText:(nullable NSString *)buttonText actionBlock:(nullable dispatch_block_t)actionBlock withPadding:(BOOL*)withPadding;
/** /**
* @brief Method used to update the alpha value for all floating subviews (image, title, body, etc.) * @brief Method used to update the alpha value for all floating subviews (image, title, body, etc.)
*/ */
......
Pods/Onboard/Source/OnboardingContentViewController.m
+ 85
− 2
View file @ e3db960b
...@@ -40,6 +40,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -40,6 +40,8 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
@property (nonatomic) BOOL wasPreviouslyVisible; @property (nonatomic) BOOL wasPreviouslyVisible;
@property (nonatomic, nullable) BOOL* withPadding;
@end @end
@implementation OnboardingContentViewController @implementation OnboardingContentViewController
...@@ -73,7 +75,10 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -73,7 +75,10 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
+ (instancetype)contentWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock { + (instancetype)contentWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock {
return [[self alloc] initWithTitle:title body:body image:nil videoURL:videoURL inputView:inputView buttonText:buttonText actionBlock:actionBlock]; return [[self alloc] initWithTitle:title body:body image:nil videoURL:videoURL inputView:inputView buttonText:buttonText actionBlock:actionBlock];
}
+ (instancetype)contentWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock withPadding:(BOOL*)withPadding {
return [[self alloc] initWithTitle:title body:body image:nil videoURL:videoURL inputView:inputView buttonText:buttonText actionBlock:actionBlock withPadding:withPadding];
} }
- (instancetype)initWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL buttonText:(NSString *)buttonText action:(dispatch_block_t)action { - (instancetype)initWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL buttonText:(NSString *)buttonText action:(dispatch_block_t)action {
...@@ -154,6 +159,75 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -154,6 +159,75 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
return self; return self;
} }
- (instancetype)initWithTitle:(NSString *)title body:(NSString *)body image:(UIImage *)image videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock withPadding:(BOOL*)withPadding{
self = [super init];
self.withPadding = withPadding;
if (self == nil) {
return nil;
}
// Icon image view
self.iconImageView = [[UIImageView alloc] initWithImage:image];
self.iconWidth = image ? image.size.width : kDefaultImageViewSize;
self.iconHeight = image ? image.size.height : kDefaultImageViewSize;
// Title label
self.titleLabel = [UILabel new];
self.titleLabel.accessibilityIdentifier = kOnboardMainTextAccessibilityIdentifier;
self.titleLabel.text = title;
self.titleLabel.textColor = DEFAULT_TEXT_COLOR;
self.titleLabel.font = [UIFont fontWithName:kDefaultOnboardingFont size:kDefaultTitleFontSize];
self.titleLabel.numberOfLines = 0;
self.titleLabel.textAlignment = NSTextAlignmentCenter;
// Body label
self.bodyLabel = [UILabel new];
self.bodyLabel.accessibilityIdentifier = kOnboardSubTextAccessibilityIdentifier;
self.bodyLabel.text = body;
self.bodyLabel.textColor = DEFAULT_TEXT_COLOR;
self.bodyLabel.font = [UIFont fontWithName:kDefaultOnboardingFont size:kDefaultBodyFontSize];
self.bodyLabel.numberOfLines = 0;
self.bodyLabel.textAlignment = NSTextAlignmentCenter;
// Input view
self.inputView = inputView;
if (self.inputView) {
self.inputView.accessibilityIdentifier = kOnboardInputViewAccessibilityIdentifier;
}
// Action button
self.actionButton = [UIButton new];
self.actionButton.accessibilityIdentifier = kOnboardActionButtonAccessibilityIdentifier;
self.actionButton.titleLabel.font = [UIFont fontWithName:kDefaultOnboardingFont size:kDefaultButtonFontSize];
[self.actionButton setTitle:buttonText forState:UIControlStateNormal];
[self.actionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[self.actionButton addTarget:self action:@selector(handleButtonPressed) forControlEvents:UIControlEventTouchUpInside];
self.buttonActionHandler = actionBlock ?: ^(OnboardingViewController *controller){};
// Movie player
self.videoURL = videoURL;
// Auto-navigation
self.movesToNextViewController = NO;
// Default padding values
self.topPadding = kDefaultTopPadding;
self.underIconPadding = kDefaultUnderIconPadding;
self.underTitlePadding = kDefaultUnderTitlePadding;
self.bottomPadding = kDefaultBottomPadding;
self.underPageControlPadding = kDefaultUnderPageControlPadding;
// Default blocks
self.viewWillAppearBlock = ^{};
self.viewDidAppearBlock = ^{};
self.viewWillDisappearBlock = ^{};
self.viewDidDisappearBlock = ^{};
return self;
}
- (instancetype)initWithTitle:(NSString *)title body:(NSString *)body image:(UIImage *)image videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock { - (instancetype)initWithTitle:(NSString *)title body:(NSString *)body image:(UIImage *)image videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock {
self = [super init]; self = [super init];
...@@ -364,12 +438,21 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc ...@@ -364,12 +438,21 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
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 == NO) {
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){
view.frame = CGRectMake(CGRectGetMinX(view.frame), CGRectGetMinY(view.frame), contentWidth, CGRectGetHeight(view.frame));
}
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.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);
} }
} }
......
Pods/Pods.xcodeproj/project.pbxproj
+ 488
− 541
View file @ e3db960b
This diff is collapsed.
Pods/Pods.xcodeproj/xcuserdata/jakobsbode.xcuserdatad/xcschemes/xcschememanagement.plist
+ 0
− 40
View file @ e3db960b
...@@ -52,41 +52,16 @@ ...@@ -52,41 +52,16 @@
<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>
...@@ -97,11 +72,6 @@ ...@@ -97,11 +72,6 @@
<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>
...@@ -117,16 +87,6 @@ ...@@ -117,16 +87,6 @@
<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-umbrella.h
+ 0
− 2
View file @ e3db960b
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
#import "BZipCompression.h" #import "BZipCompression.h"
......
Pods/Target Support Files/FrameAccessor/FrameAccessor-umbrella.h
+ 0
− 2
View file @ e3db960b
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
#import "FrameAccessor.h" #import "FrameAccessor.h"
#import "ScrollViewFrameAccessor.h" #import "ScrollViewFrameAccessor.h"
......
Pods/Target Support Files/KeychainAccess/KeychainAccess-umbrella.h
+ 0
− 2
View file @ e3db960b
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double KeychainAccessVersionNumber; FOUNDATION_EXPORT double KeychainAccessVersionNumber;
......
Pods/Target Support Files/Onboard/Onboard-umbrella.h
+ 0
− 2
View file @ e3db960b
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
#import "OnboardingViewController.h" #import "OnboardingViewController.h"
#import "OnboardingContentViewController.h" #import "OnboardingContentViewController.h"
......
Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-acknowledgements.plist
+ 0
− 14
View file @ e3db960b
...@@ -206,8 +206,6 @@ third-party archives. ...@@ -206,8 +206,6 @@ third-party archives.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
</string> </string>
<key>License</key>
<string>Apache2</string>
<key>Title</key> <key>Title</key>
<string>BZipCompression</string> <string>BZipCompression</string>
<key>Type</key> <key>Type</key>
...@@ -235,8 +233,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ...@@ -235,8 +233,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
</string> </string>
<key>License</key>
<string>MIT</string>
<key>Title</key> <key>Title</key>
<string>FrameAccessor</string> <string>FrameAccessor</string>
<key>Type</key> <key>Type</key>
...@@ -267,8 +263,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ...@@ -267,8 +263,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
</string> </string>
<key>License</key>
<string>MIT</string>
<key>Title</key> <key>Title</key>
<string>KeychainAccess</string> <string>KeychainAccess</string>
<key>Type</key> <key>Type</key>
...@@ -298,8 +292,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ...@@ -298,8 +292,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
</string> </string>
<key>License</key>
<string>MIT</string>
<key>Title</key> <key>Title</key>
<string>Onboard</string> <string>Onboard</string>
<key>Type</key> <key>Type</key>
...@@ -435,8 +427,6 @@ THE SOFTWARE. ...@@ -435,8 +427,6 @@ THE SOFTWARE.
*/ */
</string> </string>
<key>License</key>
<string>OpenSSL (OpenSSL/SSLeay)</string>
<key>Title</key> <key>Title</key>
<string>OpenSSL-Universal</string> <string>OpenSSL-Universal</string>
<key>Type</key> <key>Type</key>
...@@ -465,8 +455,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ...@@ -465,8 +455,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.</string> SOFTWARE.</string>
<key>License</key>
<string>MIT</string>
<key>Title</key> <key>Title</key>
<string>VENTokenField</string> <string>VENTokenField</string>
<key>Type</key> <key>Type</key>
...@@ -475,8 +463,6 @@ SOFTWARE.</string> ...@@ -475,8 +463,6 @@ SOFTWARE.</string>
<dict> <dict>
<key>FooterText</key> <key>FooterText</key>
<string>&lt;html&gt;&lt;body&gt;You are being &lt;a href="https://raw.githubusercontent.com/MailCore/mailcore2/master/LICENSE"&gt;redirected&lt;/a&gt;.&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;body&gt;You are being &lt;a href="https://raw.githubusercontent.com/MailCore/mailcore2/master/LICENSE"&gt;redirected&lt;/a&gt;.&lt;/body&gt;&lt;/html&gt;</string>
<key>License</key>
<string>BSD</string>
<key>Title</key> <key>Title</key>
<string>mailcore2-ios</string> <string>mailcore2-ios</string>
<key>Type</key> <key>Type</key>
......
Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-resources.sh
+ 8
− 2
View file @ e3db960b
...@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in ...@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
;; ;;
esac esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource() install_resource()
{ {
if [[ "$1" = /* ]] ; then if [[ "$1" = /* ]] ; then
...@@ -64,7 +70,7 @@ EOM ...@@ -64,7 +70,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;; ;;
*.xcassets) *.xcassets)
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH" ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;; ;;
*) *)
...@@ -87,7 +93,7 @@ then ...@@ -87,7 +93,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets). # Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do while read line; do
if [[ $line != "${PODS_ROOT}*" ]]; then if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line") XCASSET_FILES+=("$line")
fi fi
done <<<"$OTHER_XCASSETS" done <<<"$OTHER_XCASSETS"
......
Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-umbrella.h
+ 0
− 2
View file @ e3db960b
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_enzevalos_iphoneVersionNumber; FOUNDATION_EXPORT double Pods_enzevalos_iphoneVersionNumber;
......
Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone.debug.xcconfig
+ 0
− 1
View file @ e3db960b
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField" FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
......
Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone.release.xcconfig
+ 0
− 1
View file @ e3db960b
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField" FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
......
Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests-resources.sh
+ 8
− 2
View file @ e3db960b
...@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in ...@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
;; ;;
esac esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource() install_resource()
{ {
if [[ "$1" = /* ]] ; then if [[ "$1" = /* ]] ; then
...@@ -64,7 +70,7 @@ EOM ...@@ -64,7 +70,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;; ;;
*.xcassets) *.xcassets)
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH" ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;; ;;
*) *)
...@@ -87,7 +93,7 @@ then ...@@ -87,7 +93,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets). # Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do while read line; do
if [[ $line != "${PODS_ROOT}*" ]]; then if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line") XCASSET_FILES+=("$line")
fi fi
done <<<"$OTHER_XCASSETS" done <<<"$OTHER_XCASSETS"
......
Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests-umbrella.h
+ 0
− 2
View file @ e3db960b
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_enzevalos_iphoneTestsVersionNumber; FOUNDATION_EXPORT double Pods_enzevalos_iphoneTestsVersionNumber;
......
Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.debug.xcconfig
+ 0
− 1
View file @ e3db960b
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField" FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"
......
Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.release.xcconfig
+ 0
− 1
View file @ e3db960b
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField" FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"
......
Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests-resources.sh
+ 8
− 2
View file @ e3db960b
...@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in ...@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
;; ;;
esac esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource() install_resource()
{ {
if [[ "$1" = /* ]] ; then if [[ "$1" = /* ]] ; then
...@@ -64,7 +70,7 @@ EOM ...@@ -64,7 +70,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;; ;;
*.xcassets) *.xcassets)
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH" ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;; ;;
*) *)
...@@ -87,7 +93,7 @@ then ...@@ -87,7 +93,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets). # Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do while read line; do
if [[ $line != "${PODS_ROOT}*" ]]; then if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line") XCASSET_FILES+=("$line")
fi fi
done <<<"$OTHER_XCASSETS" done <<<"$OTHER_XCASSETS"
......
Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests-umbrella.h
+ 0
− 2
View file @ e3db960b
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_enzevalos_iphoneUITestsVersionNumber; FOUNDATION_EXPORT double Pods_enzevalos_iphoneUITestsVersionNumber;
......
Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests.debug.xcconfig
+ 0
− 1
View file @ e3db960b
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField" FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"
......
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