Skip to content

Commit d29008e

Browse files
MMMIIINMMMIIIN
authored
Merge pull request #364 from DeveloperAcademy-POSTECH/release/v1.2
[CHORE] v1.2출시에 따른 main 브랜치 업데이트
2 parents 62e875d + 905d05b commit d29008e

File tree

60 files changed

+1769
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1769
-688
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
1-
## 🟣 관련 이슈
1+
## 🌁 Background
2+
<!-- 해당 PR을 작성하게 된 이유를 적어주세요. -->
23

3-
<!-- 관련있는 이슈 번호(#000)을 적어주세요. -->
44

5-
## 🟣 구현/변경 사항 및 이유
5+
## 👩‍💻 Contents
6+
<!-- 작업 내용을 적어주세요 -->
67

7-
<!-- 구현/변경한 내용과 그 이유를 적어주세요. -->
88

9-
## 🟣 PR Point
9+
## ✅ Testing
10+
<!-- 테스트 방법을 적어주세요 -->
1011

11-
<!-- 리뷰어 분들이 집중적으로 보셨으면 하는 내용을 적어주세요 -->
1212

13-
## 🟣 참고 사항
13+
## 📱 Screenshot
14+
<!-- 스크린샷이나 동영상을 첨부해주세요. -->
15+
<!-- <img src="사진 크기를 줄이고 싶다면 여기 넣어주세요 !.png" width="350"> -->
1416

15-
<!-- 참고할 사항(+스크린샷)이 있다면 적어주세요. -->
1617

18+
## 📝 Review Note
19+
<!-- PR과정에서 든 생각이나 개선할 내용이 있다면 적어주세요. -->
20+
21+
22+
## 📣 Related Issue
23+
<!-- 관련 이슈를 적어주세요. -->
24+
- close #
25+
26+
27+
## 📬 Reference
28+
<!-- 참고한 코드의 출처를 작성해주세요 -->

‎.github/workflows/build.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This workflow will build a Swift project
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
3+
4+
name: Firefighter-Builder
5+
6+
on:
7+
push:
8+
branches: [ develop, main ]
9+
pull_request:
10+
branches: [ develop, release, hotfix, feature, main ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: macos-latest
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
20+
- name: Firefighter Build Tests
21+
run: |
22+
xcodebuild build -project ./Manito/Manito.xcodeproj -scheme Manito -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
23+
xcpretty --color --simple

‎Manito/GoogleService-Info.plist‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CLIENT_ID</key>
6+
<string>1096284073075-ph7paj1dhmjqepfog89001fffpnlqmff.apps.googleusercontent.com</string>
7+
<key>REVERSED_CLIENT_ID</key>
8+
<string>com.googleusercontent.apps.1096284073075-ph7paj1dhmjqepfog89001fffpnlqmff</string>
9+
<key>API_KEY</key>
10+
<string>AIzaSyDLniPL8c8Z6qBPTN03vE_RUObwzONdjMU</string>
11+
<key>GCM_SENDER_ID</key>
12+
<string>1096284073075</string>
13+
<key>PLIST_VERSION</key>
14+
<string>1</string>
15+
<key>BUNDLE_ID</key>
16+
<string>com.TeamFirefighter.Manito</string>
17+
<key>PROJECT_ID</key>
18+
<string>aenitto-350c7</string>
19+
<key>STORAGE_BUCKET</key>
20+
<string>aenitto-350c7.appspot.com</string>
21+
<key>IS_ADS_ENABLED</key>
22+
<false></false>
23+
<key>IS_ANALYTICS_ENABLED</key>
24+
<false></false>
25+
<key>IS_APPINVITE_ENABLED</key>
26+
<true></true>
27+
<key>IS_GCM_ENABLED</key>
28+
<true></true>
29+
<key>IS_SIGNIN_ENABLED</key>
30+
<true></true>
31+
<key>GOOGLE_APP_ID</key>
32+
<string>1:1096284073075:ios:274e5e836bf912e806ce06</string>
33+
</dict>
34+
</plist>

‎Manito/Manito.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 10 deletions
Large diffs are not rendered by default.

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

Lines changed: 108 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,5 @@ import Foundation
1010

1111
extension Notification.Name {
1212
static let nextNotification = Notification.Name("NextNotification")
13-
static let dateRangeNotification = Notification.Name("DateRangeNotification")
14-
static let changeStartButtonNotification = Notification.Name("ChangeStartButtonNotification")
15-
static let editMaxUserNotification = Notification.Name("EditMaxUserNotification")
16-
static let requestDateRangeNotification = Notification.Name("RequestDateRangeNotification")
17-
static let requestRoomInfoNotification = Notification.Name("RequestRoomInfoNotification")
1813
static let createRoomInvitedCode = Notification.Name("CreateRoomInvitedCode")
1914
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ extension UIColor {
5050
static var grey004: UIColor {
5151
return UIColor(hex: "#717174")
5252
}
53+
54+
static var grey005: UIColor {
55+
return UIColor(hex: "#C1C1C1")
56+
}
5357

5458
// MARK: - darkGrey
5559

@@ -98,6 +102,12 @@ extension UIColor {
98102
return UIColor(hex: "#C7A83C")
99103
}
100104

105+
// MARK: - pink
106+
107+
static var subPink: UIColor {
108+
return UIColor(hex: "#F18DB1")
109+
}
110+
101111
// MARK: - badge
102112

103113
static var badgeBeige: UIColor {

‎Manito/Manito/Global/Literal/ImageLiteral.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ enum ImageLiterals {
2121
static var icLetterInfo: UIImage { .load(name: "ic_letterInfo")}
2222
static var icMissionInfo: UIImage { .load(name: "ic_missionInfo")}
2323
static var icRight: UIImage { .load(name: "ic_right")}
24+
static var icSave: UIImage { .load(name: "ic_save")}
2425

2526
// MARK: - button
2627

‎Manito/Manito/Global/Literal/TextLiteral.swift‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ enum TextLiteral {
2828
static let maxMessage: String = "최대 7일까지 선택가능해요"
2929
static let destructive: String = "변경 사항 폐기"
3030
static let per: String = "인"
31-
static let minMember: String = "5인"
32-
static let maxMember: String = "15인"
3331
static let x: String = "X"
3432
static let createRoom: String = "방 생성하기"
3533
static let next: String = "다음"
@@ -122,6 +120,12 @@ enum TextLiteral {
122120
쪽지함이 비었어요.
123121
마니띠에게 쪽지를 보내볼까요?
124122
"""
123+
124+
// MARK: - LetterImageViewController
125+
static let letterImageViewControllerErrorTitle = "오류 발생"
126+
static let letterImageViewControllerErrorMessage = "사진을 저장할 수 없습니다."
127+
static let letterImageViewControllerSuccessTitle = "저장 성공"
128+
static let letterImageViewControllerSuccessMessage = "사진을 앨범에 저장했어요."
125129

126130
// MARK: - CreateLetterViewController
127131
static let createLetterViewControllerSendButton: String = "보내기"
@@ -133,6 +137,11 @@ enum TextLiteral {
133137
static let detailIngViewControllerGuideTitle: String = "개별 미션이란?"
134138
static let detailIngViewControllerText: String = "개별 미션이란?\n나의 마니띠에게\n수행하는 미션이에요."
135139
static let detailIngViewControllerDoneMissionText: String = "종료된 마니또예요"
140+
static let detailIngViewControllerDoneExitAlertTitle: String = "정말 방을 나가시겠습니까?"
141+
static let detailIngViewControllerDoneExitAlertAdminTitle: String = "정말 방을 삭제하시겠습니까?"
142+
static let detailIngViewControllerDoneExitAlertMessage: String = "나간 방은 다시 들어올 수 없어요"
143+
static let detailIngViewControllerDoneExitAlertAdmin: String = "방장이 방을 삭제하면\n 참여자들의 방도 삭제됩니다"
144+
static let detailIngViewControllerDetailInformatioin: String = "진행 정보"
136145

137146
// MARK: - CalendarView
138147
static let calendarViewAlertMaxTitle: String = "최대 선택 기간을 넘었어요"

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "ic_save.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "[email protected]",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "[email protected]",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

0 commit comments

Comments
 (0)