diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift index e6767387..a6ada169 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift @@ -11,9 +11,9 @@ extension JourneyType { var title: String { switch self { case .face: - "감정 직면" + "재회 준비" case .process: - "감정 정리" + "이별 극복" } } @@ -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 } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/InformationBaseView.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/InformationBaseView.swift index 4a8a2d15..4e2f1d2d 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/InformationBaseView.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/InformationBaseView.swift @@ -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 } @@ -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 = { diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/ProgressBarView.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/ProgressBarView.swift index a55710a5..487c56d2 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/ProgressBarView.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/Common/ProgressBarView.swift @@ -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) @@ -39,7 +37,7 @@ final class ProgressBarView: BaseView { } progressStackView.do { $0.axis = .horizontal - $0.spacing = 10 + $0.spacing = 7 } progressViews.forEach { setProgressView($0) } } @@ -47,8 +45,7 @@ final class ProgressBarView: BaseView { override func setUI() { progressStackView.addArrangedSubviews( firstProgressView, - secondProgressView, - thirdProgressView + secondProgressView ) progressGroupView.addSubview(progressStackView) addSubview(progressGroupView) @@ -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) } } @@ -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 - } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Feeling/EmotionCardView.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Feeling/EmotionCardView.swift deleted file mode 100644 index 92e3f4b3..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Feeling/EmotionCardView.swift +++ /dev/null @@ -1,98 +0,0 @@ -// -// FeelingCardView.swift -// Tving -// -// Created by APPLE on 7/6/25. -// - -import UIKit - -import SnapKit -import Then - -final class EmotionCardView: BaseView { - - var isSelected: Bool = false { - didSet { updateCard() } - } - - var onSelected: (() -> Void)? - - init(state: String, image: UIImage) { - self.stateLabel.text = state - self.cardImageView.image = image - super.init(frame: .zero) - } - - required init?(coder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - private let backgroundView = UIView() - private let cardImageView = UIImageView() - private let stateLabel = UILabel() - - override func setStyle() { - backgroundView.do { - $0.backgroundColor = .white5 - $0.layer.cornerRadius = 12 - setBlurEffect(alpha: 0.5) - } - - cardImageView.do { - $0.contentMode = .scaleAspectFit - $0.backgroundColor = .clear - } - - stateLabel.applyByeBooFont ( - style: .body6R14, - color: .grayscale300, - textAlignment: .center - ) - - setBlurEffect() - } - - override func setUI() { - backgroundView.addSubviews(cardImageView, stateLabel) - addSubview(backgroundView) - } - - override func setLayout() { - backgroundView.snp.makeConstraints { - $0.width.equalTo(101.adjustedW) - $0.height.equalTo(152.adjustedH) - } - cardImageView.snp.makeConstraints { - $0.top.equalTo(backgroundView.snp.top).offset(15.adjustedH) - $0.centerX.equalToSuperview() - $0.width.equalTo(73.adjustedW) - $0.height.equalTo(100.adjustedH) - } - stateLabel.snp.makeConstraints { - $0.top.equalTo(cardImageView.snp.bottom).offset(4.adjustedH) - $0.centerX.equalToSuperview() - $0.width.equalTo(80.adjustedW) - $0.height.equalTo(18.adjustedH) - } - } - - private func updateCard() { - onSelected?() - - if isSelected { - stateLabel.textColor = .primary200 - backgroundView.do { - $0.backgroundColor = .primary30020 - $0.layer.borderWidth = 2 - $0.layer.borderColor = UIColor.primary300.cgColor - } - } else { - stateLabel.textColor = .grayscale300 - backgroundView.do { - $0.backgroundColor = .white5 - $0.layer.borderWidth = 0 - } - } - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Feeling/EmotionCardsView.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Feeling/EmotionCardsView.swift deleted file mode 100644 index 68909e85..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Feeling/EmotionCardsView.swift +++ /dev/null @@ -1,80 +0,0 @@ -// -// FeelingCardsView.swift -// Tving -// -// Created by APPLE on 7/6/25. -// - -import UIKit - -import SnapKit -import Then - -final class EmotionCardsView: BaseView { - - private(set) var emotionCards = [ - EmotionCardView(state: "너무 힘들어요", image: .sad), - EmotionCardView(state: "극복 중이에요", image: .soso), - EmotionCardView(state: "꽤 극복했어요", image: .good) - ] - - private let emotionStackView = UIStackView() - - var onEmotionSelected: ((Int) -> Void)? - - override init(frame: CGRect) { - super.init(frame: frame) - setAction() - } - - required init?(coder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - override func setStyle() { - emotionStackView.do { - $0.axis = .horizontal - $0.spacing = 11 - $0.distribution = .equalSpacing - } - } - - override func setUI() { - emotionCards.forEach { emotionStackView.addArrangedSubview($0) } - addSubview(emotionStackView) - } - - override func setLayout() { - emotionStackView.snp.makeConstraints { - $0.center.equalToSuperview() - $0.width.equalTo(325.adjustedW) - $0.height.equalTo(152.adjustedH) - } - - emotionCards.forEach { card in - card.snp.makeConstraints { - $0.width.equalTo(101.adjustedW) - $0.height.equalTo(152.adjustedH) - } - } - } - - private func setAction() { - emotionCards.forEach { - let tap = UITapGestureRecognizer(target: self, action: #selector(cardDidTap(_:))) - $0.addGestureRecognizer(tap) - $0.isUserInteractionEnabled = true - } - } - - @objc - private func cardDidTap(_ sender: UITapGestureRecognizer) { - guard let tappedCard = sender.view as? EmotionCardView else { return } - - for index in 0.. + + + + + + + + diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Bori/reunion.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Bori/reunion.imageset/Contents.json new file mode 100644 index 00000000..380f957d --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Bori/reunion.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "reunion.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Bori/reunion.imageset/reunion.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Bori/reunion.imageset/reunion.svg new file mode 100644 index 00000000..81eb9ef4 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Bori/reunion.imageset/reunion.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_back.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_back.imageset/Contents.json new file mode 100644 index 00000000..c77d4513 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_back.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "overcoming_back.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_back.imageset/overcoming_back.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_back.imageset/overcoming_back.svg new file mode 100644 index 00000000..9c9cf97b --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_back.imageset/overcoming_back.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_front.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_front.imageset/Contents.json new file mode 100644 index 00000000..3b8a4feb --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_front.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "overcoming_front.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_front.imageset/overcoming_front.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_front.imageset/overcoming_front.svg new file mode 100644 index 00000000..6487c263 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/overcoming_front.imageset/overcoming_front.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_back.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_back.imageset/Contents.json new file mode 100644 index 00000000..32cc6309 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_back.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "reunion_back.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_back.imageset/reunion_back.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_back.imageset/reunion_back.svg new file mode 100644 index 00000000..009bc179 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_back.imageset/reunion_back.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_front.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_front.imageset/Contents.json new file mode 100644 index 00000000..f62255df --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_front.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "reunion_front.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_front.imageset/reunion_front.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_front.imageset/reunion_front.svg new file mode 100644 index 00000000..8b44c989 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/reunion_front.imageset/reunion_front.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/book.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/book.imageset/Contents.json deleted file mode 100644 index 2e0ddf40..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/book.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "book.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/book.imageset/book.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/book.imageset/book.svg deleted file mode 100644 index 3b73b042..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/book.imageset/book.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/shoe.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/shoe.imageset/Contents.json deleted file mode 100644 index 11009674..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/shoe.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "shoe.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/shoe.imageset/shoe.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/shoe.imageset/shoe.svg deleted file mode 100644 index b4d96188..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/shoe.imageset/shoe.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -