Merge pull request #364 from DeveloperAcademy-POSTECH/release/v1.2

[CHORE] v1.2출시에 따른 main 브랜치 업데이트

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,28 @@
-## 🟣 관련 이슈
+## 🌁 Background
+<!-- 해당 PR을 작성하게 된 이유를 적어주세요. -->
 
-<!-- 관련있는 이슈 번호(#000)을 적어주세요. -->
 
-## 🟣 구현/변경 사항 및 이유
+## 👩‍💻 Contents
+<!-- 작업 내용을 적어주세요 -->
 
-<!-- 구현/변경한 내용과 그 이유를 적어주세요. -->
 
-## 🟣 PR Point
+## ✅ Testing
+<!-- 테스트 방법을 적어주세요 -->
 
-<!-- 리뷰어 분들이 집중적으로 보셨으면 하는 내용을 적어주세요 -->
 
-## 🟣 참고 사항
+## 📱 Screenshot
+<!-- 스크린샷이나 동영상을 첨부해주세요. -->
+<!--  <img src="사진 크기를 줄이고 싶다면 여기 넣어주세요 !.png" width="350">   -->
 
-<!-- 참고할 사항(+스크린샷)이 있다면 적어주세요. -->
 
+## 📝 Review Note
+<!-- PR과정에서 든 생각이나 개선할 내용이 있다면 적어주세요. -->
+
+
+## 📣 Related Issue
+<!-- 관련 이슈를 적어주세요. -->
+- close #
+
+
+## 📬 Reference
+<!-- 참고한 코드의 출처를 작성해주세요 -->

.github/workflows/build.yml

@@ -0,0 +1,23 @@
+# This workflow will build a Swift project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
+
+name: Firefighter-Builder
+
+on:
+  push:
+    branches: [ develop, main ]
+  pull_request:
+    branches: [ develop, release, hotfix, feature, main ]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Firefighter Build Tests
+      run: |
+        xcodebuild build -project ./Manito/Manito.xcodeproj -scheme Manito -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
+        xcpretty --color --simple

Manito/GoogleService-Info.plist

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>1096284073075-ph7paj1dhmjqepfog89001fffpnlqmff.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.1096284073075-ph7paj1dhmjqepfog89001fffpnlqmff</string>
+	<key>API_KEY</key>
+	<string>AIzaSyDLniPL8c8Z6qBPTN03vE_RUObwzONdjMU</string>
+	<key>GCM_SENDER_ID</key>
+	<string>1096284073075</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.TeamFirefighter.Manito</string>
+	<key>PROJECT_ID</key>
+	<string>aenitto-350c7</string>
+	<key>STORAGE_BUCKET</key>
+	<string>aenitto-350c7.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:1096284073075:ios:274e5e836bf912e806ce06</string>
+</dict>
+</plist>

Manito/Manito.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,32 @@
 {
   "pins" : [
+    {
+      "identity" : "abseil-cpp-swiftpm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git",
+      "state" : {
+        "revision" : "583de9bd60f66b40e78d08599cc92036c2e7e4e1",
+        "version" : "0.20220203.2"
+      }
+    },
+    {
+      "identity" : "boringssl-swiftpm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/boringssl-SwiftPM.git",
+      "state" : {
+        "revision" : "dd3eda2b05a3f459fc3073695ad1b28659066eab",
+        "version" : "0.9.1"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "7e80c25b51c2ffa238879b07fbfc5baa54bb3050",
+        "version" : "9.6.0"
+      }
+    },
     {
       "identity" : "fscalendar",
       "kind" : "remoteSourceControl",
@@ -18,6 +45,78 @@
         "version" : "3.3.1"
       }
     },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "c1cfde8067668027b23a42c29d11c246152fe046",
+        "version" : "9.6.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8",
+        "version" : "9.2.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "68ea347bdb1a69e2d2ae2e25cd085b6ef92f64cb",
+        "version" : "7.9.0"
+      }
+    },
+    {
+      "identity" : "grpc-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/grpc/grpc-ios.git",
+      "state" : {
+        "revision" : "8440b914756e0d26d4f4d054a1c1581daedfc5b6",
+        "version" : "1.44.3-grpc"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "d4289da23e978f37c344ea6a386e5546e2466294",
+        "version" : "2.1.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
+        "version" : "1.22.2"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
+        "version" : "2.30909.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb",
+        "version" : "2.1.1"
+      }
+    },
     {
       "identity" : "snapkit",
       "kind" : "remoteSourceControl",
@@ -26,6 +125,15 @@
         "revision" : "f222cbdf325885926566172f6f5f06af95473158",
         "version" : "5.6.0"
       }
+    },
+    {
+      "identity" : "swift-protobuf",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-protobuf.git",
+      "state" : {
+        "revision" : "88c7d15e1242fdb6ecbafbc7926426a19be1e98a",
+        "version" : "1.20.2"
+      }
     }
   ],
   "version" : 2

Manito/Manito/Global/Extension/Notification+Extension.swift

@@ -10,10 +10,5 @@ import Foundation
 
 extension Notification.Name {
     static let nextNotification = Notification.Name("NextNotification")
-    static let dateRangeNotification = Notification.Name("DateRangeNotification")
-    static let changeStartButtonNotification = Notification.Name("ChangeStartButtonNotification")
-    static let editMaxUserNotification = Notification.Name("EditMaxUserNotification")
-    static let requestDateRangeNotification = Notification.Name("RequestDateRangeNotification")
-    static let requestRoomInfoNotification = Notification.Name("RequestRoomInfoNotification")
     static let createRoomInvitedCode = Notification.Name("CreateRoomInvitedCode")
 }

Manito/Manito/Global/Extension/UIColor+Extension.swift

@@ -50,6 +50,10 @@ extension UIColor {
     static var grey004: UIColor {
         return UIColor(hex: "#717174")
     }
+
+    static var grey005: UIColor {
+        return UIColor(hex: "#C1C1C1")
+    }
 
     // MARK: - darkGrey
 
@@ -98,6 +102,12 @@ extension UIColor {
         return UIColor(hex: "#C7A83C")
     }
 
+    // MARK: - pink
+
+    static var subPink: UIColor {
+        return UIColor(hex: "#F18DB1")
+    }
+
     // MARK: - badge
 
     static var badgeBeige: UIColor {

Manito/Manito/Global/Literal/ImageLiteral.swift

@@ -21,6 +21,7 @@ enum ImageLiterals {
     static var icLetterInfo: UIImage { .load(name: "ic_letterInfo")}
     static var icMissionInfo: UIImage { .load(name: "ic_missionInfo")}
     static var icRight: UIImage { .load(name: "ic_right")}
+    static var icSave: UIImage { .load(name: "ic_save")}
 
     // MARK: - button
 

Manito/Manito/Global/Literal/TextLiteral.swift

@@ -28,8 +28,6 @@ enum TextLiteral {
     static let maxMessage: String = "최대 7일까지 선택가능해요"
     static let destructive: String = "변경 사항 폐기"
     static let per: String = "인"
-    static let minMember: String = "5인"
-    static let maxMember: String = "15인"
     static let x: String = "X"
     static let createRoom: String = "방 생성하기"
     static let next: String = "다음"
@@ -122,6 +120,12 @@ enum TextLiteral {
         쪽지함이 비었어요.
         마니띠에게 쪽지를 보내볼까요?
         """
+
+    // MARK: - LetterImageViewController
+    static let letterImageViewControllerErrorTitle = "오류 발생"
+    static let letterImageViewControllerErrorMessage = "사진을 저장할 수 없습니다."
+    static let letterImageViewControllerSuccessTitle = "저장 성공"
+    static let letterImageViewControllerSuccessMessage = "사진을 앨범에 저장했어요."
 
     // MARK: - CreateLetterViewController
     static let createLetterViewControllerSendButton: String = "보내기"
@@ -133,6 +137,11 @@ enum TextLiteral {
     static let detailIngViewControllerGuideTitle: String = "개별 미션이란?"
     static let detailIngViewControllerText: String = "개별 미션이란?\n나의 마니띠에게\n수행하는 미션이에요."
     static let detailIngViewControllerDoneMissionText: String = "종료된 마니또예요"
+    static let detailIngViewControllerDoneExitAlertTitle: String = "정말 방을 나가시겠습니까?"
+    static let detailIngViewControllerDoneExitAlertAdminTitle: String = "정말 방을 삭제하시겠습니까?"
+    static let detailIngViewControllerDoneExitAlertMessage: String = "나간 방은 다시 들어올 수 없어요"
+    static let detailIngViewControllerDoneExitAlertAdmin: String = "방장이 방을 삭제하면\n 참여자들의 방도 삭제됩니다"
+    static let detailIngViewControllerDetailInformatioin: String = "진행 정보"
 
     // MARK: - CalendarView
     static let calendarViewAlertMaxTitle: String = "최대 선택 기간을 넘었어요"

Manito/Manito/Global/Resource/Assets.xcassets/ic_save.imageset/Contents.json

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