[Feat/NST-13] 그룹상세화면 구현

Noostak_iOS/Noostak_iOS/Domain/Entity/Schedule.swift

@@ -22,30 +22,40 @@ struct Schedule {
     ///약속 카테고리
     let category: ScheduleCategory
     ///약속 생성기간
-    let dates: [Date]
+    let selectionDates: [Date]
     ///약속생성 시작일
-    var startDate: Date? {
-        return dates.sorted().first
+    var selectionStartDate: Date? {
+        return selectionDates.sorted().first
     }
     ///약속생성 종료일
-    var endDate: Date? {
-        return dates.sorted().last
+    var selectionEndDate: Date? {
+        return selectionDates.sorted().last
     }
-    ///약속 시작시각
-    let startTime: Date
-    ///약속 종료시각
-    let endTime: Date
+    ///약속생성 시작시각
+    let selectionStartTime: Date
+    ///약속생성 종료시각
+    let selectionEndTime: Date
     ///소요시간
     var duration: Int?
 }
 
 struct ExtendedSchedule {
     ///스케쥴
     let schedule: Schedule
+    ///약속 날짜(1순위, 확정)
+    let date: String
+    ///약속 시작시각(1순위, 확정)
+    let startTime: String
+    ///약속 종료시각(1순위, 확정)
+    let endTime: String
     ///가능한 친구
     let availableMembers: [User]
     ///불가능한 친구
     let unavailableMembers: [User]
+    ///그룹 총인원
+    var groupMemberCount: Int
+    ///가능한 인원
+    var availableMemberCount: Int
 }
 
 extension ScheduleCategory {

Noostak_iOS/Noostak_iOS/Global/Extension/UIFont+.swift

@@ -46,6 +46,7 @@ extension UIFont {
         case h1_sb
         case h2_b
         case h3_sb
+        case h3_22_SB
         case h4_b
         case h4_sb
         case h5_b
@@ -63,14 +64,15 @@ extension UIFont {
         case c2_sb
         case c3_r
         case c4_r
-
+        
         var font: UIFont {
             switch self {
-            case .h1_b: return UIFont.pretendard(.bold, size: 56)
-            case .h1_sb: return UIFont.pretendard(.semibold, size: 56)
-            case .h2_b: return UIFont.pretendard(.bold, size: 27)
+            case .h1_b: return UIFont.pretendard(.bold, size: 27)
+            case .h1_sb: return UIFont.pretendard(.semibold, size: 27)
+            case .h2_b: return UIFont.pretendard(.bold, size: 24)
             case .h3_sb: return UIFont.pretendard(.semibold, size: 24)
-            case .h4_b: return UIFont.pretendard(.bold, size: 24)
+            case .h3_22_SB: return UIFont.pretendard(.semibold, size: 22)
+            case .h4_b: return UIFont.pretendard(.bold, size: 20)
             case .h4_sb: return UIFont.pretendard(.semibold, size: 20)
             case .h5_b: return UIFont.pretendard(.bold, size: 18)
             case .t1_sb: return UIFont.pretendard(.semibold, size: 18)
@@ -89,13 +91,13 @@ extension UIFont {
             case .c4_r: return UIFont.pretendard(.regular, size: 11)
             }
         }
-
+        
         // Line Height (LHLHUnit)
         var lineHeightUnit: CGFloat {
             switch self {
-            case .h1_b, .h1_sb, .h2_b, .h3_sb, .h4_b, .h4_sb, .h5_b,
-                 .t1_sb, .t2_r, .t3_b, .t4_b, .b1_sb, .b2_r, .b4_sb,
-                 .b4_sb_1percent, .b4_r, .b5_r, .c1_b, .c2_sb, .c3_r, .c4_r:
+            case .h1_b, .h1_sb, .h2_b, .h3_sb, .h3_22_SB, .h4_b, .h4_sb, .h5_b,
+                    .t1_sb, .t2_r, .t3_b, .t4_b, .b1_sb, .b2_r, .b4_sb,
+                    .b4_sb_1percent, .b4_r, .b5_r, .c1_b, .c2_sb, .c3_r, .c4_r:
                 return 140
             }
         }

Noostak_iOS/Noostak_iOS/Global/Resources/Assets.xcassets/ic_group_default.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Supervisor account.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Noostak_iOS/Noostak_iOS/Global/Resources/Assets.xcassets/ic_share.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icon_share.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Noostak_iOS/Noostak_iOS/Global/Resources/Assets.xcassets/ic_vector.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Vector.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Noostak_iOS/Noostak_iOS/Global/Utils/NSTDateUtility.swift

@@ -88,6 +88,7 @@ public extension NSTDateUtility {
 }
 
 extension NSTDateUtility {
+    ///타임테이블 뷰 : "요일 월/일"
     static func dateList(_ dateStrings: [String]) -> [String] {
         let formatter = NSTDateUtility(format: .yyyyMMddTHHmmss) // ISO 8601 형식
         let displayFormatter = NSTDateUtility(format: .MMddEE) // 출력 형식
@@ -102,7 +103,8 @@ extension NSTDateUtility {
             }
         }
     }
-
+
+    ///타임테이블 뷰 : "00시"
     static func timeList(_ startTime: String, _ endTime: String) -> [String] {
         let formatter = NSTDateUtility(format: .yyyyMMddTHHmmss) // ISO 8601 형식
         var result: [String] = []
@@ -126,4 +128,34 @@ extension NSTDateUtility {
         }
         return result
     }
+
+    ///약속상세뷰 : "9월 7일 (일) 10:00~12:00"
+    static func durationList(_ startTime: String, _ endTime: String) -> String {
+        let formatter = NSTDateUtility(format: .yyyyMMddTHHmmss) // ISO 8601 형식
+        let dateFormatter = DateFormatter()
+        dateFormatter.locale = Locale(identifier: "ko_KR")
+        dateFormatter.timeZone = TimeZone(identifier: "Asia/Seoul")
+
+        // 날짜 포맷: "9월 7일 (일)"
+        dateFormatter.dateFormat = "M월 d일 (E)"
+
+        // 시간 포맷: "10:00"
+        let timeFormatter = DateFormatter()
+        timeFormatter.locale = Locale(identifier: "ko_KR")
+        timeFormatter.timeZone = TimeZone(identifier: "Asia/Seoul")
+        timeFormatter.dateFormat = "HH:mm"
+
+        switch (formatter.date(from: startTime), formatter.date(from: endTime)) {
+        case (.success(let start), .success(let end)):
+            let dateString = dateFormatter.string(from: start) // "9월 7일 (일)"
+            let startTimeString = timeFormatter.string(from: start) // "10:00"
+            let endTimeString = timeFormatter.string(from: end) // "12:00"
+
+            return "\(dateString) \(startTimeString)~\(endTimeString)"
+
+        default:
+            print("Failed to parse start or end time.")
+            return ""
+        }
+    }
 }

Noostak_iOS/Noostak_iOS/Presentation/Dummy/ViewController.swift

@@ -7,11 +7,9 @@
 
 import UIKit
 
-class ViewController: UIViewController {
-
+final class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
     }
-
 }

Noostak_iOS/Noostak_iOS/Presentation/GroupDetail/View/Cell/ConfirmedCVC.swift

@@ -0,0 +1,98 @@
+//
+//  ConfirmedCVC.swift
+//  Noostak_iOS
+//
+//  Created by 오연서 on 2/1/25.
+//
+
+import UIKit
+import SnapKit
+import Then
+import ReactorKit
+
+final class ConfirmedCVC: UICollectionViewCell, View {
+
+    // MARK: Properties
+    static let identifier = "ConfirmedCVC"
+    var disposeBag = DisposeBag()
+
+    // MARK: Views
+    private let chip = UIView()
+    private let scheduleTitleLabel = UILabel()
+    private let timeLabel = UILabel()
+    private let divider = UIView()
+
+    // MARK: Init
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setUpHierarchy()
+        setUpUI()
+        setUpLayout()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    // MARK: setUpHierarchy
+    private func setUpHierarchy() {
+        [chip, scheduleTitleLabel, timeLabel, divider].forEach {
+            self.addSubview($0)
+        }
+    }
+
+    // MARK: setUpUI
+    private func setUpUI() {
+        chip.do {
+            $0.layer.cornerRadius = 6.5
+        }
+
+        scheduleTitleLabel.do {
+            $0.font = .PretendardStyle.b1_sb.font
+            $0.textColor = .appGray900
+        }
+
+        timeLabel.do {
+            $0.font = .PretendardStyle.c3_r.font
+            $0.textColor = .appGray700
+        }
+
+        divider.do {
+            $0.backgroundColor = .appGray200
+        }
+    }
+
+    // MARK: setUpLayout
+    private func setUpLayout() {
+        chip.snp.makeConstraints {
+            $0.top.equalToSuperview().offset(15)
+            $0.leading.equalToSuperview().offset(6)
+            $0.size.equalTo(13)
+        }
+
+        scheduleTitleLabel.snp.makeConstraints {
+            $0.top.equalToSuperview().offset(10)
+            $0.leading.equalTo(chip.snp.trailing).offset(9)
+        }
+
+        timeLabel.snp.makeConstraints {
+            $0.top.equalTo(scheduleTitleLabel.snp.bottom).offset(4)
+            $0.leading.equalTo(scheduleTitleLabel)
+        }
+
+        divider.snp.makeConstraints {
+            $0.bottom.equalToSuperview()
+            $0.horizontalEdges.equalToSuperview()
+            $0.height.equalTo(1)
+        }
+    }
+}
+
+extension ConfirmedCVC {
+    func bind(reactor: ConfirmedCellReactor) {
+        let schedule = reactor.currentState.schedule
+        chip.backgroundColor = schedule.schedule.category.displayColor
+        scheduleTitleLabel.text = schedule.schedule.name
+        timeLabel.text = NSTDateUtility.durationList(schedule.startTime, schedule.endTime)
+    }
+}

Noostak_iOS/Noostak_iOS/Presentation/GroupDetail/View/Cell/ConfirmedCellReactor.swift

@@ -0,0 +1,22 @@
+//
+//  ConfirmedCellReactor.swift
+//  Noostak_iOS
+//
+//  Created by 오연서 on 2/3/25.
+//
+
+import ReactorKit
+import RxSwift
+
+final class ConfirmedCellReactor: Reactor {
+    typealias Action = NoAction
+    struct State {
+        let schedule: ExtendedSchedule
+    }
+
+    let initialState: State
+
+    init(schedule: ExtendedSchedule) {
+        self.initialState = State(schedule: schedule)
+    }
+}