Merge pull request #387 from DeveloperAcademy-POSTECH/release/v1.2.1

[CHORE] v1.2.1 출시에 따른 main 브랜치 업데이트
DeveloperAcademy-POSTECH · Feb 28, 2023 · d0134ae · d0134ae
2 parents d29008e + b34b64a
commit d0134ae
Show file tree

Hide file tree

Showing 42 changed files with 1,014 additions and 803 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,33 @@
+# .github/release.yml
+
+name-template: '애니또 v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
+categories:
+  - title: '🆕 새로운 기능이 추가되었어요!'
+    label: '✨ Feature'
+  - title: '🐞 자잘한 버그를 수정했습니다.'
+    label: '🐞 Bugfix'
+  - title: '🫶🏻 앱 사용성 개선에 힘썼습니다.'
+    label: '🫶🏻 Improvement'
+  - title: '🛠️ 더 나은 코드를 위해 노력하고 있습니다.'
+    labels:
+      - '🔨 Refactor'
+      - '⚙️ Setting'
+  - title: 'ETC'
+    labels:
+      - "*"
+change-template: '* $TITLE (#$NUMBER) by @$AUTHOR'
+change-title-escapes: '\<*_&#@`'
+version-resolver:
+  major:
+    labels:
+      - 'Major'
+  minor:
+    labels:
+      - 'Minor'
+  patch:
+    labels:
+      - 'Patch'
+  default: patch
+template: |
+  $CHANGES
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -0,0 +1,21 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        with:
+          config-name: release.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
diff --git a/Manito/Manito.xcodeproj/project.pbxproj b/Manito/Manito.xcodeproj/project.pbxproj
@@ -141,12 +141,13 @@
 		CB5AE3E4285AAF7400382EA3 /* RoomInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5AE3E3285AAF7400382EA3 /* RoomInfoView.swift */; };
 		CB5AE3E6285AB76800382EA3 /* PeopleInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5AE3E5285AB76800382EA3 /* PeopleInfoView.swift */; };
 		CB637A3B28595C1200FF1240 /* ParticipateRoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB637A3A28595C1200FF1240 /* ParticipateRoomViewController.swift */; };
+		CB6637E82959CBC60050BD04 /* SkeletonView in Frameworks */ = {isa = PBXBuildFile; productRef = CB6637E72959CBC60050BD04 /* SkeletonView */; };
 		CB674C1C285966020063A6B7 /* InputInvitedCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB674C1B285966020063A6B7 /* InputInvitedCodeView.swift */; };
 		CB674C2128596A310063A6B7 /* CheckRoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB674C2028596A310063A6B7 /* CheckRoomViewController.swift */; };
 		CB7B23A828C4ECA8004A4CF3 /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB7B23A728C4ECA8004A4CF3 /* Character.swift */; };
 		CB85DE1F28A76F3400399109 /* SettingDeveloperInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB85DE1E28A76F3400399109 /* SettingDeveloperInfoHeaderView.swift */; };
 		CB9592B22855C09A00847751 /* ManitoRoomCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9592B12855C09A00847751 /* ManitoRoomCollectionCell.swift */; };
-		CB9592B52855D52700847751 /* CommonMissonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9592B42855D52700847751 /* CommonMissonView.swift */; };
+		CB9592B52855D52700847751 /* CommonMissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9592B42855D52700847751 /* CommonMissionView.swift */; };
 		CBA15C94285CE1A80051EDE2 /* ChooseCharacterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBA15C93285CE1A80051EDE2 /* ChooseCharacterViewController.swift */; };
 		CBA4D7A42856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBA4D7A32856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift */; };
 		CBA4D7A62856D48C0018BDC2 /* RoomStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBA4D7A52856D48C0018BDC2 /* RoomStateView.swift */; };
@@ -301,7 +302,7 @@
 		CB7B23A728C4ECA8004A4CF3 /* Character.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Character.swift; sourceTree = "<group>"; };
 		CB85DE1E28A76F3400399109 /* SettingDeveloperInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingDeveloperInfoHeaderView.swift; sourceTree = "<group>"; };
 		CB9592B12855C09A00847751 /* ManitoRoomCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManitoRoomCollectionCell.swift; sourceTree = "<group>"; };
-		CB9592B42855D52700847751 /* CommonMissonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonMissonView.swift; sourceTree = "<group>"; };
+		CB9592B42855D52700847751 /* CommonMissionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonMissionView.swift; sourceTree = "<group>"; };
 		CBA15C93285CE1A80051EDE2 /* ChooseCharacterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChooseCharacterViewController.swift; sourceTree = "<group>"; };
 		CBA4D7A32856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomCollectionViewCell.swift; sourceTree = "<group>"; };
 		CBA4D7A52856D48C0018BDC2 /* RoomStateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomStateView.swift; sourceTree = "<group>"; };
@@ -322,6 +323,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CB6637E82959CBC60050BD04 /* SkeletonView in Frameworks */,
 				39FFE33428F457AF008442EE /* FirebaseMessaging in Frameworks */,
 				B50B1B0428596C900080992C /* SnapKit in Frameworks */,
 				B50B1B0728596CB10080992C /* FSCalendar in Frameworks */,
@@ -390,7 +392,7 @@
 			path = Login;
 			sourceTree = "<group>";
 		};
-		39C957D328799A8200A04A2B /* Service */ = {
+		39C957D328799A8200A04A2B /* Foundation */ = {
 			isa = PBXGroup;
 			children = (
 				39C957D528799AB900A04A2B /* HTTPMethod.swift */,
@@ -401,7 +403,7 @@
 				39C957F5287D9ED000A04A2B /* NetworkRequest.swift */,
 				B5F31C5528BFA87700F61D0F /* Requestable.swift */,
 			);
-			path = Service;
+			path = Foundation;
 			sourceTree = "<group>";
 		};
 		39C957EA287AE45900A04A2B /* EndPoint */ = {
@@ -502,7 +504,6 @@
 		B5F524C228519AA000614FF7 = {
 			isa = PBXGroup;
 			children = (
-				39FFE33528F45E44008442EE /* GoogleService-Info.plist */,
 				B55BCEB528D99F8600AF7E45 /* Settings.bundle */,
 				B5F524CD28519AA000614FF7 /* Manito */,
 				B5F524CC28519AA000614FF7 /* Products */,
@@ -676,6 +677,7 @@
 			children = (
 				39E6321328BDE59C00CFC6C4 /* Manito.entitlements */,
 				B5F524DC28519AA100614FF7 /* Info.plist */,
+				39FFE33528F45E44008442EE /* GoogleService-Info.plist */,
 				B5F524CE28519AA000614FF7 /* AppDelegate.swift */,
 				B5F524D028519AA000614FF7 /* SceneDelegate.swift */,
 			);
@@ -768,7 +770,7 @@
 				397A241528BA519200454E4F /* Protocol */,
 				397A241128BA513E00454E4F /* API */,
 				39C957EA287AE45900A04A2B /* EndPoint */,
-				39C957D328799A8200A04A2B /* Service */,
+				39C957D328799A8200A04A2B /* Foundation */,
 				B5F525472855D01200614FF7 /* Models */,
 			);
 			path = Network;
@@ -846,7 +848,7 @@
 		CB9592B32855D51100847751 /* UIComponent */ = {
 			isa = PBXGroup;
 			children = (
-				CB9592B42855D52700847751 /* CommonMissonView.swift */,
+				CB9592B42855D52700847751 /* CommonMissionView.swift */,
 				CBA4D7A52856D48C0018BDC2 /* RoomStateView.swift */,
 			);
 			path = UIComponent;
@@ -942,6 +944,7 @@
 				B50B1B0328596C900080992C /* SnapKit */,
 				B50B1B0628596CB10080992C /* FSCalendar */,
 				B50B1B32285AC0970080992C /* Gifu */,
+				CB6637E72959CBC60050BD04 /* SkeletonView */,
 				39FFE33328F457AF008442EE /* FirebaseMessaging */,
 			);
 			productName = Manito;
@@ -976,6 +979,7 @@
 				B50B1B0228596C900080992C /* XCRemoteSwiftPackageReference "SnapKit" */,
 				B50B1B0528596CB10080992C /* XCRemoteSwiftPackageReference "FSCalendar" */,
 				B50B1B31285AC0970080992C /* XCRemoteSwiftPackageReference "Gifu" */,
+				CB6637E62959CBC60050BD04 /* XCRemoteSwiftPackageReference "SkeletonView" */,
 				39FFE33228F457AF008442EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
 			);
 			productRefGroup = B5F524CC28519AA000614FF7 /* Products */;
@@ -1113,7 +1117,7 @@
 				B5F31BB028BE1CA700F61D0F /* UserDefaultStorage.swift in Sources */,
 				B5F31BB228BE1CD700F61D0F /* UserDefaultHandler.swift in Sources */,
 				39CD581D28C4C03C00496E91 /* DetailDoneProtocol.swift in Sources */,
-				CB9592B52855D52700847751 /* CommonMissonView.swift in Sources */,
+				CB9592B52855D52700847751 /* CommonMissionView.swift in Sources */,
 				CBA4D7A42856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift in Sources */,
 				39C95802287DACC300A04A2B /* RoomEndPoint.swift in Sources */,
 				CB4C77E628C0D4EB007A1AD2 /* MainAPI.swift in Sources */,
@@ -1319,7 +1323,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.TeamFirefighter.Manito;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1356,7 +1360,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.TeamFirefighter.Manito;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1422,6 +1426,14 @@
 				minimumVersion = 3.0.0;
 			};
 		};
+		CB6637E62959CBC60050BD04 /* XCRemoteSwiftPackageReference "SkeletonView" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Juanpe/SkeletonView.git";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -1445,6 +1457,11 @@
 			package = B50B1B31285AC0970080992C /* XCRemoteSwiftPackageReference "Gifu" */;
 			productName = Gifu;
 		};
+		CB6637E72959CBC60050BD04 /* SkeletonView */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = CB6637E62959CBC60050BD04 /* XCRemoteSwiftPackageReference "SkeletonView" */;
+			productName = SkeletonView;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = B5F524C328519AA000614FF7 /* Project object */;

diff --git a/Manito/Manito.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Manito/Manito.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -117,6 +117,15 @@
         "version" : "2.1.1"
       }
     },
+    {
+      "identity" : "skeletonview",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Juanpe/SkeletonView.git",
+      "state" : {
+        "branch" : "main",
+        "revision" : "0f5eaf82e82441690d38abfc4118c961f113881c"
+      }
+    },
     {
       "identity" : "snapkit",
       "kind" : "remoteSourceControl",

diff --git a/Manito/Manito/Global/Base/BaseViewController.swift b/Manito/Manito/Global/Base/BaseViewController.swift
@@ -49,8 +49,8 @@ class BaseViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        render()
-        configUI()
+        setupLayout()
+        configureUI()
         setupBackButton()
         hidekeyboardWhenTappedAround()
         setupNavigationBar()
@@ -66,11 +66,11 @@ class BaseViewController: UIViewController {
         setupInteractivePopGestureRecognizer()
     }
 
-    func render() {
+    func setupLayout() {
         // Override Layout
     }
 
-    func configUI() {
+    func configureUI() {
         view.backgroundColor = .backgroundGrey
     }
 

diff --git a/Manito/GoogleService-Info.plist → .../Global/Supports/GoogleService-Info.plist b/Manito/GoogleService-Info.plist → .../Global/Supports/GoogleService-Info.plist
diff --git a/...nito/Network/Service/APIEnvironment.swift → ...o/Network/Foundation/APIEnvironment.swift b/...nito/Network/Service/APIEnvironment.swift → ...o/Network/Foundation/APIEnvironment.swift
diff --git a/...o/Manito/Network/Service/APIService.swift → ...anito/Network/Foundation/APIService.swift b/...o/Manito/Network/Service/APIService.swift → ...anito/Network/Foundation/APIService.swift
diff --git a/...Manito/Network/Service/Endpointable.swift → ...ito/Network/Foundation/Endpointable.swift b/...Manito/Network/Service/Endpointable.swift → ...ito/Network/Foundation/Endpointable.swift
diff --git a/...o/Manito/Network/Service/HTTPMethod.swift → ...anito/Network/Foundation/HTTPMethod.swift b/...o/Manito/Network/Service/HTTPMethod.swift → ...anito/Network/Foundation/HTTPMethod.swift
diff --git a/...Manito/Network/Service/NetworkError.swift → ...ito/Network/Foundation/NetworkError.swift b/...Manito/Network/Service/NetworkError.swift → ...ito/Network/Foundation/NetworkError.swift
diff --git a/...nito/Network/Service/NetworkRequest.swift → ...o/Network/Foundation/NetworkRequest.swift b/...nito/Network/Service/NetworkRequest.swift → ...o/Network/Foundation/NetworkRequest.swift
diff --git a/.../Manito/Network/Service/Requestable.swift → ...nito/Network/Foundation/Requestable.swift b/.../Manito/Network/Service/Requestable.swift → ...nito/Network/Foundation/Requestable.swift
diff --git a/Manito/Manito/Network/Models/Room.swift b/Manito/Manito/Network/Models/Room.swift
@@ -39,6 +39,28 @@ struct Room: Decodable {
         }
     }
 
+    var canStart: Bool {
+        if let count = participants?.count,
+           let date = roomInformation?.startDate?.stringToDate {
+            let isMinimumUserCount = count >= 4
+            return isMinimumUserCount && date.isToday
+        } else {
+            return false
+        }
+    }
+
+    var roomDTO: RoomDTO {
+        if let roomInformation {
+            let dto = RoomDTO(title: roomInformation.title ?? "",
+                              capacity: roomInformation.capacity ?? 0,
+                              startDate: roomInformation.startDate ?? "",
+                              endDate: roomInformation.endDate ?? "")
+            return dto
+        } else {
+            return RoomDTO(title: "", capacity: 0, startDate: "", endDate: "")
+        }
+    }
+
     enum CodingKeys: String, CodingKey {
         case roomInformation = "room"
         case participants
@@ -61,6 +83,14 @@ struct Friend: Decodable {
 struct Participants: Decodable {
     let count: Int?
     let members: [User]?
+
+    var membersNickname: [String] {
+        if let nicknames = members {
+            return nicknames.map { $0.nickname ?? "" }
+        } else {
+            return []
+        }
+    }
 }
 
 // MARK: - Member
@@ -81,6 +111,24 @@ struct RoomInfo: Decodable {
             return ""
         }
     }
+
+    var isAlreadyPastDate: Bool {
+        if let date = startDate?.stringToDate {
+            return date.distance(to: Date()) > 86400
+        } else {
+            return false
+        }
+    }
+
+    var isStart: Bool {
+        if let date = startDate?.stringToDate {
+            let isStartDate = date.distance(to: Date()) < 86400
+            let isPast = date.distance(to: Date()) > 86400
+            return !isPast && isStartDate
+        } else {
+            return false
+        }
+    }
 }
 
 struct Mission: Codable {

diff --git a/Manito/Manito/Screens/CheckRoom/CheckRoomViewController.swift b/Manito/Manito/Screens/CheckRoom/CheckRoomViewController.swift
@@ -73,7 +73,7 @@ class CheckRoomViewController: BaseViewController {
         setupViewController()
     }
 
-    override func render() {
+    override func setupLayout() {
         view.addSubview(roomInfoImageView)
         roomInfoImageView.snp.makeConstraints {
             $0.center.equalToSuperview()
@@ -110,7 +110,7 @@ class CheckRoomViewController: BaseViewController {
         }
     }
 
-    override func configUI() {
+    override func configureUI() {
         view.backgroundColor = .black.withAlphaComponent(0.7)
     }
 

diff --git a/Manito/Manito/Screens/ChooseCharacter/ChooseCharacterViewController.swift b/Manito/Manito/Screens/ChooseCharacter/ChooseCharacterViewController.swift
@@ -127,7 +127,7 @@ class ChooseCharacterViewController: BaseViewController {
 
     // MARK: - life cycle
 
-    override func render() {
+    override func setupLayout() {
         view.addSubview(closeButton)
         closeButton.snp.makeConstraints {
             $0.top.equalTo(view.safeAreaLayoutGuide).inset(9)

diff --git a/Manito/Manito/Screens/CreateNickName/CreateNickNameViewController.swift b/Manito/Manito/Screens/CreateNickName/CreateNickNameViewController.swift
@@ -90,7 +90,7 @@ class CreateNickNameViewController: BaseViewController {
         }
     }
 
-    override func render() {
+    override func setupLayout() {
         view.addSubview(titleLabel)
         titleLabel.snp.makeConstraints {
             $0.top.equalTo(view.safeAreaLayoutGuide).inset(66)
@@ -191,8 +191,8 @@ class CreateNickNameViewController: BaseViewController {
 
     // MARK: - Configure
 
-    override func configUI() {
-        super.configUI()
+    override func configureUI() {
+        super.configureUI()
     }
 }
 

diff --git a/Manito/Manito/Screens/CreateRoom/CreateRoomViewController.swift b/Manito/Manito/Screens/CreateRoom/CreateRoomViewController.swift
@@ -88,7 +88,7 @@ class CreateRoomViewController: BaseViewController {
         setupNotificationCenter()
     }
 
-    override func render() {
+    override func setupLayout() {
         view.addSubview(titleLabel)
         titleLabel.snp.makeConstraints {
             $0.top.equalTo(view.safeAreaLayoutGuide).inset(66)
@@ -148,8 +148,8 @@ class CreateRoomViewController: BaseViewController {
 
     // MARK: - Configure
 
-    override func configUI() {
-        super.configUI()
+    override func configureUI() {
+        super.configureUI()
         navigationController?.navigationBar.isHidden = true
     }