Skip to content
Merged
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
8 changes: 4 additions & 4 deletions ByeBoo-iOS/ByeBoo-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
CODE_SIGN_ENTITLEMENTS = "ByeBoo-iOS/ByeBoo-Dev.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 9;
CURRENT_PROJECT_VERSION = 10;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Z6682N5G5D;
Expand Down Expand Up @@ -351,7 +351,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 9;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Z6682N5G5D;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -512,7 +512,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 9;
CURRENT_PROJECT_VERSION = 10;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
MACOSX_DEPLOYMENT_TARGET = 15.2;
Expand All @@ -534,7 +534,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 9;
CURRENT_PROJECT_VERSION = 10;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
MACOSX_DEPLOYMENT_TARGET = 15.2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,19 @@ extension NewJourneySelectViewController {
@objc
private func journeyDidTap(_ tapRecognizer: UITapGestureRecognizer) {
guard let journeyView = tapRecognizer.view as? OneLineTextBoxView else { return }
ByeBooLogger.debug(journeyView.title)
let journeyTitle = journeyView.title
.replacingOccurrences(of: "์—ฌ์ •", with: "")
.trimmingCharacters(in: .whitespaces)
let journeyType = JourneyType.titleToEnum(journeyTitle) ?? .recording

ByeBooLogger.debug(journeyType.title)

let viewController = ViewControllerFactory.shared.makeQuestStartViewController()
viewController.configure(journeyTitle: journeyView.title)
viewController.configure(journeyTitle: journeyType.title)
viewController.modalPresentationStyle = .fullScreen
viewController.delegate = self
self.present(viewController, animated: false)

let journeyType = JourneyType.titleToEnum(journeyView.title) ?? .recording
let property = QuestEvents.NewJourneyProperty(newJourneyType: journeyType.mixpanelKey)
Mixpanel.mainInstance().track(
event: QuestEvents.Name.journeyNewClick,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ enum QuestTabItem: TabItem {
var image: UIImage {
switch self {
case .myJourney:
return .myJourney
return .myOn
case .commonJourney:
return .commonJourney
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import SnapKit
final class CommonQuestAnswerCell: UITableViewCell {

private var answerID: Int?
private var containerBottomConstraint: Constraint?

private let containerView = UIView()
private let userIconView = UIImageView()
Expand Down Expand Up @@ -73,7 +72,7 @@ final class CommonQuestAnswerCell: UITableViewCell {
containerView.snp.makeConstraints {
$0.top.equalToSuperview().inset(24.adjustedH)
$0.horizontalEdges.equalToSuperview().inset(24.adjustedW)
containerBottomConstraint = $0.bottom.equalToSuperview().constraint
$0.bottom.equalToSuperview()
}
userIconView.snp.makeConstraints {
$0.top.equalToSuperview().inset(16.adjustedH)
Expand Down Expand Up @@ -103,20 +102,15 @@ extension CommonQuestAnswerCell {
func bind(
profileIcon: UIImage?,
answer: CommonQuestAnswerEntity,
writtenAt: String,
isLast: Bool
writtenAt: String
) {
if let profileIcon {
userIconView.image = profileIcon
}
userNicknameLabel.text = answer.writer
answerContentLabel.text = answer.content
writtenDateLabel.text = writtenAt

answerID = answer.answerID

let inset = isLast ? 24.adjustedH : 0
containerBottomConstraint?.update(inset: inset)
}

func getAnswewrID() -> Int? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ final class CommonQuestView: BaseView {
height: 152.adjustedH
)
$0.tableHeaderView = headerView
$0.contentInset = UIEdgeInsets(
top: 0,
left: 0,
bottom: 24,
right: 0
)
$0.sectionHeaderTopPadding = 0
$0.separatorStyle = .none
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ final class DateNavigator: UITableViewHeaderFooterView {
self.minDate = DateComponents(
calendar: calendar,
year: 2026,
month: 3,
day: 6
month: 4,
day: 1
).date ?? .now

super.init(reuseIdentifier: reuseIdentifier)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,15 @@ final class ArchiveQuestViewController: BaseViewController {

guard let entryViewController else { return }
switch entryViewController {
case .writeQuest, .questMain:
case .writeQuest:
ByeBooNavigationBar.makeNavigationBar(
navigationItem: self.navigationItem,
navigationController: self.navigationController,
type: .close(header: .clear),
action: #selector(close),
secondAction: #selector(editButtonDidTap)
)
case .questMain:
ByeBooNavigationBar.makeNavigationBar(
navigationItem: self.navigationItem,
navigationController: self.navigationController,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,15 +260,13 @@ 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,
isLast: isLast
writtenAt: writtenAt
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ extension WriteActiveTypeQuestViewController: ToastPresentable, ToastErrorHandle
guard let self else { return }
switch result {
case true:
self.navigationItem.rightBarButtonItem?.isEnabled = true
self.navigationItem.rightBarButtonItems?[1].isEnabled = true
case false:
self.navigationItem.rightBarButtonItem?.isEnabled = false
self.navigationItem.rightBarButtonItems?[1].isEnabled = false
}
}
.store(in: &cancellables)
Expand Down Expand Up @@ -309,7 +309,7 @@ extension WriteActiveTypeQuestViewController: EditQuestProtocol {
rootView.updateImageCountLabel(count: 1)
rootView.imageContainer.changeIconHidden()
rootView.textCountLabel.text = "\(answerText.count)/\(rootView.limitCount)"
self.navigationItem.rightBarButtonItem?.isEnabled = false
self.navigationItem.rightBarButtonItems?[1].isEnabled = false

if questAnswer.isEmpty {
rootView.questTextField.textView.text = "๊ผญ ์ ์ง€ ์•Š์•„๋„ ๊ดœ์ฐฎ์ง€๋งŒ, ๊ธ€๋กœ ์ •๋ฆฌํ•ด ๋ณด๋ฉด ์Šค์Šค๋กœ์—๊ฒŒ ํ•œ ๊ฑธ์Œ ๋” ๊ฐ€๊นŒ์›Œ์งˆ ์ˆ˜ ์žˆ์–ด์š”."
Expand All @@ -325,9 +325,9 @@ extension WriteActiveTypeQuestViewController: EditQuestProtocol {
extension WriteActiveTypeQuestViewController: QuestCompleteProtocol {
func changeCount(count: Int) {
if count == 1 {
self.navigationItem.rightBarButtonItem?.isEnabled = true
self.navigationItem.rightBarButtonItems?[1].isEnabled = true
} else {
self.navigationItem.rightBarButtonItem?.isEnabled = false
self.navigationItem.rightBarButtonItems?[1].isEnabled = false
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class WriteQuestBaseViewController<RootView: BaseView & WriteQuestBaseProtocol>:
secondAction: #selector(confirmButtonDidTap)
)

self.navigationItem.rightBarButtonItem?.isEnabled = false
self.navigationItem.rightBarButtonItems?[1].isEnabled = false
}

override func viewWillDisappear(_ animated: Bool) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ extension WriteQuestionTypeQuestViewController: ToastPresentable, ToastErrorHand
guard let self else { return }
switch result {
case true:
self.navigationItem.rightBarButtonItem?.isEnabled = true
self.navigationItem.rightBarButtonItems?[1].isEnabled = true
case false:
self.navigationItem.rightBarButtonItem?.isEnabled = false
self.navigationItem.rightBarButtonItems?[1].isEnabled = false
}
}
.store(in: &cancellables)
Expand Down Expand Up @@ -387,7 +387,7 @@ extension WriteQuestionTypeQuestViewController: EditQuestProtocol {

setQuestTextField(answer: questAnswer)
rootView.textCountLabel.text = "\(answerText.count)/\(rootView.limitCount)"
self.navigationItem.rightBarButtonItem?.isEnabled = false
self.navigationItem.rightBarButtonItems?[1].isEnabled = false
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,4 @@ extension CommonQuestViewModel {
return DateFormatter.toDisplayDateString(from: writtenAt)
}
}

func isLast(at index: Int) -> Bool {
answersCount == answers.count && index == answers.count - 1
}
}

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"images" : [
{
"filename" : "share_selected.svg",
"filename" : "my_on.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading