Merge pull request #412 from 36-APPJAM-HEARTZ/refactor/#407-planQASeungjun

dev-domo · web-flow · commit 7dad38f3ec75 · 2026-03-16T21:05:27.000+09:00
Refactor/#407 3차 스프린트 1차 기획 QA 사항 반영 (승준)
diff --git a/ByeBoo-iOS/ByeBoo-iOS.xcodeproj/project.pbxproj b/ByeBoo-iOS/ByeBoo-iOS.xcodeproj/project.pbxproj
@@ -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;
@@ -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;
@@ -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;
@@ -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;
diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift
@@ -19,6 +19,17 @@ extension JourneyType {
         }
     }
     
+    var tagTitle: String {
+        switch self {
+        case .recording:
+            "이별"
+        case .active:
+            "행동형"
+        case .reunion:
+            "재회"
+        }
+    }
+    
     var description: String {
         return "\(title) 여정"
     }
diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/View/JourneyListView.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/View/JourneyListView.swift
@@ -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
                 )
diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/ViewController/MyPageViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/ViewController/MyPageViewController.swift
@@ -38,6 +38,7 @@ final class MyPageViewController: BaseViewController {
         
         viewModel.action(.viewWillAppear)
         viewModel.action(.checkHasEnterMyPage)
+        checkNotificationAuthorizationOnEnter()
     }
     
     override func viewDidLoad() {
@@ -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 }
@@ -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
                 }
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
@@ -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
diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/View/CommonQuest/DateNavigator.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/View/CommonQuest/DateNavigator.swift
@@ -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()
@@ -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
+        
         super.init(reuseIdentifier: reuseIdentifier)
         
         setStyle()
@@ -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)
+    }
 }
diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/CommonQuestViewModel.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/CommonQuestViewModel.swift
@@ -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"
diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/previous_off.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/previous_off.imageset/Contents.json
@@ -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
+  }
+}
diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/previous_off.imageset/previous_off.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/IconSystem/previous_off.imageset/previous_off.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="32" height="32" rx="16" fill="white" fill-opacity="0.05"/>
+<path d="M19.2929 7.29289C19.6834 6.90237 20.3164 6.90237 20.707 7.29289C21.0975 7.68342 21.0975 8.31643 20.707 8.70696L13.414 15.9999L20.707 23.2929L20.7753 23.3691C21.0957 23.7618 21.0731 24.3408 20.707 24.707C20.3408 25.0731 19.7618 25.0957 19.3691 24.7753L19.2929 24.707L11.2929 16.707C10.9024 16.3164 10.9024 15.6834 11.2929 15.2929L19.2929 7.29289Z" fill="#6E6E6E"/>
+</svg>
diff --git a/ByeBoo-iOS/fastlane/README.md b/ByeBoo-iOS/fastlane/README.md
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,17 @@ extension JourneyType {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ var tagTitle: String {`
	`23`	`+ switch self {`
	`24`	`+ case .recording:`
	`25`	`+ "이별"`
	`26`	`+ case .active:`
	`27`	`+ "행동형"`
	`28`	`+ case .reunion:`
	`29`	`+ "재회"`
	`30`	`+ }`
	`31`	`+ }`
	`32`	`+`
`22`	`33`	`var description: String {`
`23`	`34`	`return "\(title) 여정"`
`24`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ extension JourneyListView {`
`165`	`165`	`journeyList.forEach { journey in`
`166`	`166`	`let journeyView = OneLineTextBoxView(`
`167`	`167`	`title: journey.title + " 여정",`
`168`		`- tagTitle: journey.style?.title,`
	`168`	`+ tagTitle: journey.style?.tagTitle,`
`169`	`169`	`tagType: isFinished ? .word3Gray : .word3Purple,`
`170`	`170`	`isHighlighted: !isFinished`
`171`	`171`	`)`