fix: 충돌 임시 커밋

KkuMulKum/Network/DTO/Model/Promises/TardyInfoModel.swift

@@ -0,0 +1,22 @@
+//
+//  PromiseLateInfoResponseModel.swift
+//  KkuMulKum
+//
+//  Created by YOUJIM on 7/8/24.
+//
+
+
+// MARK: 약속 지각 상세 조회
+
+import Foundation
+
+struct TardyInfoModel: ResponseModelType {
+    let penalty: String
+    let isPastDue: Bool
+    let lateComers: [Comer]
+}
+
+struct Comer: Codable {
+    let participantId: Int
+    let name, profileImg: String
+}

KkuMulKum/Resource/Assets.xcassets/Image/img_empty_tardy.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "img_empty_tardy.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KkuMulKum/Resource/Assets.xcassets/Image/img_gift.imageset/Contents.json

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

KkuMulKum/Resource/Base/BaseViewController.swift

@@ -46,6 +46,11 @@ extension BaseViewController {
             $0.horizontalEdges.bottom.equalToSuperview()
             $0.height.equalTo(Screen.height(1))
         }
+
+        let barAppearance = UINavigationBarAppearance()
+        barAppearance.backgroundColor = .white
+        navigationItem.standardAppearance = barAppearance
+        navigationItem.scrollEdgeAppearance = barAppearance
     }
 
     /// 네비게이션 바 BackButton 구성

KkuMulKum/Source/Core/MainTabBarController.swift

@@ -49,20 +49,17 @@ final class MainTabBarController: UITabBarController {
         tabBar.standardAppearance = tabBarAppearance
         tabBar.scrollEdgeAppearance = tabBarAppearance
 
-        let homeNavigationController = UINavigationController(rootViewController: homeViewController).then {
-            $0.navigationBar.topItem?.backButtonDisplayMode = .minimal
-            $0.navigationBar.tintColor = .black
-        }
+        let homeNavigationController = UINavigationController(
+            rootViewController: homeViewController
+        )
 
-        let meetingListNavigationController = UINavigationController(rootViewController: meetingListViewController).then {
-            $0.navigationBar.topItem?.backButtonDisplayMode = .minimal
-            $0.navigationBar.tintColor = .black
-        }
+        let meetingListNavigationController = UINavigationController(
+            rootViewController: meetingListViewController
+        )
 
-        let myPageViewNavigationController = UINavigationController(rootViewController: myPageViewController).then {
-            $0.navigationBar.topItem?.backButtonDisplayMode = .minimal
-            $0.navigationBar.tintColor = .black
-        }
+        let myPageViewNavigationController = UINavigationController(
+            rootViewController: myPageViewController
+        )
 
         setViewControllers([
             homeNavigationController,

KkuMulKum/Source/MeetingCreate/InviteCode/ViewController/InviteCodeViewController.swift

@@ -87,11 +87,9 @@ class InviteCodeViewController: BaseViewController {
 
     @objc private func nextButtonTapped() {
         // TODO: 서버 연결할 때 데이터 바인딩해서 화면 전환 시키기
-        let promiseViewController = BasePromiseViewController()
+        let basePromiseViewController = PagePromiseViewController()
 
-        promiseViewController.modalPresentationStyle = .fullScreen
-
-        navigationController?.pushViewController(promiseViewController, animated: true)
+        navigationController?.pushViewController(basePromiseViewController, animated: true)
     }
 
     @objc private func textFieldDidChange(_ textField: UITextField) {

KkuMulKum/Source/MeetingList/View/MeetingListView.swift

@@ -21,7 +21,7 @@ final class MeetingListView: BaseView {
         $0.setText("꾸물리안이 가입한 모임은\n총 3개예요!", style: .head01, color: .gray8)
     }
 
-    private let addButton = UIButton().then {
+    let addButton = UIButton().then {
         $0.backgroundColor = .green2
         $0.layer.cornerRadius = 8
     }