Merge branch 'develop' into feat/#78-trying-to-merge

Author: jayn2u

EATSSU_MVC/EATSSU_MVC/Resources/Assets/Images.xcassets/version2/KakaoLoginButton.imageset/Contents.json

@@ -1,17 +1,8 @@
 {
   "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
     {
       "filename" : "KakaoLoginButton.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

EATSSU_MVC/EATSSU_MVC/Resources/Assets/Images.xcassets/version2/LookAroundButton.imageset/Contents.json

@@ -1,17 +1,8 @@
 {
   "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
     {
       "filename" : "LookAroundButton.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

EATSSU_MVC/EATSSU_MVC/Sources/Data/Firebase/NoticeViewController.swift

@@ -9,7 +9,8 @@ import UIKit
 
 import SnapKit
 
-class NoticeViewController:BaseViewController {
+/// FirebaseRemoteConfig 관련 ViewController
+class NoticeViewController: BaseViewController {
 
     // MARK: - Properties
     var noticeMessage: String

EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Home/ViewController/HomeViewController.swift

@@ -66,7 +66,8 @@ final class HomeViewController: BaseViewController {
       navigationItem.titleView = UIImageView(image: EATSSUAsset.Images.Version2.mainLogoSmall.image)
 
         let rightButton = UIBarButtonItem(
-            image: EATSSUAsset.Images.myPageIcon.image,
+			// FIXME: myPageIcon은 Version 1 소속 이미지 파일입니다. 앞으로도 사용한다면 Version 2로 옮겨주세요.
+			image: EATSSUAsset.Images.Version1.myPageIcon.image,
             style: .plain, target: self,
             action: #selector(rightBarButtonTapped))
         navigationItem.rightBarButtonItem = rightButton

EATSSU_MVC/EATSSU_MVC/Sources/Utility/Literal/DummyModel.swift

@@ -0,0 +1,14 @@
+//
+//  DummyModel.swift
+//  EatSSU-iOS
+//
+//  Created by 최지우 on 2023/07/16.
+//
+
+import UIKit
+
+// TODO: 해당 파일을 남겨둘지 앞으로 유지 관련해서 명세해주세요.
+
+struct DummyModel: AppData {
+	
+}

EATSSU_MVC/EATSSU_MVC/Sources/Utility/Protocol/DataTypeProtocol.swift

@@ -0,0 +1,14 @@
+//
+//  DataTypeProtocol.swift
+//  EatSSU-iOS
+//
+//  Created by 최지우 on 2023/07/16.
+//
+
+import Foundation
+
+// TODO: 해당 프로토콜이 왜 필요한 지 마크업 주석으로 명세를 남겨주세요.
+
+protocol AppData {
+	
+}

Tuist/Package.resolved

@@ -27,7 +27,7 @@ let package = Package(
       .package(url: "https://github.com/onevcat/Kingfisher", from: "7.12.0"),
       .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "11.1.0"),
       .package(url: "https://github.com/google/GoogleAppMeasurement", from: "11.1.0"),
-      .package(url: "https://github.com/realm/realm-swift", from: "10.54.0"),
+      .package(url: "https://github.com/realm/realm-swift", from: "20.0.0"),
       .package(url: "https://github.com/ReactiveX/RxSwift", from: "6.7.1"),
     ]
 )