diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Common/Navigation/ByeBooNavigationBar.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Common/Navigation/ByeBooNavigationBar.swift index 15df3e19..6e049e58 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Common/Navigation/ByeBooNavigationBar.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Common/Navigation/ByeBooNavigationBar.swift @@ -152,14 +152,14 @@ struct ByeBooNavigationBar { target: topViewController, action: action ) - navigationItem.leftBarButtonItem = backButtonItem + navigationItem.leftBarButtonItems = [makeSpacer(), backButtonItem] let editButtonItem = makeBarButtonItem( image: .edit, target: topViewController, action: secondAction ) - navigationItem.rightBarButtonItem = editButtonItem + navigationItem.rightBarButtonItems = [makeSpacer(), editButtonItem] case .title(let string, _): navigationItem.title = string diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Loading/LoadingView.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Loading/LoadingView.swift index 2034c76e..25b8a34f 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Loading/LoadingView.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/View/Loading/LoadingView.swift @@ -76,7 +76,7 @@ final class LoadingView: BaseView { func updateNickname(_ newNickname: String) { self.nickname = newNickname - titleLabel.attributedText = "\(nickname)님에게 꼭 맞는\n이별 극복 여정을 찾는 중 ..." + titleLabel.attributedText = "\(nickname)님에게 꼭 맞는\n극복 여정을 찾는 중 ..." .makeTitle(rangedText: nickname, font: FontManager.body1Sb16.font) } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/View/CommonQuest/Cells/CommonQuestAnswerCell.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/View/CommonQuest/Cells/CommonQuestAnswerCell.swift index 37db9228..cddca866 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/View/CommonQuest/Cells/CommonQuestAnswerCell.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/View/CommonQuest/Cells/CommonQuestAnswerCell.swift @@ -7,9 +7,12 @@ import UIKit +import SnapKit + final class CommonQuestAnswerCell: UITableViewCell { private var answerID: Int? + private var containerBottomConstraint: Constraint? private let containerView = UIView() private let userIconView = UIImageView() @@ -70,7 +73,7 @@ final class CommonQuestAnswerCell: UITableViewCell { containerView.snp.makeConstraints { $0.top.equalToSuperview().inset(24.adjustedH) $0.horizontalEdges.equalToSuperview().inset(24.adjustedW) - $0.bottom.equalToSuperview() + containerBottomConstraint = $0.bottom.equalToSuperview().constraint } userIconView.snp.makeConstraints { $0.top.equalToSuperview().inset(16.adjustedH) @@ -100,7 +103,8 @@ extension CommonQuestAnswerCell { func bind( profileIcon: UIImage?, answer: CommonQuestAnswerEntity, - writtenAt: String + writtenAt: String, + isLast: Bool ) { if let profileIcon { userIconView.image = profileIcon @@ -110,6 +114,9 @@ extension CommonQuestAnswerCell { writtenDateLabel.text = writtenAt answerID = answer.answerID + + let inset = isLast ? 24.adjustedH : 0 + containerBottomConstraint?.update(inset: inset) } func getAnswewrID() -> Int? { diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift index eb47f5f4..c3a3beb2 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift @@ -254,13 +254,15 @@ extension CommonQuestViewController: UITableViewDataSource { let answer = viewModel.getAnswer(at: indexPath.row - 1) let profileIcon = viewModel.getProfileIcon(at: indexPath.row - 1) let writtenAt = viewModel.getWrittenAt(at: indexPath.row - 1) + let isLast = viewModel.isLast(at: indexPath.row - 1) if let answer, let writtenAt { cell.bind( profileIcon: profileIcon, answer: answer, - writtenAt: writtenAt + writtenAt: writtenAt, + isLast: isLast ) } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/CommonQuestViewModel.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/CommonQuestViewModel.swift index 06b6f30f..e2246e74 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/CommonQuestViewModel.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/CommonQuestViewModel.swift @@ -176,4 +176,8 @@ extension CommonQuestViewModel { return DateFormatter.toDisplayDateString(from: writtenAt) } } + + func isLast(at index: Int) -> Bool { + answersCount == answers.count && index == answers.count - 1 + } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-off.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-off.imageset/Contents.json new file mode 100644 index 00000000..ca326962 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-off.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mu-off.png", + "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/IconSystem/my-off.imageset/mu-off.png b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-off.imageset/mu-off.png new file mode 100644 index 00000000..dd9ba27b Binary files /dev/null and b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-off.imageset/mu-off.png differ diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-on.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-on.imageset/Contents.json new file mode 100644 index 00000000..5e56c454 --- /dev/null +++ b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-on.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "my-on.png", + "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/IconSystem/my-on.imageset/my-on.png b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-on.imageset/my-on.png new file mode 100644 index 00000000..3ea2700d Binary files /dev/null and b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my-on.imageset/my-on.png differ diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_off.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_off.imageset/Contents.json deleted file mode 100644 index 1888971f..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_off.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "my_off.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_off.imageset/my_off.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_off.imageset/my_off.svg deleted file mode 100644 index 7fae7ed4..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_off.imageset/my_off.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_on.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_on.imageset/Contents.json deleted file mode 100644 index 2c7a6b05..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_on.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "my_on.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_on.imageset/my_on.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_on.imageset/my_on.svg deleted file mode 100644 index 995f746c..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/my_on.imageset/my_on.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - -