-
Notifications
You must be signed in to change notification settings - Fork 676
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from richardoti/refactor
Refactor
- Loading branch information
Showing
7 changed files
with
202 additions
and
62 deletions.
There are no files selected for viewing
112 changes: 112 additions & 0 deletions
112
...ImagePickerDemo/ImagePickerDemo.xcodeproj/xcshareddata/xcschemes/ImagePickerDemo.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Scheme | ||
| LastUpgradeVersion = "0640" | ||
| version = "1.3"> | ||
| <BuildAction | ||
| parallelizeBuildables = "YES" | ||
| buildImplicitDependencies = "YES"> | ||
| <BuildActionEntries> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "YES" | ||
| buildForArchiving = "YES" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "29D699D81B70ABFC0021FA73" | ||
| BuildableName = "ImagePickerDemo.app" | ||
| BlueprintName = "ImagePickerDemo" | ||
| ReferencedContainer = "container:ImagePickerDemo.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "NO" | ||
| buildForArchiving = "NO" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "29D699ED1B70ABFC0021FA73" | ||
| BuildableName = "ImagePickerDemoTests.xctest" | ||
| BlueprintName = "ImagePickerDemoTests" | ||
| ReferencedContainer = "container:ImagePickerDemo.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| </BuildActionEntries> | ||
| </BuildAction> | ||
| <TestAction | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| buildConfiguration = "Debug"> | ||
| <Testables> | ||
| <TestableReference | ||
| skipped = "NO"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "29D699ED1B70ABFC0021FA73" | ||
| BuildableName = "ImagePickerDemoTests.xctest" | ||
| BlueprintName = "ImagePickerDemoTests" | ||
| ReferencedContainer = "container:ImagePickerDemo.xcodeproj"> | ||
| </BuildableReference> | ||
| </TestableReference> | ||
| </Testables> | ||
| <MacroExpansion> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "29D699D81B70ABFC0021FA73" | ||
| BuildableName = "ImagePickerDemo.app" | ||
| BlueprintName = "ImagePickerDemo" | ||
| ReferencedContainer = "container:ImagePickerDemo.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 | ||
| runnableDebuggingMode = "0"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "29D699D81B70ABFC0021FA73" | ||
| BuildableName = "ImagePickerDemo.app" | ||
| BlueprintName = "ImagePickerDemo" | ||
| ReferencedContainer = "container:ImagePickerDemo.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| <AdditionalOptions> | ||
| </AdditionalOptions> | ||
| </LaunchAction> | ||
| <ProfileAction | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| savedToolIdentifier = "" | ||
| useCustomWorkingDirectory = "NO" | ||
| buildConfiguration = "Release" | ||
| debugDocumentVersioning = "YES"> | ||
| <BuildableProductRunnable | ||
| runnableDebuggingMode = "0"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "29D699D81B70ABFC0021FA73" | ||
| BuildableName = "ImagePickerDemo.app" | ||
| BlueprintName = "ImagePickerDemo" | ||
| ReferencedContainer = "container:ImagePickerDemo.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| </ProfileAction> | ||
| <AnalyzeAction | ||
| buildConfiguration = "Debug"> | ||
| </AnalyzeAction> | ||
| <ArchiveAction | ||
| buildConfiguration = "Release" | ||
| revealArchiveInOrganizer = "YES"> | ||
| </ArchiveAction> | ||
| </Scheme> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,47 @@ | ||
| import UIKit | ||
|
|
||
| class ImageStack: UIView { | ||
| protocol ImageStackDelegate { | ||
| func imageStackDidReload() | ||
| } | ||
|
|
||
| var images: NSMutableArray = NSMutableArray() | ||
| var views: NSMutableArray = NSMutableArray() | ||
| struct ImageStack { | ||
|
|
||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
| static var sharedStack = ImageStack() | ||
|
|
||
| } | ||
| var images: NSMutableArray = NSMutableArray() | ||
| var delegate: ImageStackDelegate? | ||
|
|
||
| func pushImage(image: UIImage) { | ||
| images.insertObject(image, atIndex: 0) | ||
| delegate?.imageStackDidReload() | ||
| println("Image pushed") | ||
| println(images) | ||
| } | ||
|
|
||
| func dropImage(image: UIImage) { | ||
| images.removeObject(image) | ||
| delegate?.imageStackDidReload() | ||
| println("Image dropped") | ||
| println(images) | ||
| } | ||
|
|
||
| required init(coder aDecoder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| func containsImage(image: UIImage) -> Bool { | ||
| return images.containsObject(image) | ||
| } | ||
|
|
||
| func getImages() -> [UIImage] { | ||
| // let size = images.count > 4 ? 3 : images.count | ||
| // var array = [UIImage]() | ||
| // for i in 0...size { | ||
| // array.append(images[i] as! UIImage) | ||
| // } | ||
| // return array | ||
| println("b") | ||
| var array: [UIImage] = [UIImage]() | ||
| for image in images { | ||
| println("a") | ||
| array.append(image as! UIImage) | ||
| } | ||
| return array | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| import UIKit | ||
|
|
||
| class StackView: UIView { | ||
|
|
||
| let stack: ImageStack = ImageStack.sharedStack | ||
| var images: [UIImage] = [UIImage]() | ||
| var views: [UIImageView] = { | ||
| var array = [UIImageView]() | ||
| for i in 1...4 { | ||
| array.append(UIImageView()) | ||
| } | ||
| return array | ||
| }() | ||
|
|
||
| lazy var viewSize: CGSize = CGSize(width: self.frame.width * 0.6, height: self.frame.height * 0.6) | ||
|
|
||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
| backgroundColor = UIColor.blueColor() | ||
|
|
||
| addViews() | ||
| layoutSubviews() | ||
| ImageStack.sharedStack.delegate = self | ||
| } | ||
|
|
||
| func addViews() { | ||
| views.map{ self.addSubview($0) } | ||
| } | ||
|
|
||
| override func layoutSubviews() { | ||
| let stride = -4 | ||
| for (i, view) in enumerate(views) { | ||
| println("a") | ||
| var side = i * stride | ||
| var frame = CGRect(origin: CGPoint(x: side, y: side), size: viewSize) | ||
| view.frame = frame | ||
| view.backgroundColor = UIColor.redColor() | ||
| view.layer.borderColor = UIColor.blackColor().CGColor | ||
| view.layer.borderWidth = 1 | ||
| } | ||
| } | ||
|
|
||
| required init(coder aDecoder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
| } | ||
|
|
||
| extension StackView: ImageStackDelegate { | ||
| func imageStackDidReload() { | ||
| for (index, image) in enumerate(stack.getImages()) { | ||
| if index < 4 { | ||
| views[index].image = image | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters