Skip to content

Commit

Permalink
Use TransitionPatch
Browse files Browse the repository at this point in the history
  • Loading branch information
muukii committed May 15, 2019
1 parent 717e7d1 commit 938d457
Show file tree
Hide file tree
Showing 45 changed files with 2,446 additions and 115 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ playground.xcworkspace
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.0

- Use TransitionPatch, Remove CalcBox

## 0.0.9

- Disable update when orientation changed
Expand Down
1 change: 1 addition & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "muukii/TransitionPatch"
39 changes: 35 additions & 4 deletions Pixel.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
4B112F15216C9B5400EF8E25 /* ImageTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B112F14216C9B5400EF8E25 /* ImageTool.swift */; };
4B1E94B12175FB5800E9DFB8 /* StepSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9D456E216DEE95003A240A /* StepSlider.swift */; };
4B1E94B3217624A700E9DFB8 /* SliderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E94B2217624A700E9DFB8 /* SliderViewController.swift */; };
4B1E951A2176462900E9DFB8 /* CalcBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E95192176462900E9DFB8 /* CalcBox.swift */; };
4B1E951C21764DE700E9DFB8 /* GaussianBlurControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E951B21764DE700E9DFB8 /* GaussianBlurControl.swift */; };
4B1E951E21764E1800E9DFB8 /* FilterGaussianBlur.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E951D21764E1800E9DFB8 /* FilterGaussianBlur.swift */; };
4B1E95202176567300E9DFB8 /* FilterControlBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E951F2176567300E9DFB8 /* FilterControlBase.swift */; };
Expand Down Expand Up @@ -115,6 +114,7 @@
4BEE65112174DC3800F3578E /* EditorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE65102174DC3800F3578E /* EditorLog.swift */; };
4BEE65132174E99600F3578E /* EngineLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE65122174E99600F3578E /* EngineLog.swift */; };
4BEE65152174EB5800F3578E /* DrawnPathInRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE65142174EB5800F3578E /* DrawnPathInRect.swift */; };
5FEA3663DD99BD359BFF0ED4 /* Pods_PixelEditor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77AF225663E1B55649C3398D /* Pods_PixelEditor.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -150,6 +150,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
2AE1CE09BB0852CA575DA207 /* Pods-PixelEditor.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PixelEditor.release.xcconfig"; path = "Pods/Target Support Files/Pods-PixelEditor/Pods-PixelEditor.release.xcconfig"; sourceTree = "<group>"; };
4B0077BD2170496E008330EA /* BlurredMask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurredMask.swift; sourceTree = "<group>"; };
4B0077BF21704E7F008330EA /* MaskControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaskControlView.swift; sourceTree = "<group>"; };
4B01137D216FBA5C00CF09F6 /* DryDrawingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DryDrawingView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -177,7 +178,6 @@
4B1E94FC217634AA00E9DFB8 /* FilterChannels.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterChannels.swift; sourceTree = "<group>"; };
4B1E94FE217634AA00E9DFB8 /* FilterSharpen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterSharpen.swift; sourceTree = "<group>"; };
4B1E94FF217634AA00E9DFB8 /* FilterHighlights.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterHighlights.swift; sourceTree = "<group>"; };
4B1E95192176462900E9DFB8 /* CalcBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalcBox.swift; sourceTree = "<group>"; };
4B1E951B21764DE700E9DFB8 /* GaussianBlurControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GaussianBlurControl.swift; sourceTree = "<group>"; };
4B1E951D21764E1800E9DFB8 /* FilterGaussianBlur.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterGaussianBlur.swift; sourceTree = "<group>"; };
4B1E951F2176567300E9DFB8 /* FilterControlBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterControlBase.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -265,6 +265,8 @@
4BEE65122174E99600F3578E /* EngineLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EngineLog.swift; sourceTree = "<group>"; };
4BEE65142174EB5800F3578E /* DrawnPathInRect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawnPathInRect.swift; sourceTree = "<group>"; };
58002AF806D93AB53E224855 /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.release.xcconfig"; path = "Pods/Target Support Files/Pods-Demo/Pods-Demo.release.xcconfig"; sourceTree = "<group>"; };
77AF225663E1B55649C3398D /* Pods_PixelEditor.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PixelEditor.framework; sourceTree = BUILT_PRODUCTS_DIR; };
98AC6E4BEF28CC71031BF300 /* Pods-PixelEditor.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PixelEditor.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PixelEditor/Pods-PixelEditor.debug.xcconfig"; sourceTree = "<group>"; };
9B38E5B35129587C07BF56E1 /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D063024D47BA1B6BB7890F47 /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Demo/Pods-Demo.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -275,6 +277,7 @@
buildActionMask = 2147483647;
files = (
4B47D064216CC5640007B594 /* PixelEngine.framework in Frameworks */,
5FEA3663DD99BD359BFF0ED4 /* Pods_PixelEditor.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -507,6 +510,7 @@
4B600B3A216B7CDD001E1456 /* AVFoundation.framework */,
4B600B38216B7CD6001E1456 /* CoreImage.framework */,
9B38E5B35129587C07BF56E1 /* Pods_Demo.framework */,
77AF225663E1B55649C3398D /* Pods_PixelEditor.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -555,7 +559,6 @@
isa = PBXGroup;
children = (
4BEE65102174DC3800F3578E /* EditorLog.swift */,
4B1E95192176462900E9DFB8 /* CalcBox.swift */,
);
path = Utils;
sourceTree = "<group>";
Expand All @@ -565,6 +568,8 @@
children = (
D063024D47BA1B6BB7890F47 /* Pods-Demo.debug.xcconfig */,
58002AF806D93AB53E224855 /* Pods-Demo.release.xcconfig */,
98AC6E4BEF28CC71031BF300 /* Pods-PixelEditor.debug.xcconfig */,
2AE1CE09BB0852CA575DA207 /* Pods-PixelEditor.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand Down Expand Up @@ -595,6 +600,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 4B47D05D216CC5350007B594 /* Build configuration list for PBXNativeTarget "PixelEditor" */;
buildPhases = (
B290028DADE3FEB401977859 /* [CP] Check Pods Manifest.lock */,
4B47D04D216CC5350007B594 /* Headers */,
4B47D04E216CC5350007B594 /* Sources */,
4B47D04F216CC5350007B594 /* Frameworks */,
Expand Down Expand Up @@ -755,6 +761,28 @@
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;
};
B290028DADE3FEB401977859 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-PixelEditor-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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
E72FAEC0768DA68CACAD9E68 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -765,12 +793,14 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh",
"${PODS_ROOT}/Reveal-SDK/RevealServer-18/iOS/RevealServer.framework",
"${BUILT_PRODUCTS_DIR}/TransitionPatch/TransitionPatch.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TransitionPatch.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -784,7 +814,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4B1E951A2176462900E9DFB8 /* CalcBox.swift in Sources */,
4B47D061216CC5480007B594 /* ZoomImageView.swift in Sources */,
4B9D4577216E0694003A240A /* ImagePreviewView.swift in Sources */,
4B1E95202176567300E9DFB8 /* FilterControlBase.swift in Sources */,
Expand Down Expand Up @@ -918,6 +947,7 @@
/* Begin XCBuildConfiguration section */
4B47D05B216CC5350007B594 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 98AC6E4BEF28CC71031BF300 /* Pods-PixelEditor.debug.xcconfig */;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -945,6 +975,7 @@
};
4B47D05C216CC5350007B594 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2AE1CE09BB0852CA575DA207 /* Pods-PixelEditor.release.xcconfig */;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
Expand Down
2 changes: 2 additions & 0 deletions PixelEditor.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ Pod::Spec.new do |s|

s.resources = "Sources/PixelEditor/Media.xcassets"
s.dependency 'PixelEngine'

s.dependency 'TransitionPatch', '~> 1.0.0'
end
5 changes: 5 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '10.0'

target 'PixelEditor' do
use_frameworks!
pod 'TransitionPatch'
end

target 'Demo' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!
Expand Down
8 changes: 6 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
PODS:
- Reveal-SDK (18)
- TransitionPatch (1.0.0)

DEPENDENCIES:
- Reveal-SDK
- TransitionPatch

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Reveal-SDK
- TransitionPatch

SPEC CHECKSUMS:
Reveal-SDK: cce79388da3fd0bbb6ae19d769b906cfc3a33a89
TransitionPatch: 10033383e2c048b6d00d6ab0182ddc15a19d7094

PODFILE CHECKSUM: 98687508331c8c6dc19695dcbd26dbd8e9e9513e
PODFILE CHECKSUM: 14513452cfadd814324174bdaa1d7f46785b06d9

COCOAPODS: 1.6.0.beta.2
COCOAPODS: 1.6.1
20 changes: 20 additions & 0 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 938d457

Please sign in to comment.