Skip to content

Commit 0239aa0

Browse files
committed
[Update] applied suggested solution for iOS 11 frame issue
1 parent 802ae79 commit 0239aa0

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

Example/Koloda.xcodeproj/project.pbxproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,16 @@
215215
files = (
216216
);
217217
inputPaths = (
218+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
219+
"${PODS_ROOT}/Manifest.lock",
218220
);
219221
name = "[CP] Check Pods Manifest.lock";
220222
outputPaths = (
223+
"$(DERIVED_FILE_DIR)/Pods-Koloda_Example-checkManifestLockResult.txt",
221224
);
222225
runOnlyForDeploymentPostprocessing = 0;
223226
shellPath = /bin/sh;
224-
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";
227+
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";
225228
showEnvVarsInLog = 0;
226229
};
227230
64922D3147424C142700ED20 /* [CP] Embed Pods Frameworks */ = {
@@ -230,9 +233,14 @@
230233
files = (
231234
);
232235
inputPaths = (
236+
"${SRCROOT}/Pods/Target Support Files/Pods-Koloda_Example/Pods-Koloda_Example-frameworks.sh",
237+
"${BUILT_PRODUCTS_DIR}/Koloda/Koloda.framework",
238+
"${BUILT_PRODUCTS_DIR}/pop/pop.framework",
233239
);
234240
name = "[CP] Embed Pods Frameworks";
235241
outputPaths = (
242+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Koloda.framework",
243+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/pop.framework",
236244
);
237245
runOnlyForDeploymentPostprocessing = 0;
238246
shellPath = /bin/sh;

Pod/Classes/KolodaView/KolodaView.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,11 @@ open class KolodaView: UIView, DraggableCardDelegate {
206206
scale.width = initialFrame.width / finalFrame.width
207207
scale.height = initialFrame.height / finalFrame.height
208208

209-
return (finalFrame, scale)
209+
if #available(iOS 11, *) {
210+
return (initialFrame, scale)
211+
} else {
212+
return (finalFrame, scale)
213+
}
210214
}
211215

212216
internal func moveOtherCardsWithPercentage(_ percentage: CGFloat) {

0 commit comments

Comments
 (0)