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.

Sign up for GitHub

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

[밀봉/개봉 화면] 버그 수정 #104

Merged
merged 2 commits into from
Dec 12, 2022
Merged

[밀봉/개봉 화면] 버그 수정 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61870af
[fix] 캡슐 이미지, Label 간 레이아웃 조정 (#99)
pyj9748 Dec 12, 2022
b7d1ddf
[fix] 개봉 불가능한 캡슐 버튼 비활성화 (#99)
pyj9748 Dec 12, 2022
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
4 changes: 2 additions & 2 deletions SpaceCapsule/SpaceCapsule/Resources/AnimationResource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ enum AnimationResource {
static let capsuleShakeWidth: CGFloat = 4.0
static let capsuleShakeDuration: CFTimeInterval = 0.05
static let capsuleShakeRepeat: Float = 5.0

static let capsuleMoveHeight: CGFloat = 20.0
static let capsuleMoveDuration: CFTimeInterval = 1.0
static let capsuleMoveDelay: CFTimeInterval = 0.0
static let destinationHeightRatio: CGFloat = (2 / 5)
static let destinationHeightRatio: CGFloat = 0.35
static let fromOriginY: CGFloat = 3.0
}
10 changes: 6 additions & 4 deletions SpaceCapsule/SpaceCapsule/Resources/FrameResource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ enum FrameResource {
static let fontSize120: CGFloat = 24.0
static let fontSize140: CGFloat = 28.0

static let capsuleThumbnailWidth: CGFloat = 267.0
static let capsuleThumbnailHeight: CGFloat = 440.0
static let capsuleThumbnailWidth: CGFloat = 260.0
static let capsuleThumbnailHeight: CGFloat = 400.0
static let capsuleThumbnailCornerRadius: CGFloat = 120.0
static let capsuleThumbnailWidthRatio: CGFloat = 2.0 / 3.0
static let capsuleThumbnailHWRatio: CGFloat = 210.0 / 135.0

static let shadowOffset: CGSize = .init(width: 4, height: 4)
static let shadowRadius: CGFloat = 4
Expand Down Expand Up @@ -91,10 +93,10 @@ enum FrameResource {

static let profileImageWidth: CGFloat = 100.0
static let profileButtonHeight: CGFloat = 40.0

static let emptyCapsuleWidth: CGFloat = 135.0 * 1.5
static let emptyCapsuleHeight: CGFloat = 210.0 * 1.5

static let detailSettingButtonHeight: CGFloat = 60.0
static let detailSettingButtonPadding: CGFloat = 10.0
static let detailMainStackViewHPadding: CGFloat = 30.0
Expand Down
21 changes: 12 additions & 9 deletions SpaceCapsule/SpaceCapsule/Scene/TabBar/CapsuleAccess/CapsuleOpen/CapsuleOpenView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import SnapKit
import UIKit

final class CapsuleOpenView: UIView, BaseView, UnOpenable {
lazy var thumbnailImageView = ThemeThumbnailImageView(frame: .zero, width: FrameResource.capsuleThumbnailWidth)
var thumbnailImageView = ThemeThumbnailImageView(frame: .zero, width: UIScreen.main.bounds.width * FrameResource.capsuleThumbnailWidthRatio)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이러면 무조건 기기 화면크기 인가요?


lazy var descriptionLabel = {
var descriptionLabel = {
let label = ThemeLabel(text: nil, size: FrameResource.fontSize140, color: .themeGray300)
label.numberOfLines = 3
label.textAlignment = .center
Expand All @@ -21,14 +21,14 @@ final class CapsuleOpenView: UIView, BaseView, UnOpenable {

let blurEffectView = CapsuleBlurEffectView()

lazy var lockImageView = {
var lockImageView = {
let lockImageView = UIImageView()
lockImageView.image = .lock
lockImageView.tintColor = .themeGray200
return lockImageView
}()

lazy var dateLabel = {
var dateLabel = {
let dateLabel = ThemeLabel(text: nil, size: FrameResource.fontSize80, color: .themeGray200)
dateLabel.textAlignment = .center
return dateLabel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

불필요한 lazy 키워드 제거한거 좋네요

이왕 하시는 김에 불필요한 var 은 let 으로, 또 다른 객체에서 참조되지 않을 Label 들 같은 프로퍼티들은 private 으로 선언하면 더 좋을 것 같다는 의견입니당 ㅋㅅㅋ

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UnOpenabel 프로토콜의 속성들이라서 var를 사용했습니다.

Expand All @@ -49,7 +49,7 @@ final class CapsuleOpenView: UIView, BaseView, UnOpenable {

override init(frame: CGRect) {
super.init(frame: frame)

configure()
addSubViews()
makeConstraints()
Expand Down Expand Up @@ -84,6 +84,7 @@ final class CapsuleOpenView: UIView, BaseView, UnOpenable {
dateLabel.text = capsuleCellItem.closedDate.dateTimeString
if !capsuleCellItem.isOpenable() {
openButton.backgroundColor = .themeGray200
openButton.isEnabled = false
applyUnOpenableEffect()
}
}
Expand All @@ -98,19 +99,21 @@ final class CapsuleOpenView: UIView, BaseView, UnOpenable {
thumbnailImageView.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.centerY.equalToSuperview().multipliedBy(AnimationResource.fromOriginY)
$0.width.equalTo(FrameResource.capsuleThumbnailWidth)
$0.height.equalTo(FrameResource.capsuleThumbnailHeight)
$0.width.equalTo(UIScreen.main.bounds.width * FrameResource.capsuleThumbnailWidthRatio)
$0.height.equalTo(UIScreen.main.bounds.width * FrameResource.capsuleThumbnailWidthRatio * FrameResource.capsuleThumbnailHWRatio)
}

descriptionLabel.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.top.equalTo(self.snp.centerY).multipliedBy(0.8).offset(FrameResource.openCapsuleVerticalPadding + FrameResource.capsuleThumbnailHeight / 2)
$0.top.equalTo(self.snp.centerY).multipliedBy(0.7)
.offset(FrameResource.capsuleThumbnailHeight / 2 + AnimationResource.capsuleMoveHeight)
$0.bottom.equalTo(openButton.snp.top).offset(-FrameResource.spacing200).priority(999)
Comment on lines -107 to +110
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

고생하셨네요 ㅎㅎ

}

openButton.snp.makeConstraints {
$0.leading.equalToSuperview().offset(FrameResource.horizontalPadding)
$0.trailing.equalToSuperview().offset(-FrameResource.horizontalPadding)
$0.bottom.equalTo(safeAreaLayoutGuide.snp.bottom)
$0.bottom.equalTo(safeAreaLayoutGuide.snp.bottom).offset(-FrameResource.spacing200)
$0.height.equalTo(FrameResource.buttonHeight)
}
}
Expand Down
13 changes: 1 addition & 12 deletions ...psule/SpaceCapsule/Scene/TabBar/CapsuleAccess/CapsuleOpen/CapsuleOpenViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final class CapsuleOpenViewController: UIViewController, BaseViewController {
}
bind()
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
viewModel?.input.viewWillAppear.onNext(())
Expand All @@ -47,24 +47,13 @@ final class CapsuleOpenViewController: UIViewController, BaseViewController {
.disposed(by: disposeBag)
}

private func showAlert() {
let alertController = UIAlertController(title: "캡슐 알림", message: "열 수 없는 캡슐입니다", preferredStyle: .alert)
let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
let acceptAction = UIAlertAction(title: "OK", style: .default, handler: nil)
alertController.addAction(cancelAction)
alertController.addAction(acceptAction)
present(alertController, animated: true, completion: nil)
}

func handleOpenButtonTap() {
guard let capsuleCellItem = viewModel?.capsuleCellItem else {
return
}
if capsuleCellItem.isOpenable() {
capsuleOpenView.shakeAnimate()
viewModel?.input.tapOpen.onNext(())
} else {
showAlert()
}
}
}
102 changes: 38 additions & 64 deletions SpaceCapsule/SpaceCapsule/Scene/TabBar/CapsuleAdd/CapsuleClose/CapsuleCloseView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,32 @@ import AVFoundation
import SnapKit
import UIKit

final class CapsuleCloseView: UIView, BaseView {
final class CapsuleCloseView: UIView, BaseView, UnOpenable {
struct Item {
let closedDateString: String
let memoryDateString: String
let simpleAddress: String
let thumbnailImageURL: String
}

private let thumbnailImageView = {
let imageView = UIImageView()
imageView.layer.cornerRadius = FrameResource.capsuleThumbnailWidth / 2
imageView.clipsToBounds = true
imageView.contentMode = .scaleAspectFill
return imageView
}()

private let thumbnailImageContainerView = {
let view = UIView()
view.layer.shadowOffset = FrameResource.shadowOffset
view.layer.shadowRadius = FrameResource.shadowRadius
view.layer.shadowOpacity = FrameResource.shadowOpacity
view.layer.cornerRadius = FrameResource.capsuleThumbnailWidth / 2
return view
}()
var thumbnailImageView = ThemeThumbnailImageView(frame: .zero, width: UIScreen.main.bounds.width * FrameResource.capsuleThumbnailWidthRatio)

private let blurEffectView = CapsuleBlurEffectView()
let blurEffectView = CapsuleBlurEffectView()

private let closedImageView: UIImageView = {
let imageView = UIImageView()
imageView.image = .lock
imageView.tintColor = .themeGray200

return imageView
var lockImageView = {
let lockImageView = UIImageView()
lockImageView.image = .lock
lockImageView.tintColor = .themeGray200
return lockImageView
}()

private let closedDateLabel = ThemeLabel(size: FrameResource.fontSize90, color: .themeGray200)
var dateLabel = {
let dateLabel = ThemeLabel(text: nil, size: FrameResource.fontSize80, color: .themeGray200)
dateLabel.textAlignment = .center
return dateLabel
}()

private let descriptionLabel = {
var descriptionLabel = {
let label = ThemeLabel(size: FrameResource.fontSize140, color: .themeGray300)
label.numberOfLines = 3
label.textAlignment = .center
Expand All @@ -60,7 +48,6 @@ final class CapsuleCloseView: UIView, BaseView {
button.setTitleColor(.white, for: .normal)
button.backgroundColor = .themeColor200
button.layer.cornerRadius = FrameResource.commonCornerRadius

return button
}()

Expand All @@ -85,7 +72,7 @@ final class CapsuleCloseView: UIView, BaseView {
}

func configure(item: Item) {
closedDateLabel.text = "밀봉시간: \(item.closedDateString)"
dateLabel.text = "밀봉시간: \(item.closedDateString)"

descriptionLabel.text = """
\(item.memoryDateString)
Expand All @@ -99,64 +86,51 @@ final class CapsuleCloseView: UIView, BaseView {
color: .themeGray400
)

thumbnailImageView.kr.setImage(with: item.thumbnailImageURL, placeholder: .empty, scale: FrameResource.closedImageScale)
thumbnailImageView.imageView.kr.setImage(with: item.thumbnailImageURL, placeholder: .empty, scale: FrameResource.closedImageScale)

applyUnOpenableEffect()
}

func addSubViews() {
[blurEffectView, closedImageView, closedDateLabel].forEach {
thumbnailImageView.addSubview($0)
}

[thumbnailImageContainerView, descriptionLabel, closeButton].forEach {
[thumbnailImageView, descriptionLabel, closeButton].forEach {
addSubview($0)
}

thumbnailImageContainerView.addSubview(thumbnailImageView)
}

func makeConstraints() {
blurEffectView.snp.makeConstraints {
$0.center.equalToSuperview()
$0.width.height.equalToSuperview()
}

closedImageView.snp.makeConstraints {
$0.center.equalToSuperview()
$0.width.height.equalTo(FrameResource.closedIconSize)
}

closedDateLabel.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.top.equalTo(closedImageView.snp.bottom).offset(FrameResource.closedDateOffset)
}

thumbnailImageContainerView.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.centerY.equalToSuperview().multipliedBy(0.8)
$0.width.equalTo(FrameResource.capsuleThumbnailWidth)
$0.height.equalTo(FrameResource.capsuleThumbnailHeight)
}

thumbnailImageView.snp.makeConstraints {
$0.edges.equalToSuperview()
$0.centerX.equalToSuperview()
$0.centerY.equalToSuperview().multipliedBy(AnimationResource.fromOriginY)
$0.width.equalTo(UIScreen.main.bounds.width * FrameResource.capsuleThumbnailWidthRatio)
$0.height.equalTo(UIScreen.main.bounds.width * FrameResource.capsuleThumbnailWidthRatio * FrameResource.capsuleThumbnailHWRatio)
}

descriptionLabel.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.bottom.equalTo(closeButton.snp.top).offset(-FrameResource.buttonHeight)
$0.top.equalTo(self.snp.centerY).multipliedBy(0.7)
.offset(FrameResource.capsuleThumbnailHeight / 2 + AnimationResource.capsuleMoveHeight)
$0.bottom.equalTo(closeButton.snp.top).offset(-FrameResource.spacing200).priority(999)
}

closeButton.snp.makeConstraints {
$0.leading.equalToSuperview().offset(FrameResource.horizontalPadding)
$0.trailing.equalToSuperview().offset(-FrameResource.horizontalPadding)
$0.bottom.equalToSuperview().offset(-FrameResource.buttonHeight)
$0.bottom.equalTo(safeAreaLayoutGuide.snp.bottom).offset(-FrameResource.spacing200)
$0.height.equalTo(FrameResource.buttonHeight)
}
}

func animate() {
UIView.animate(withDuration: 1, delay: 0, options: [.repeat, .autoreverse]) {
self.thumbnailImageContainerView.transform = .init(translationX: 0, y: FrameResource.floatingOffsetY)
}
UIView.animate(withDuration: AnimationResource.capsuleMoveDuration, animations: {
self.layoutIfNeeded()
self.thumbnailImageView.center.y = (self.frame.height * AnimationResource.destinationHeightRatio)
}, completion: { _ in
UIView.animate(withDuration: AnimationResource.capsuleMoveDuration,
delay: 0,
options: [.repeat, .autoreverse]
) {
self.thumbnailImageView.transform = .init(translationX: 0, y: AnimationResource.capsuleMoveHeight)
}
})
}
}