Merge remote-tracking branch 'origin/develop' into release

* origin/develop:
  fix: SplashViewReactor 화면 전환 issue 수정 (#702)
  fix: MyUserDefaults memberId, userName Type Annotation String으로 수정 (#700)
  fix: 로그인 버튼 클릭시 touch event cancel 현상 수정해요 (#695)
  fix: QA issue를 수정합니다(#696)
  feat: AlertService 구현 (#692)
  refactor: Calendar 관련 뷰 컨트롤러, 리액터 등 부가 코드 리팩토링 (#682)

.github/workflows/swift.yml

@@ -62,7 +62,7 @@ jobs:
         run: tuist generate
 
       - name: fastlane upload_prd_testflight
-        if: ${{ github.base_ref == 'release' && github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') }}
         env:
           APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}

14th-team5-iOS/App/Project.swift

@@ -19,7 +19,7 @@ private let targets: [Target] = [
                 "CFBundleDisplayName": .string("Bibbi"),
                 "CFBundleVersion": .string("1"),
                 "CFBuildVersion": .string("0"),
-                "CFBundleShortVersionString": .string("1.2.3"),
+                "CFBundleShortVersionString": .string("1.2.4"),
                 "UILaunchStoryboardName": .string("LaunchScreen"),
                 "UISupportedInterfaceOrientations": .array([.string("UIInterfaceOrientationPortrait")]),
                 "UIUserInterfaceStyle": .string("Dark"),

14th-team5-iOS/App/Sources/Application/DIContainer/CalendarDIContainer.swift

@@ -37,14 +37,6 @@ final class CalendarDIContainer: BaseContainer {
         )
     }
 
-    // Deprecated
-    private func makeOldCalendarUseCase() -> CalendarUseCaseProtocol {
-        CalendarUseCase(
-            calendarRepository: makeCalendarRepository()
-        )
-    }
-
-
 
     // MARK: - Make Repository
 
@@ -71,13 +63,6 @@ final class CalendarDIContainer: BaseContainer {
         container.register(type: FetchMonthlyCalendarUseCaseProtocol.self) { _ in
             self.makeFetchMonthlyCalendarUseCase()
         }
-
-
-        // Deprecated
-        container.register(type: CalendarUseCaseProtocol.self) { _ in
-            self.makeOldCalendarUseCase()
-        }
-
     }
 
 

14th-team5-iOS/App/Sources/Application/Navigator/DailyCalendarNavigator.swift

@@ -11,6 +11,7 @@ import UIKit
 protocol DailyCalendarNavigatorProtocol: BaseNavigator {
     func toProfile(memberId: String)
     func toComment(postId: String)
+    func backToMonthly()
 }
 
 final class DailyCalendarNavigator: DailyCalendarNavigatorProtocol {
@@ -35,7 +36,12 @@ final class DailyCalendarNavigator: DailyCalendarNavigatorProtocol {
     func toComment(postId: String) {
         let vc = CommentViewControllerWrapper(postId: postId).viewController
         navigationController.presentPostCommentSheet(vc, from: .calendar)
-        // TODO: - present 메서드 수정하기
+    }
+
+    // MARK: - Back
+
+    func backToMonthly() {
+        navigationController.popViewController(animated: true)
     }
 
 }

14th-team5-iOS/App/Sources/Application/Navigator/Wrapper/Calendar/DailyCalendarViewControllerWrapper.swift

@@ -32,7 +32,7 @@ final class DailyCalendarViewControllerWrapper {
 
     func makeReactor() -> DailyCalendarViewReactor {
         DailyCalendarViewReactor(
-            date: date,
+            initialSelection: date,
             notificationDeepLink: link
         )
     }

14th-team5-iOS/App/Sources/Presentation/Calendar/Config/CalendarImageCell+Type.swift

@@ -0,0 +1,13 @@
+//
+//  CalendarType.swift
+//  App
+//
+//  Created by 김건우 on 10/16/24.
+//
+
+import Foundation
+
+public enum MomoriesCalendarType {
+    case daily
+    case month
+}

14th-team5-iOS/App/Sources/Presentation/Calendar/Reactive/DelegateProxy/Delegate/MemoriesCalendarPostHeaderDelegate.swift

@@ -0,0 +1,12 @@
+//
+//  File.swift
+//  App
+//
+//  Created by 김건우 on 10/18/24.
+//
+
+import UIKit
+
+@objc protocol MemoriesCalendarPostHeaderDelegate: AnyObject {
+    @objc optional func didTapProfileImageButton(_ button: UIButton, event: UIButton.Event)
+}

14th-team5-iOS/App/Sources/Presentation/Calendar/DelegateProxy/RxFSCalendarDelegateProxy.swift → 14th-team5-iOS/App/Sources/Presentation/Calendar/Reactive/DelegateProxy/RxFSCalendarDelegateProxy.swift

@@ -5,9 +5,9 @@
 //  Created by 김건우 on 12/9/23.
 //
 
+import Core
 import Foundation
 
-import Core
 import FSCalendar
 import RxSwift
 import RxCocoa
@@ -25,40 +25,27 @@ extension FSCalendar: HasDelegate {
 }
 
 extension Reactive where Base: FSCalendar {
+
     var delegate: DelegateProxy<FSCalendar, FSCalendarDelegate> {
         return RxFSCalendarDelegateProxy.proxy(for: self.base)
     }
 
+    /// 캘린더에서 셀을 선택하면 Date가 담긴 스트림이 흐릅니다.
     var didSelect: Observable<Date> {
         return delegate.methodInvoked(#selector(FSCalendarDelegate.calendar(_:didSelect:at:)))
-            .debug("calendar(_:didSelect:at:) 메서드 호출 성공")
             .map { $0[1] as! Date }
     }
 
+    /// 캘린더의 바운즈(bounds)가 변하면 CGRect이 담긴 스트림이 흐릅니다.
     var boundingRectWillChange: Observable<CGRect> {
         return delegate.methodInvoked(#selector(FSCalendarDelegate.calendar(_:boundingRectWillChange:animated:)))
-            .debug("calendar(_:boundingRectWillChange:animated:) 메서드 호출 성공")
             .map { $0[1] as! CGRect }
     }
 
+    /// 캘린더의 현재 보이는 페이지가 변하면 Date가 담긴 스트림이 흐릅니다.
     var calendarCurrentPageDidChange: Observable<Date> {
         return delegate.methodInvoked(#selector(FSCalendarDelegate.calendarCurrentPageDidChange(_:)))
-            .debug("calendarCurrentPageDidChange(_:) 메서드 호출 성공")
             .map { ($0[0] as! FSCalendar).currentPage }
     }
 
-    var fetchCalendarResponseDidChange: Observable<[String]> {
-        return delegate.methodInvoked(#selector(FSCalendarDelegate.calendarCurrentPageDidChange(_:)))
-            .debug("calendarCurrentPageDidChange(_:) 메서드 호출 성공")
-            .map {
-                let fsCalendar: FSCalendar = $0[0] as! FSCalendar
-                let currentPage: Date = fsCalendar.currentPage
-
-                let previousMonth: String = (currentPage - 1.month).toFormatString()
-                let currentMonth: String = currentPage.toFormatString()
-                let nextMonth: String = (currentPage + 1.month).toFormatString()
-
-                return [previousMonth, currentMonth, nextMonth]
-            }
-    }
 }

14th-team5-iOS/App/Sources/Presentation/Calendar/Reactive/DelegateProxy/RxMemoriesCalendarPostDelegateProxy.swift

@@ -0,0 +1,38 @@
+//
+//  RxMemoriesCalendarPostDelegate.swift
+//  App
+//
+//  Created by 김건우 on 10/18/24.
+//
+
+import Foundation
+
+import RxCocoa
+import RxSwift
+
+final class RxMemoriesCalendarPostDelegateProxy: DelegateProxy<MemoriesCalendarPostHeaderView, MemoriesCalendarPostHeaderDelegate>, DelegateProxyType, MemoriesCalendarPostHeaderDelegate {
+
+    public static func registerKnownImplementations() {
+        self.register { RxMemoriesCalendarPostDelegateProxy(parentObject: $0, delegateProxy: self) }
+    }
+
+}
+
+extension MemoriesCalendarPostHeaderView: HasDelegate {
+    public typealias Delegate = MemoriesCalendarPostHeaderDelegate
+}
+
+extension Reactive where Base: MemoriesCalendarPostHeaderView {
+
+    var delegate: DelegateProxy<MemoriesCalendarPostHeaderView, MemoriesCalendarPostHeaderDelegate> {
+        return RxMemoriesCalendarPostDelegateProxy.proxy(for: self.base)
+    }
+
+    /// 프로필 버튼을 클릭하면 빈 항목이 담긴 스트림이 흐릅니다.
+    var didTapProfileImageButton: ControlEvent<Void> {
+        let source = delegate.methodInvoked(#selector(MemoriesCalendarPostHeaderDelegate.didTapProfileImageButton(_:event:)))
+            .map { _ in () }
+        return ControlEvent(events: source)
+    }
+
+}