Skip to content

Commit a580471

Browse files
committed
Merge branch 'release/2.1.2' into main
2 parents fd3fe52 + 6d270c5 commit a580471

File tree

775 files changed

+42360
-9
lines changed

Some content is hidden

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

775 files changed

+42360
-9
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Hi-lingual iOS Issue Template
3+
about: Hi-lingual iOS 이슈 템플릿입니다
4+
title: "[FEAT] : color system 구성 (예시)"
5+
labels: ''
6+
assignees: ''
7+
---
8+
9+
## 📌𝗧𝗮𝘀𝗸
10+
- [ ]
11+
- [ ]
12+
13+
---
14+
15+
## 💡𝗥𝗲𝗳𝗲𝗿𝗲𝗻𝗰𝗲
16+

.github/pull_request_template.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
## ✅ Check List
2+
- [ ] merge할 브랜치의 위치를 확인해 주세요.(main❌/develop⭕)
3+
- [ ] 2인 이상의 Approve를 받은 후 머지해주세요.
4+
- [ ] 변경사항은 500줄 이하로 유지해주세요.
5+
- [ ] PR에는 핵심 내용만 적고, 자세한 내용은 트슈에 작성한 뒤 링크를 공유해주세요.
6+
- [ ] Approve된 PR은 Assigner가 직접 머지해주세요.
7+
- [ ] 수정 요청이 있다면 반영 후 다시 push해주세요.
8+
9+
---
10+
11+
## 📌 Related Issue
12+
- closed #이슈번호
13+
14+
---
15+
16+
## 📎 Work Description
17+
- 어떤 기능을 구현했는지 간단히 작성해주세요.
18+
- 해결한 문제나 핵심 내용을 요약해서 적어주세요.
19+
20+
---
21+
22+
## 📷 Screenshots
23+
24+
| 기능/화면 | iPhone SE | iPhone 16 Pro |
25+
|:---------:|:---------:|:-------------:|
26+
| A 기능 | <img src="" width="250"> | <img src="" width="250"> |
27+
| B 기능 | <img src="" width="250"> | <img src="" width="250"> |
28+
29+
---
30+
31+
## 💬 To Reviewers
32+
- 리뷰어에게 전달하고 싶은 메시지를 남겨주세요.

.gitignore

Lines changed: 92 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,64 @@
1+
# Created by https://www.toptal.com/developers/gitignore/api/xcode,swiftpackagemanager,swift,macos
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=xcode,swiftpackagemanager,swift,macos
3+
4+
### macOS ###
5+
# General
6+
.DS_Store
7+
.AppleDouble
8+
.LSOverride
9+
10+
# Icon must end with two \r
11+
# Icon
12+
13+
14+
# Thumbnails
15+
._*
16+
17+
# Files that might appear in the root of a volume
18+
.DocumentRevisions-V100
19+
.fseventsd
20+
.Spotlight-V100
21+
.TemporaryItems
22+
.Trashes
23+
.VolumeIcon.icns
24+
.com.apple.timemachine.donotpresent
25+
26+
# Directories potentially created on remote AFP share
27+
.AppleDB
28+
.AppleDesktop
29+
Network Trash Folder
30+
Temporary Items
31+
.apdisk
32+
33+
### macOS Patch ###
34+
# iCloud generated files
35+
*.icloud
36+
37+
### Swift ###
138
# Xcode
239
#
340
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
441

542
## User settings
643
xcuserdata/
744

45+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
46+
*.xcscmblueprint
47+
*.xccheckout
48+
49+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
50+
build/
51+
DerivedData/
52+
*.moved-aside
53+
*.pbxuser
54+
!default.pbxuser
55+
*.mode1v3
56+
!default.mode1v3
57+
*.mode2v3
58+
!default.mode2v3
59+
*.perspectivev3
60+
!default.perspectivev3
61+
862
## Obj-C/Swift specific
963
*.hmap
1064

@@ -18,39 +72,36 @@ timeline.xctimeline
1872
playground.xcworkspace
1973

2074
# Swift Package Manager
21-
#
2275
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
2376
# Packages/
2477
# Package.pins
2578
# Package.resolved
2679
# *.xcodeproj
27-
#
2880
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
2981
# hence it is not needed unless you have added a package configuration file to your project
3082
# .swiftpm
3183

3284
.build/
3385

3486
# CocoaPods
35-
#
3687
# We recommend against adding the Pods directory to your .gitignore. However
3788
# you should judge for yourself, the pros and cons are mentioned at:
3889
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
39-
#
4090
# Pods/
41-
#
4291
# Add this line if you want to avoid checking in source code from the Xcode workspace
4392
# *.xcworkspace
4493

4594
# Carthage
46-
#
4795
# Add this line if you want to avoid checking in source code from Carthage dependencies.
4896
# Carthage/Checkouts
4997

5098
Carthage/Build/
5199

100+
# Accio dependency management
101+
Dependencies/
102+
.accio/
103+
52104
# fastlane
53-
#
54105
# It is recommended to not store the screenshots in the git repo.
55106
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
56107
# For more information about the recommended setup visit:
@@ -60,3 +111,37 @@ fastlane/report.xml
60111
fastlane/Preview.html
61112
fastlane/screenshots/**/*.png
62113
fastlane/test_output
114+
115+
# Code Injection
116+
# After new code Injection tools there's a generated folder /iOSInjectionProject
117+
# https://github.com/johnno1962/injectionforxcode
118+
119+
iOSInjectionProject/
120+
121+
### SwiftPackageManager ###
122+
Packages
123+
xcuserdata
124+
125+
126+
### Xcode ###
127+
128+
## Xcode 8 and earlier
129+
130+
### Xcode Patch ###
131+
*.xcodeproj/*
132+
!*.xcodeproj/project.pbxproj
133+
!*.xcodeproj/xcshareddata/
134+
!*.xcodeproj/project.xcworkspace/
135+
!*.xcworkspace/contents.xcworkspacedata
136+
/*.gcno
137+
**/xcshareddata/WorkspaceSettings.xcsettings
138+
139+
# End of https://www.toptal.com/developers/gitignore/api/xcode,swiftpackagemanager,swift,macos
140+
141+
142+
Ignore actual config (local only)
143+
Hilingual/App/Config/Config.xcconfig
144+
145+
Hilingual/App/Config/Debug.xcconfig
146+
147+
Hilingual/App/Config/Release.xcconfig

0 commit comments

Comments
 (0)