diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib index 1dc4c2b..60b4664 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib index 9fd3907..3ed49e3 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/ColorCollectionViewCell.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/ColorCollectionViewCell.nib index 876e99d..2cf8d79 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/ColorCollectionViewCell.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/ColorCollectionViewCell.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/EmojiCollectionViewCell.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/EmojiCollectionViewCell.nib index 447e8c3..8b49ad5 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/EmojiCollectionViewCell.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/EmojiCollectionViewCell.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib index 9bbb65c..7717f56 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib index c10acb1..79ae53f 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Modules/OSPhotoEditor.swiftmodule/arm.swiftmodule b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Modules/OSPhotoEditor.swiftmodule/arm.swiftmodule index ce542fa..46910ab 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Modules/OSPhotoEditor.swiftmodule/arm.swiftmodule and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/Modules/OSPhotoEditor.swiftmodule/arm.swiftmodule differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/OSPhotoEditor b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/OSPhotoEditor index 8c8ab4b..125f337 100755 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/OSPhotoEditor and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/OSPhotoEditor differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/objects-11.0+.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/objects-11.0+.nib index 40ec0d9..3737751 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/objects-11.0+.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/objects-11.0+.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/runtime.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/runtime.nib index 69195b3..bf86bf5 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/runtime.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/PhotoEditorViewController.nib/runtime.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickerCollectionViewCell.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickerCollectionViewCell.nib index 3e2958e..2e0f841 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickerCollectionViewCell.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickerCollectionViewCell.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickersViewController.nib b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickersViewController.nib index fca5b64..b31ab61 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickersViewController.nib and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.framework/StickersViewController.nib differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.pbxproj b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.pbxproj index a672fa9..7edd5ca 100644 --- a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.pbxproj +++ b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.pbxproj @@ -299,7 +299,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# 1\n# Set bash script to exit immediately if any commands fail.\nset -e\n# 2\n# Setup some constants for use later on.\nFRAMEWORK_NAME=\"OSPhotoEditor\"\nOUTPUT_DIR=\"${SRCROOT}/build\"\n# 3\n# If remnants from a previous build exist, delete them.\nif [ -d \"${OUTPUT_DIR}\" ]; then\nrm -rf \"${OUTPUT_DIR}\"\nfi\n# 4\n# Build the framework for device and for simulator (using\n# all needed architectures).\n\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch arm64 -arch armv7 -arch armv7s only_active_arch=no defines_module=yes -sdk \"iphoneos\" -derivedDataPath \"${OUTPUT_DIR}\"\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch x86_64 -arch i386 only_active_arch=no defines_module=yes -sdk \"iphonesimulator\" -derivedDataPath \"${OUTPUT_DIR}\"\n\n# 5\n# Remove .framework file if exists from previous run.\nif [ -d \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\" ]; then\nrm -rf \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\nfi\n# 6\n# Copy the device version of framework.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\n# 7\n# Replace the framework executable within the framework with\n# a new version created by merging the device and simulator\n# frameworks' executables with lipo.\nlipo -create -output \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n# 8\n# Copy the Swift module mappings for the simulator into the\n# framework. The device mappings already exist from step 6.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule/\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule\"\n"; + shellScript = "# 1\n# Set bash script to exit immediately if any commands fail.\nset -e\n# 2\n# Setup some constants for use later on.\nFRAMEWORK_NAME=\"OSPhotoEditor\"\nOUTPUT_DIR=\"${SRCROOT}/build\"\n# 3\n# If remnants from a previous build exist, delete them.\nif [ -d \"${OUTPUT_DIR}\" ]; then\nrm -rf \"${OUTPUT_DIR}\"\nfi\n# 4\n# Build the framework for device and for simulator (using\n# all needed architectures).\n\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch arm64 -arch armv7 -arch armv7s only_active_arch=no defines_module=yes -sdk \"iphoneos\" -derivedDataPath \"${OUTPUT_DIR}\"\nxcodebuild -project \"${FRAMEWORK_NAME}.xcodeproj\" -scheme \"${FRAMEWORK_NAME}\" -configuration Release -arch x86_64 -arch i386 only_active_arch=no defines_module=yes -sdk \"iphonesimulator\" -derivedDataPath \"${OUTPUT_DIR}\"\n\n# 5\n# Remove .framework file if exists from previous run.\nif [ -d \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\" ]; then\nrm -rf \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\nfi\n# 6\n# Copy the device version of framework.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\"\n# 7\n# Replace the framework executable within the framework with\n# a new version created by merging the device and simulator\n# frameworks' executables with lipo.\nlipo -create -output \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphoneos/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n# 8\n# Copy the Swift module mappings for the simulator into the\n# framework. The device mappings already exist from step 6.\ncp -r \"${OUTPUT_DIR}/Build/Products/Release-iphonesimulator/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule/\" \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework/Modules/${FRAMEWORK_NAME}.swiftmodule\"\n\n# 9 delete the old framework\nif [ -d \"${FRAMEWORK_NAME}.framework\" ]; then\nrm -rf \"${FRAMEWORK_NAME}.framework\"\nfi\n# 10\n# Copy the universal framework to the project root folder\ncp -r \"${OUTPUT_DIR}/${FRAMEWORK_NAME}.framework\" \".\"\n\n# 11 delete the build folder as we only need the .framework \nif [ -d \"${OUTPUT_DIR}\" ]; then\nrm -rf \"${OUTPUT_DIR}\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.xcworkspace/xcuserdata/veyron.xcuserdatad/UserInterfaceState.xcuserstate b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.xcworkspace/xcuserdata/veyron.xcuserdatad/UserInterfaceState.xcuserstate index 2a7b7d5..fc24108 100644 Binary files a/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.xcworkspace/xcuserdata/veyron.xcuserdatad/UserInterfaceState.xcuserstate and b/src/ios/libs/OSPhotoEditor/OSPhotoEditor.xcodeproj/project.xcworkspace/xcuserdata/veyron.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/ios/libs/OSPhotoEditor/OSPhotoEditor/PhotoEditor+Controls.swift b/src/ios/libs/OSPhotoEditor/OSPhotoEditor/PhotoEditor+Controls.swift index 323267a..4ec9ccd 100755 --- a/src/ios/libs/OSPhotoEditor/OSPhotoEditor/PhotoEditor+Controls.swift +++ b/src/ios/libs/OSPhotoEditor/OSPhotoEditor/PhotoEditor+Controls.swift @@ -135,5 +135,4 @@ extension PhotoEditorViewController { } } } - }