Permalink
Browse files

Cleanup and removal of some confusing bits

- Simple demo added for quick grab of core functionality
- Removal of dependency on EDStorage, a simple singleton using NSOperationQueue is used instead that can be easily modified
  • Loading branch information...
Dillion committed Apr 16, 2013
1 parent a7e5fb5 commit 789bae62f758b70a3c5712b715a92c62b369c5a6
Showing with 821 additions and 602 deletions.
  1. BIN EssentialImagerDemo/Default-568h@2x.png
  2. +191 −63 EssentialImagerDemo/EssentialImagerDemo.xcodeproj/project.pbxproj
  3. BIN ...mo.xcodeproj/project.xcworkspace/xcuserdata/dilliontan.xcuserdatad/UserInterfaceState.xcuserstate
  4. +10 −0 ...Demo.xcodeproj/project.xcworkspace/xcuserdata/dilliontan.xcuserdatad/WorkspaceSettings.xcsettings
  5. +5 −0 ...EssentialImagerDemo.xcodeproj/xcuserdata/dilliontan.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  6. +86 −0 ...Demo/EssentialImagerDemo.xcodeproj/xcuserdata/dilliontan.xcuserdatad/xcschemes/Full Demo.xcscheme
  7. +9 −8 ...xcuserdata/dilliontan.xcuserdatad/xcschemes/{EssentialImagerDemo.xcscheme → Simple Demo.xcscheme}
  8. +11 −1 ...ssentialImagerDemo.xcodeproj/xcuserdata/dilliontan.xcuserdatad/xcschemes/xcschememanagement.plist
  9. +0 −11 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EDStorage/EDStorage.h
  10. +0 −70 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EDStorage/EDStorageManager.h
  11. +0 −175 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EDStorage/EDStorageManager.m
  12. +0 −23 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EDStorage/EDStorageOperation.h
  13. +0 −62 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EDStorage/EDStorageOperation.m
  14. +0 −94 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EDStorage/NSData+Storage.m
  15. +20 −0 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EIOperationManager.h
  16. +73 −0 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EIOperationManager.m
  17. +2 −1 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/EssentialImager.h
  18. +8 −6 ...alImagerDemo/EssentialImagerDemo/EssentialImager/{EDStorage/UIImage+Storage.h → NSData+Storage.h}
  19. +31 −16 ...ialImagerDemo/EssentialImagerDemo/EssentialImager/{EDStorage/NSData+Storage.h → NSData+Storage.m}
  20. +19 −13 EssentialImagerDemo/EssentialImagerDemo/EssentialImager/UIImage+Resize.m
  21. +3 −3 ...gerDemo/EssentialImagerDemo/{EssentialImagerDemo-Info.plist → EssentialImagerFullDemo-Info.plist}
  22. +42 −0 EssentialImagerDemo/EssentialImagerDemo/EssentialImagerSimpleDemo-Info.plist
  23. +1 −1 ...ialImagerDemo/EssentialImagerDemo/{EIDemoViewController.h → Full Demo/EIFullDemoViewController.h}
  24. +18 −22 ...ialImagerDemo/EssentialImagerDemo/{EIDemoViewController.m → Full Demo/EIFullDemoViewController.m}
  25. +3 −3 EssentialImagerDemo/EssentialImagerDemo/{AppDelegate.h → Full Demo/FullDemoAppDelegate.h}
  26. +3 −5 EssentialImagerDemo/EssentialImagerDemo/{AppDelegate.m → Full Demo/FullDemoAppDelegate.m}
  27. +2 −3 EssentialImagerDemo/EssentialImagerDemo/{ → Full Demo}/main.m
  28. +12 −22 ...agerDemo/{EssentialImager/EDStorage/UIImage+Storage.m → Simple Demo/EISimpleDemoViewController.h}
  29. +183 −0 EssentialImagerDemo/EssentialImagerDemo/Simple Demo/EISimpleDemoViewController.m
  30. +17 −0 EssentialImagerDemo/EssentialImagerDemo/Simple Demo/SimpleDemoAppDelegate.h
  31. +55 −0 EssentialImagerDemo/EssentialImagerDemo/Simple Demo/SimpleDemoAppDelegate.m
  32. +17 −0 EssentialImagerDemo/EssentialImagerDemo/Simple Demo/main.m
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+ <true/>
+ <key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+ <false/>
+</dict>
+</plist>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+ type = "1"
+ version = "1.0">
+</Bucket>
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0460"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "4D1992A2171D097B009F6E18"
+ BuildableName = "EssentialImagerFullDemo.app"
+ BlueprintName = "EssentialImagerFullDemo"
+ ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "4D1992A2171D097B009F6E18"
+ BuildableName = "EssentialImagerFullDemo.app"
+ BlueprintName = "EssentialImagerFullDemo"
+ ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "4D1992A2171D097B009F6E18"
+ BuildableName = "EssentialImagerFullDemo.app"
+ BlueprintName = "EssentialImagerFullDemo"
+ ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "4D1992A2171D097B009F6E18"
+ BuildableName = "EssentialImagerFullDemo.app"
+ BlueprintName = "EssentialImagerFullDemo"
+ ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -14,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4D79EC3215B08111007C9A90"
- BuildableName = "EssentialImagerDemo.app"
- BlueprintName = "EssentialImagerDemo"
+ BuildableName = "EssentialImagerSimpleDemo.app"
+ BlueprintName = "EssentialImagerSimpleDemo"
ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -32,8 +33,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4D79EC3215B08111007C9A90"
- BuildableName = "EssentialImagerDemo.app"
- BlueprintName = "EssentialImagerDemo"
+ BuildableName = "EssentialImagerSimpleDemo.app"
+ BlueprintName = "EssentialImagerSimpleDemo"
ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -51,8 +52,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4D79EC3215B08111007C9A90"
- BuildableName = "EssentialImagerDemo.app"
- BlueprintName = "EssentialImagerDemo"
+ BuildableName = "EssentialImagerSimpleDemo.app"
+ BlueprintName = "EssentialImagerSimpleDemo"
ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
@@ -69,8 +70,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4D79EC3215B08111007C9A90"
- BuildableName = "EssentialImagerDemo.app"
- BlueprintName = "EssentialImagerDemo"
+ BuildableName = "EssentialImagerSimpleDemo.app"
+ BlueprintName = "EssentialImagerSimpleDemo"
ReferencedContainer = "container:EssentialImagerDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
@@ -4,14 +4,24 @@
<dict>
<key>SchemeUserState</key>
<dict>
- <key>EssentialImagerDemo.xcscheme</key>
+ <key>Full Demo.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>1</integer>
+ </dict>
+ <key>Simple Demo.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
+ <key>4D1992A2171D097B009F6E18</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
<key>4D79EC3215B08111007C9A90</key>
<dict>
<key>primary</key>
@@ -1,11 +0,0 @@
-//
-// EDStorage.h
-// storage
-//
-// Created by Andrew Sliwinski on 6/23/12.
-// Copyright (c) 2012 Andrew Sliwinski. All rights reserved.
-//
-
-#import "EDStorageManager.h"
-#import "NSData+Storage.h"
-#import "UIImage+Storage.h"
@@ -1,70 +0,0 @@
-/*
-
- File: EDStorageManager.h
- Abstract: Modified to use directory paths from StandardPaths,
- add scale suffix to extension
-
- Copyright (c) 2012 Dillion Tan
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- */
-
-//
-// EDStorageManager.h
-// storage
-//
-// Created by Andrew Sliwinski on 6/23/12.
-// Copyright (c) 2012 DIY, Co. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-//
-
-#define DEFINE_SHARED_INSTANCE_USING_BLOCK(block) \
-static dispatch_once_t pred = 0; \
-__strong static id _sharedObject = nil; \
-dispatch_once(&pred, ^{ \
-_sharedObject = block(); \
-}); \
-return _sharedObject; \
-
-typedef enum // changed to match paths from StandardPaths
-{
- kDirectoryPublic,
- kDirectoryPrivate,
- kDirectoryCache,
- kDirectoryOffline,
- kDirectoryTemporary,
- kDirectoryResource,
-} Location;
-
-@interface EDStorageManager : NSObject
-{
- @private NSOperationQueue *queue;
-}
-
-+ (EDStorageManager *)sharedInstance;
-- (void)persistData:(id)data withExtension:(NSString *)ext toLocation:(Location)location success:(void (^)(NSURL *url, NSUInteger size))success failure:(void (^)(NSError *error))failure;
-
-@end
Oops, something went wrong.

0 comments on commit 789bae6

Please sign in to comment.