Skip to content

Commit

Permalink
Fixed a layout issue on iPhone X when using a single custom image pro…
Browse files Browse the repository at this point in the history
…vider
  • Loading branch information
Kostas Karayannis committed Oct 2, 2017
1 parent 93c752e commit 7cf7865
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Kite-Print-SDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Kite-Print-SDK'
spec.version = '6.7.1'
spec.version = '6.7.2'
spec.license = { :type => 'MIT', :file => 'Kite-SDK/LICENSE' }
spec.homepage = 'https://github.com/OceanLabs/iOS-Print-SDK'
spec.authors = {'Deon Botha' => 'deon@oceanlabs.co'}
Expand Down
3 changes: 3 additions & 0 deletions Kite-SDK/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 6.7.2
- Fixed a layout issue on iPhone X when using a single custom image provider

### 6.7.1
- Fixed: Non-responsive cancel button when Kite SDK is loading

Expand Down
19 changes: 17 additions & 2 deletions Kite-SDK/KitePrintSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2319,9 +2319,13 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-KiteSDK-Demo/Pods-KiteSDK-Demo-resources.sh",
"${PODS_ROOT}/FBSDKCoreKit/FacebookSDKStrings.bundle",
"$PODS_CONFIGURATION_BUILD_DIR/Stripe/Stripe.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -2433,13 +2437,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Kite-CI-Deploy-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
A5C135E7BF18F5D8A7843D7D /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -2448,13 +2455,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-KiteSDK-Demo-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
D801D965E628C76A96EAF7B6 /* [CP] Copy Pods Resources */ = {
Expand All @@ -2463,9 +2473,14 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Kite-CI-Deploy/Pods-Kite-CI-Deploy-resources.sh",
"${PODS_ROOT}/FBSDKCoreKit/FacebookSDKStrings.bundle",
"$PODS_CONFIGURATION_BUILD_DIR/Stripe/Stripe.bundle",
"$PODS_CONFIGURATION_BUILD_DIR/KITAssetsPickerController/KITAssetsPickerController.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
2 changes: 1 addition & 1 deletion Kite-SDK/PSPrintSDK/OLConstants.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#import "OLConstants.h"

NSString *const kOLKiteSDKVersion = @"6.7.1";
NSString *const kOLKiteSDKVersion = @"6.7.2";
NSString *const kOLKiteSDKErrorDomain = @"co.oceanlabs.kOLKiteSDKErrorDomain";
NSString *const kNotificationTemplateSyncComplete = @"co.oceanlabs.pssdk.notification.kNotificationSyncComplete";
NSString *const kNotificationTemplateSyncPartialComplete = @"co.oceanlabs.pssdk.notification.kNotificationTemplateSyncPartialComplete";
Expand Down
3 changes: 2 additions & 1 deletion Kite-SDK/PSPrintSDK/OLImagePickerViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,14 @@ - (void)setupProviders{
NSMutableArray *con = [[NSMutableArray alloc] init];

NSArray *visuals = @[[NSString stringWithFormat:@"H:|-5-[addButton(%f)]", height],
[NSString stringWithFormat:@"V:[addButton(%f)]-5-|", height]];
[NSString stringWithFormat:@"V:[addButton(%f)]", height]];

for (NSString *visual in visuals) {
[con addObjectsFromArray: [NSLayoutConstraint constraintsWithVisualFormat:visual options:0 metrics:nil views:views]];
}

[addButton.superview addConstraints:con];
[addButton.superview addConstraint:[NSLayoutConstraint constraintWithItem:addButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.nextButton attribute:NSLayoutAttributeTop multiplier:1 constant:0]];

UILabel *label = [[UILabel alloc] init];
label.text = @"+";
Expand Down
2 changes: 1 addition & 1 deletion Kite-SDK/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: b8d6178ca074be59ecf1791b81b70b55b2459694

COCOAPODS: 1.2.1
COCOAPODS: 1.3.1

0 comments on commit 7cf7865

Please sign in to comment.