-
Notifications
You must be signed in to change notification settings - Fork 5
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
[Design] #22-리뷰 작성 UI #65
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
91cfa27
[Design] #22-리뷰 작성 UI 요소 추가
0lynny 62891a2
[Design] #22-TextView Placeholder 설정
0lynny cc73a55
[Design] 리뷰 작성 ScrollView UI
0lynny f12ac7f
[Design] #22-리뷰작성 UI 변경된 부분 재구현
0lynny 57c6e9e
[Design] #22-태그 버튼, 후기작성 TextView UI
0lynny 0bbe7fd
[Add] #22-리뷰 작성 화면에 필요한 에셋 추가
0lynny b9c62b4
[Design] #22-리뷰 사진 추가 CollectionView UI
0lynny 8e4d93b
[Add] #22-BSImagePicker 라이브러리 추가
0lynny 231b8d5
[Design] #22-사진 추가 UI
0lynny 47dab8b
[Design] #22-카메라로 리뷰 이미지 추가 UI
0lynny 3073285
[Design] #22-리뷰쓰기 버튼 UI 추가
0lynny 3362fb3
[Merge] #22-Conflict 해결
0lynny 7f049ce
[Refactor] #22-코드리뷰반영
0lynny 152dd36
[Merge] #22-merge
0lynny 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
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
6 changes: 6 additions & 0 deletions
6
HealthFoodMe/HealthFoodMe/Global/Resources/Assets.xcassets/ReviewWrite/Contents.json
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,6 @@ | ||
{ | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
23 changes: 23 additions & 0 deletions
23
...althFoodMe/Global/Resources/Assets.xcassets/ReviewWrite/btn_delete.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "btn_imgdelete.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "btn_imgdelete@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "btn_imgdelete@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+532 Bytes
...bal/Resources/Assets.xcassets/ReviewWrite/btn_delete.imageset/btn_imgdelete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.01 KB
.../Resources/Assets.xcassets/ReviewWrite/btn_delete.imageset/btn_imgdelete@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.44 KB
.../Resources/Assets.xcassets/ReviewWrite/btn_delete.imageset/btn_imgdelete@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...thFoodMe/Global/Resources/Assets.xcassets/ReviewWrite/icn_photoAdd.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "Vector.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "Vector@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "Vector@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+672 Bytes
...e/Global/Resources/Assets.xcassets/ReviewWrite/icn_photoAdd.imageset/Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.12 KB
...lobal/Resources/Assets.xcassets/ReviewWrite/icn_photoAdd.imageset/Vector@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.55 KB
...lobal/Resources/Assets.xcassets/ReviewWrite/icn_photoAdd.imageset/Vector@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
103 changes: 103 additions & 0 deletions
103
HealthFoodMe/HealthFoodMe/Presentation/Detail/ReviewWriteScene/Cells/AddPhotoCVC.swift
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,103 @@ | ||
// | ||
// AddPhotoCVC.swift | ||
// HealthFoodMe | ||
// | ||
// Created by 최영린 on 2022/07/13. | ||
// | ||
|
||
import UIKit | ||
import Photos | ||
|
||
import BSImagePicker | ||
import SnapKit | ||
|
||
protocol AddImageDelegate: AnyObject { | ||
func didPickImagesToUpload(images: [UIImage]) | ||
} | ||
|
||
final class AddPhotoCVC: UICollectionViewCell, UICollectionViewRegisterable { | ||
|
||
// MARK: - Properties | ||
|
||
static var isFromNib = false | ||
weak var delegate: AddImageDelegate? | ||
|
||
var selectedAssets: [PHAsset] = [PHAsset]() | ||
var userSelectedImages: [UIImage] = [UIImage]() | ||
|
||
// MARK: - UI Components | ||
|
||
let addPhotoView: UIView = { | ||
let view = UIView() | ||
view.backgroundColor = .helfmeWhite | ||
return view | ||
}() | ||
|
||
lazy var addPhotoImageView: UIImageView = { | ||
let imageView = UIImageView() | ||
imageView.image = ImageLiterals.ReviewWrite.addPhotoIcon | ||
return imageView | ||
}() | ||
|
||
lazy var photoCountLabel: UILabel = { | ||
let lb = UILabel() | ||
lb.text = "0/5" | ||
lb.textColor = .helfmeTagGray | ||
lb.font = .NotoRegular(size: 14) | ||
return lb | ||
}() | ||
|
||
// MARK: - Life Cycle Part | ||
|
||
override init(frame: CGRect) { | ||
super.init(frame: frame) | ||
setUI() | ||
setLayout() | ||
} | ||
|
||
required init?(coder aDecoder: NSCoder) { | ||
fatalError("init(coder:) has not been implemented") | ||
} | ||
} | ||
|
||
// MARK: - Methods | ||
|
||
extension AddPhotoCVC { | ||
func setLineDot(view: UIView, color: UIColor, radius: CGFloat) { | ||
let borderLayer = CAShapeLayer() | ||
borderLayer.strokeColor = color.cgColor | ||
borderLayer.lineDashPattern = [2, 2] | ||
borderLayer.frame = view.bounds | ||
borderLayer.fillColor = nil | ||
borderLayer.path = UIBezierPath(roundedRect: view.bounds, cornerRadius: radius).cgPath | ||
|
||
view.layer.addSublayer(borderLayer) | ||
} | ||
|
||
func setUI() { | ||
setLineDot(view: addPhotoView, color: UIColor.helfmeTagGray, radius: 8) | ||
} | ||
Comment on lines
+77
to
+79
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 잘 한거같은디...왜지? |
||
|
||
func setLayout() { | ||
contentView.addSubview(addPhotoView) | ||
|
||
addPhotoView.addSubviews(addPhotoImageView, photoCountLabel) | ||
|
||
addPhotoView.snp.makeConstraints { make in | ||
make.edges.equalToSuperview() | ||
// make.width.height.equalTo(105) | ||
} | ||
|
||
addPhotoImageView.snp.makeConstraints { make in | ||
make.top.equalToSuperview().inset(28) | ||
make.centerX.equalToSuperview() | ||
make.width.equalTo(31) | ||
} | ||
|
||
photoCountLabel.snp.makeConstraints { make in | ||
make.top.equalTo(addPhotoImageView.snp.bottom).offset(9) | ||
make.centerX.equalToSuperview() | ||
make.width.equalTo(22) | ||
} | ||
} | ||
} |
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.
👍🏻👍🏻 p5;