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 = 6;
CURRENT_PROJECT_VERSION = 7;
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 = 6;
CURRENT_PROJECT_VERSION = 7;
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 = 6;
CURRENT_PROJECT_VERSION = 7;
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 = 6;
CURRENT_PROJECT_VERSION = 7;
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 @@ -19,6 +19,17 @@ extension JourneyType {
}
}

var tagTitle: String {
switch self {
case .recording:
"이별"
case .active:
"행동형"
case .reunion:
"재회"
}
}

var description: String {
return "\(title) 여정"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ extension JourneyListView {
journeyList.forEach { journey in
let journeyView = OneLineTextBoxView(
title: journey.title + " 여정",
tagTitle: journey.style?.title,
tagTitle: journey.style?.tagTitle,
tagType: isFinished ? .word3Gray : .word3Purple,
isHighlighted: !isFinished
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ final class MyPageViewController: BaseViewController {

viewModel.action(.viewWillAppear)
viewModel.action(.checkHasEnterMyPage)
checkNotificationAuthorizationOnEnter()
}

override func viewDidLoad() {
Expand Down Expand Up @@ -212,6 +213,24 @@ extension MyPageViewController {

extension MyPageViewController {

private func checkNotificationAuthorizationOnEnter() {
UNUserNotificationCenter.current().getNotificationSettings { [weak self] settings in
guard let self else { return }

let isAuthorized: Bool
switch settings.authorizationStatus {
case .authorized, .provisional, .ephemeral:
isAuthorized = true
default:
isAuthorized = false
}

DispatchQueue.main.async {
self.rootView.featuresView.noticeView.noticeSwitch.setOn(isAuthorized, animated: false)
}
}
}

@objc
private func checkNoticeAuthorizationWhenBack() {
guard didOpenSetting else { return }
Expand Down Expand Up @@ -285,13 +304,8 @@ extension MyPageViewController {
switch settings.authorizationStatus {
case .authorized, .provisional, .ephemeral:
self.viewModel.action(.notificationSwitchDidTap)
case .denied:
self.presentMoveSettingAlert(
isOn: sender.isOn,
status: .denied
)
case .notDetermined:
break
case .denied, .notDetermined:
self.presentMoveSettingAlert(isOn: sender.isOn, status: .authorized)
@unknown default:
break
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ extension CommonQuestAnswerCell {
) {
if let profileIcon {
userIconView.image = profileIcon
} else {
userIconView.do {
$0.backgroundColor = .grayscale600
$0.layer.cornerRadius = 10
}
}
userNicknameLabel.text = answer.writer
answerContentLabel.text = answer.content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ protocol DateNavigatorDelegate: AnyObject {

final class DateNavigator: UITableViewHeaderFooterView {

weak var delegate: DateNavigatorDelegate?

private let calendar = Calendar.current
private let yesterday: Int = -1
private let tommorw: Int = 1
private let tommorow: Int = 1
private let dateFormatter: DateFormatter = {
let formatter = DateFormatter()
formatter.dateFormat = "M월 d일"
return formatter
}()
private let minDate: Date

weak var delegate: DateNavigatorDelegate?

private(set) var currentDate: Date = .now
private let navigatorStackView = UIStackView()
Expand All @@ -31,6 +32,13 @@ final class DateNavigator: UITableViewHeaderFooterView {
private(set) var nextButton = UIButton()

override init(reuseIdentifier: String?) {
self.minDate = DateComponents(
calendar: calendar,
year: 2026,
month: 3,
day: 6
).date ?? .now
Comment on lines +35 to +40
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

배포하게 되면 또 달라질 것 같긴한데 . . 다른 방법으로 MinDate를 설정하는 방법이 있을까요 ? 흠

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

서버에서 내려받기 ..... ?????? ... 흠 .. . .. .


super.init(reuseIdentifier: reuseIdentifier)

setStyle()
Expand Down Expand Up @@ -120,34 +128,49 @@ extension DateNavigator {

@objc
private func moveYesterday() {
currentDate = getDate(by: yesterday) ?? .now
dateLabel.text = dateFormatter.string(from: currentDate)
updateNextButton()
guard !isMinDate else { return }

// TO-DO : 실제 날짜 형식으로 수정
delegate?.dateDidChanged(to: currentDate)
moveDay(to: yesterday)
}

@objc
private func moveTomorrow() {
currentDate = getDate(by: tommorw) ?? .now
moveDay(to: tommorow)
}

private func moveDay(to day: Int) {
currentDate = getDate(by: day) ?? .now
dateLabel.text = dateFormatter.string(from: currentDate)
updateNextButton()

updateButtons()
delegate?.dateDidChanged(to: currentDate)
}

private func getDate(by value: Int) -> Date? {
calendar.date(byAdding: .day, value: value, to: currentDate)
}

private func updateButtons() {
updatePreviousButton()
updateNextButton()
}

private func updatePreviousButton() {
let previousImage: UIImage = isMinDate ? .previousOff : .previousOn
previousButton.setImage(previousImage, for: .normal)
nextButton.isEnabled = !isMinDate
}

private func updateNextButton() {
let image: UIImage = isToday ? .nextOff : .nextOn
nextButton.setImage(image, for: .normal)
let nextImage: UIImage = isToday ? .nextOff : .nextOn
nextButton.setImage(nextImage, for: .normal)
nextButton.isEnabled = !isToday
}

private var isToday: Bool {
calendar.isDateInToday(currentDate)
}

private var isMinDate: Bool {
calendar.isDate(currentDate, inSameDayAs: minDate)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ extension CommonQuestViewModel: ViewModelType {
extension CommonQuestViewModel {

private enum ProfileIcon: String, CaseIterable {
case sad = "SAD"
case sad = "SADNESS"
case selfUnderstanding = "SELF_UNDERSTANDING"
case soso = "SO_SO"
case relieved = "RELIEVED"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "previous_off.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ByeBoo-iOS/fastlane/README.md
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

wow 감사합니다

Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do

## iOS

### ios beta
### ios upload_testflight

```sh
[bundle exec] fastlane ios beta
[bundle exec] fastlane ios upload_testflight
```

Push a new beta build to TestFlight
Expand Down
Loading