Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow PixelEditor to be loaded with a PHAsset #39

Merged
merged 10 commits into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Pixel.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@
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 */; };
FC5DAE6E23A75ACB00DD51E6 /* PHAssetDownloadEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC5DAE6C23A75A8A00DD51E6 /* PHAssetDownloadEditorViewController.swift */; };
FCC7962623C58209009ACD8A /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC7962523C58209009ACD8A /* LoadingView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -269,6 +271,8 @@
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>"; };
FC5DAE6C23A75A8A00DD51E6 /* PHAssetDownloadEditorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PHAssetDownloadEditorViewController.swift; sourceTree = "<group>"; };
FCC7962523C58209009ACD8A /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -491,6 +495,7 @@
4B600B24216B7C9C001E1456 /* ViewController.swift */,
4B01C560217F72BA00C50EDE /* ResizeViewController.swift */,
4B47D065216CC5DB0007B594 /* EditorViewController.swift */,
FC5DAE6C23A75A8A00DD51E6 /* PHAssetDownloadEditorViewController.swift */,
4B600B26216B7C9C001E1456 /* Main.storyboard */,
4B600B29216B7C9E001E1456 /* Assets.xcassets */,
4B600B2B216B7C9E001E1456 /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -552,6 +557,7 @@
4BEE650E21749E7A00F3578E /* ImageScrollView.swift */,
4B9D456E216DEE95003A240A /* StepSlider.swift */,
4B01137D216FBA5C00CF09F6 /* DryDrawingView.swift */,
FCC7962523C58209009ACD8A /* LoadingView.swift */,
4B3457892174FF8600716DA0 /* Controls */,
);
path = Components;
Expand Down Expand Up @@ -826,6 +832,7 @@
4B42A6AB2178E13600F18208 /* TemperatureControl.swift in Sources */,
4B47D063216CC5480007B594 /* PixelEditViewController.swift in Sources */,
4B34578B217502F900716DA0 /* Style.swift in Sources */,
FCC7962623C58209009ACD8A /* LoadingView.swift in Sources */,
4B9D4575216DF66F003A240A /* NavigationView.swift in Sources */,
4B1E9537217714D500E9DFB8 /* EditMenuControlView.swift in Sources */,
4B42A6A52178DF2600F18208 /* SaturationControl.swift in Sources */,
Expand Down Expand Up @@ -895,6 +902,7 @@
files = (
4BE01796216F08D80026DFD6 /* HardwareImageViewController.swift in Sources */,
4BE0179A216F16250026DFD6 /* SmallHardwareImageViewController.swift in Sources */,
FC5DAE6E23A75ACB00DD51E6 /* PHAssetDownloadEditorViewController.swift in Sources */,
4B600B25216B7C9C001E1456 /* ViewController.swift in Sources */,
4BE01798216F16120026DFD6 /* SmallUIImageViewController.swift in Sources */,
4B9B02E1216BB6D4001593B9 /* UIImageViewViewController.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ end
target 'Demo' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!

pod 'MosaiqueAssetsPicker', :git => 'git@github.com:eure/AssetsPicker.git'
pod 'Reveal-SDK'
end
18 changes: 15 additions & 3 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
PODS:
- MosaiqueAssetsPicker (1.0.0)
- Reveal-SDK (24)
- TransitionPatch (1.0.2)

DEPENDENCIES:
- "MosaiqueAssetsPicker (from `git@github.com:eure/AssetsPicker.git`)"
- Reveal-SDK
- TransitionPatch

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

EXTERNAL SOURCES:
MosaiqueAssetsPicker:
:git: "git@github.com:eure/AssetsPicker.git"

CHECKOUT OPTIONS:
MosaiqueAssetsPicker:
:commit: 6322f7d85e0a720d356c4fd4e55073bc853307f6
:git: "git@github.com:eure/AssetsPicker.git"

SPEC CHECKSUMS:
MosaiqueAssetsPicker: 2cdd49293075c7fe5fe9fe3a85c30fd8b5238c19
Reveal-SDK: 5d7e56b8f018c0a88b3a2c10bf68d598bbd3b071
TransitionPatch: c02b48b1429255b14ef82b7e411034e0958b9681

PODFILE CHECKSUM: 14513452cfadd814324174bdaa1d7f46785b06d9
PODFILE CHECKSUM: 1ea184385e5d74284c3d7c3ca4567dfc0ebb3b6c

COCOAPODS: 1.7.5
COCOAPODS: 1.8.4
25 changes: 25 additions & 0 deletions Pods/Local Podspecs/MosaiqueAssetsPicker.podspec.json

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

18 changes: 15 additions & 3 deletions Pods/Manifest.lock

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

21 changes: 21 additions & 0 deletions Pods/MosaiqueAssetsPicker/LICENSE.txt

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

147 changes: 147 additions & 0 deletions Pods/MosaiqueAssetsPicker/README.md

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

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

Loading