-
Notifications
You must be signed in to change notification settings - Fork 21
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
[Pigbag] Step04 - 2 image추가 로직, View Factory 리팩토링 #106
Open
piggyse
wants to merge
12
commits into
codesquad-members-2022:pigbag
Choose a base branch
from
piggyse:Step04-2
base: pigbag
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
28b66ea
[Refatcory] Rectangle With origin Dictionary -> Rectangle with x,yPoint
piggyse b36cc82
[Refactory] Factory method -> Static
piggyse cd7623c
[Delete] ViewProtocol & RectangleViewClass
piggyse 7d6e924
[Refactory] RectangleViewFactory
piggyse b620f31
[Delete] ImagePicker
piggyse 3e504de
[Add] PHPicker
piggyse 7b1fd60
[ADD] ImageRectangle ADD function
piggyse add9eb8
[Fix] Photo ADD Error
piggyse a286b52
[Refactory] didFinishPicking
piggyse f86865d
[ADD] Find selected ImageRectangleView
piggyse 28b5b85
[ADD] ChangeAlpha objc func
piggyse dc45fb3
[Chore] fix some annotation
piggyse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // | ||
| // RectanlgeViewFactory.swift | ||
| // DrawingApp | ||
| // | ||
| // Created by 박진섭 on 2022/03/15. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| final class RectangleViewFactory { | ||
|
|
||
| //planeRectangleView | ||
| static func makePlaneRectangleView(sourceRectangle: Rectangleable) -> UIView { | ||
| let source = sourceRectangle as! PlaneRectangle | ||
| let rectangleView = UIView(frame: .zero) | ||
| rectangleView.frame = setUpFrameWithRectangle(source) | ||
| rectangleView.backgroundColor = setupBackgroundColor(rgb: source.rgb, alpha: source.alpha) | ||
| return rectangleView | ||
| } | ||
|
|
||
| //IamgeView | ||
| static func makeImageRectangleView(sourceRectangle: Rectangleable) -> UIImageView { | ||
| let source = sourceRectangle as! ImageRectangle | ||
| let rectangleView = UIImageView(frame: .zero) | ||
| rectangleView.frame = setUpFrameWithRectangle(source) | ||
| rectangleView.image = setupImage(imageData: source.imageData) | ||
| return rectangleView | ||
| } | ||
|
|
||
|
|
||
| //Setup private Static functions, Pure Func? | ||
| private static func setUpFrameWithRectangle(_ source:Rectangleable) -> CGRect { | ||
| let x = source.origin.x | ||
| let y = source.origin.y | ||
| let width = source.size.width | ||
| let height = source.size.height | ||
| return CGRect(x: x, y: y, width: width, height: height) | ||
| } | ||
|
|
||
| private static func setupBackgroundColor(rgb:RGB, alpha:Alpha) -> UIColor { | ||
| let red = rgb.red | ||
| let green = rgb.green | ||
| let blue = rgb.blue | ||
| return UIColor( | ||
| red: CGFloat(red) / 255, | ||
| green: CGFloat(green) / 255, | ||
| blue: CGFloat(blue) / 255, | ||
| alpha: CGFloat(alpha.value) | ||
| ) | ||
| } | ||
|
|
||
| private static func setupImage(imageData:Data) -> UIImage{ | ||
| return UIImage(data: imageData) ?? UIImage() | ||
| } | ||
|
|
||
| } | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
다음에는 여기서 return 타입을 추상화해 보는 것도 좋은 시도가 될 것 같습니다.
UIView와 UIImage를 생성하지만 받는 쪽에서 구체 타입을 최소한으로 알고 다룰 수 있도록 하는거죠.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
넵 !시도해보겠습니다