Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ extension JourneyType {
var title: String {
switch self {
case .face:
"감정 직면"
"재회 준비"
case .process:
"감정 정리"
"이별 극복"
}
}

Expand All @@ -33,18 +33,18 @@ extension JourneyType {
var frontImage: UIImage {
switch self {
case .face:
.faceFrontCard
.reunionFront
case .process:
.processFrontCard
.overcomingFront
}
}

var backImage: UIImage {
switch self {
case .face:
.faceBackCard
.reunionBack
case .process:
.processBackCard
.overcomingBack
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ final class InformationBaseView: BaseView {

switch informationView {
case let view as InputNicknameView: updateNicknameViewNextButton(view: view)
case let view as SelectEmotionView: updateEmotionViewNextButton(view: view)
case let view as SelectQuestView: updateQuestViewNextButton(view: view)
default: break
}
Expand Down Expand Up @@ -109,17 +108,6 @@ extension InformationBaseView {
}
}

private func updateEmotionViewNextButton(view: SelectEmotionView) {
view.emotionCardsView.emotionCards.forEach {
$0.onSelected = {
self.nextButton.updateType(.enabled)
}
}

let hasSelected = view.emotionCardsView.emotionCards.contains { $0.isSelected }
updateButtonWhenBack(condition: hasSelected)
}

private func updateQuestViewNextButton(view: SelectQuestView) {
view.questCardsView.questCards.forEach {
$0.onSelected = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ import SnapKit
import Then

enum ProgressBarType: Int {
case first, second, third
case first, second
}

final class ProgressBarView: BaseView {

private let progressGroupView = UIView()

private let firstProgressView = UIProgressView()
private let secondProgressView = UIProgressView()
private let thirdProgressView = UIProgressView()
private let progressStackView = UIStackView()
private lazy var progressViews = [firstProgressView, secondProgressView, thirdProgressView]
private lazy var progressViews = [firstProgressView, secondProgressView]

init(type: ProgressBarType) {
super.init(frame: .zero)
Expand All @@ -39,16 +37,15 @@ final class ProgressBarView: BaseView {
}
progressStackView.do {
$0.axis = .horizontal
$0.spacing = 10
$0.spacing = 7
}
progressViews.forEach { setProgressView($0) }
}

override func setUI() {
progressStackView.addArrangedSubviews(
firstProgressView,
secondProgressView,
thirdProgressView
secondProgressView
)
progressGroupView.addSubview(progressStackView)
addSubview(progressGroupView)
Expand All @@ -60,20 +57,16 @@ final class ProgressBarView: BaseView {
}
progressStackView.snp.makeConstraints {
$0.center.equalToSuperview()
$0.width.equalTo(325.adjustedW)
$0.horizontalEdges.equalToSuperview().inset(24.adjustedW)
$0.top.equalToSuperview().inset(13.adjustedH)
$0.bottom.equalToSuperview().inset(13.adjustedH)
}
firstProgressView.snp.makeConstraints {
$0.width.equalTo(105.adjustedW)
$0.width.equalTo(160.adjustedW)
$0.height.equalTo(6.adjustedH)
}
secondProgressView.snp.makeConstraints {
$0.width.equalTo(105.adjustedW)
$0.height.equalTo(6.adjustedH)
}
thirdProgressView.snp.makeConstraints {
$0.width.equalTo(105.adjustedW)
$0.width.equalTo(160.adjustedW)
$0.height.equalTo(6.adjustedH)
}
}
Expand All @@ -83,16 +76,9 @@ final class ProgressBarView: BaseView {
case .first:
firstProgressView.progress = 1
secondProgressView.progress = 0
thirdProgressView.progress = 0
case .second:
firstProgressView.progress = 0
secondProgressView.progress = 1
thirdProgressView.progress = 0
case .third:
firstProgressView.progress = 0
secondProgressView.progress = 0
thirdProgressView.progress = 1

}
}

Expand Down

This file was deleted.

This file was deleted.

Loading
Loading