Skip to content

Commit 87b8df0

Browse files
presto95presto95
authored
Merge pull request #81 from boostcamp3-iOS/develop
2nd Master Commit!
2 parents 80abcaf + 01412a3 commit 87b8df0

File tree

104 files changed

+3745
-1031
lines changed

Some content is hidden

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

104 files changed

+3745
-1031
lines changed

‎.gitignore

Lines changed: 87 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11

2-
# Created by https://www.gitignore.io/api/git,xcode
3-
# Edit at https://www.gitignore.io/?templates=git,xcode
2+
# Created by https://www.gitignore.io/api/git,xcode,swift,cocoapods
3+
# Edit at https://www.gitignore.io/?templates=git,xcode,swift,cocoapods
4+
5+
### CocoaPods ###
6+
## CocoaPods GitIgnore Template
7+
8+
# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
9+
# - Also handy if you have a large number of dependant pods
10+
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
11+
Pods/
412

513
### Git ###
614
# Created by git for backups. To disable backups in Git:
@@ -17,22 +25,16 @@
1725
*_LOCAL_*.txt
1826
*_REMOTE_*.txt
1927

20-
### Xcode ###
28+
### Swift ###
2129
# Xcode
2230
#
2331
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
2432

25-
## User settings
26-
xcuserdata/
27-
28-
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
29-
*.xcscmblueprint
30-
*.xccheckout
31-
32-
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
33+
## Build generated
3334
build/
3435
DerivedData/
35-
*.moved-aside
36+
37+
## Various settings
3638
*.pbxuser
3739
!default.pbxuser
3840
*.mode1v3
@@ -41,6 +43,78 @@ DerivedData/
4143
!default.mode2v3
4244
*.perspectivev3
4345
!default.perspectivev3
46+
xcuserdata/
47+
48+
## Other
49+
*.moved-aside
50+
*.xccheckout
51+
*.xcscmblueprint
52+
53+
## Obj-C/Swift specific
54+
*.hmap
55+
*.ipa
56+
*.dSYM.zip
57+
*.dSYM
58+
59+
## Playgrounds
60+
timeline.xctimeline
61+
playground.xcworkspace
62+
63+
# Swift Package Manager
64+
#
65+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
66+
# Packages/
67+
# Package.pins
68+
# Package.resolved
69+
.build/
70+
71+
# CocoaPods
72+
#
73+
# We recommend against adding the Pods directory to your .gitignore. However
74+
# you should judge for yourself, the pros and cons are mentioned at:
75+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
76+
#
77+
# Pods/
78+
#
79+
# Add this line if you want to avoid checking in source code from the Xcode workspace
80+
# *.xcworkspace
81+
82+
# Carthage
83+
#
84+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
85+
# Carthage/Checkouts
86+
87+
Carthage/Build
88+
89+
# fastlane
90+
#
91+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
92+
# screenshots whenever they are needed.
93+
# For more information about the recommended setup visit:
94+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
95+
96+
fastlane/report.xml
97+
fastlane/Preview.html
98+
fastlane/screenshots/**/*.png
99+
fastlane/test_output
100+
101+
# Code Injection
102+
#
103+
# After new code Injection tools there's a generated folder /iOSInjectionProject
104+
# https://github.com/johnno1962/injectionforxcode
105+
106+
iOSInjectionProject/
107+
108+
### Xcode ###
109+
# Xcode
110+
#
111+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
112+
113+
## User settings
114+
115+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
116+
117+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
44118

45119
### Xcode Patch ###
46120
*.xcodeproj/*
@@ -50,4 +124,4 @@ DerivedData/
50124
/*.gcno
51125
**/xcshareddata/WorkspaceSettings.xcsettings
52126

53-
# End of https://www.gitignore.io/api/git,xcode
127+
# End of https://www.gitignore.io/api/git,xcode,swift,cocoapods

‎.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ disabled_rules:
66
excluded:
77
- FineDust/Supporting Files/AppDelegate.swift
88
- FineDust/Supporting Files/GeoConverter.swift
9+
- Pods/
910

1011
line_length:
1112
warning: 99

‎FineDust.xcodeproj/project.pbxproj

Lines changed: 443 additions & 170 deletions
Large diffs are not rendered by default.

‎FineDust.xcodeproj/xcshareddata/xcschemes/FineDust.xcscheme

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
18+
BuildableName = "FineDust.app"
19+
BlueprintName = "FineDust"
20+
ReferencedContainer = "container:FineDust.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
31+
<Testables>
32+
</Testables>
33+
<MacroExpansion>
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
37+
BuildableName = "FineDust.app"
38+
BlueprintName = "FineDust"
39+
ReferencedContainer = "container:FineDust.xcodeproj">
40+
</BuildableReference>
41+
</MacroExpansion>
42+
<AdditionalOptions>
43+
</AdditionalOptions>
44+
</TestAction>
45+
<LaunchAction
46+
buildConfiguration = "Debug"
47+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
48+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
launchStyle = "0"
50+
useCustomWorkingDirectory = "NO"
51+
ignoresPersistentStateOnLaunch = "NO"
52+
debugDocumentVersioning = "YES"
53+
debugServiceExtension = "internal"
54+
allowLocationSimulation = "YES">
55+
<BuildableProductRunnable
56+
runnableDebuggingMode = "0">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
60+
BuildableName = "FineDust.app"
61+
BlueprintName = "FineDust"
62+
ReferencedContainer = "container:FineDust.xcodeproj">
63+
</BuildableReference>
64+
</BuildableProductRunnable>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
67+
</LaunchAction>
68+
<ProfileAction
69+
buildConfiguration = "Release"
70+
shouldUseLaunchSchemeArgsEnv = "YES"
71+
savedToolIdentifier = ""
72+
useCustomWorkingDirectory = "NO"
73+
debugDocumentVersioning = "YES">
74+
<BuildableProductRunnable
75+
runnableDebuggingMode = "0">
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
79+
BuildableName = "FineDust.app"
80+
BlueprintName = "FineDust"
81+
ReferencedContainer = "container:FineDust.xcodeproj">
82+
</BuildableReference>
83+
</BuildableProductRunnable>
84+
</ProfileAction>
85+
<AnalyzeAction
86+
buildConfiguration = "Debug">
87+
</AnalyzeAction>
88+
<ArchiveAction
89+
buildConfiguration = "Release"
90+
revealArchiveInOrganizer = "YES">
91+
</ArchiveAction>
92+
</Scheme>

‎FineDust.xcodeproj/xcshareddata/xcschemes/FineDustTests.xcscheme

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
codeCoverageEnabled = "YES"
14+
shouldUseLaunchSchemeArgsEnv = "YES">
15+
<Testables>
16+
<TestableReference
17+
skipped = "NO">
18+
<BuildableReference
19+
BuildableIdentifier = "primary"
20+
BlueprintIdentifier = "FC670917DDB46DEF5B008F67A5D341D0"
21+
BuildableName = "FineDustTests.xctest"
22+
BlueprintName = "FineDustTests"
23+
ReferencedContainer = "container:FineDust.xcodeproj">
24+
</BuildableReference>
25+
</TestableReference>
26+
</Testables>
27+
<AdditionalOptions>
28+
</AdditionalOptions>
29+
</TestAction>
30+
<LaunchAction
31+
buildConfiguration = "Debug"
32+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
33+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34+
launchStyle = "0"
35+
useCustomWorkingDirectory = "NO"
36+
ignoresPersistentStateOnLaunch = "NO"
37+
debugDocumentVersioning = "YES"
38+
debugServiceExtension = "internal"
39+
allowLocationSimulation = "YES">
40+
<AdditionalOptions>
41+
</AdditionalOptions>
42+
</LaunchAction>
43+
<ProfileAction
44+
buildConfiguration = "Release"
45+
shouldUseLaunchSchemeArgsEnv = "YES"
46+
savedToolIdentifier = ""
47+
useCustomWorkingDirectory = "NO"
48+
debugDocumentVersioning = "YES">
49+
</ProfileAction>
50+
<AnalyzeAction
51+
buildConfiguration = "Debug">
52+
</AnalyzeAction>
53+
<ArchiveAction
54+
buildConfiguration = "Release"
55+
revealArchiveInOrganizer = "YES">
56+
</ArchiveAction>
57+
</Scheme>

‎FineDust.xcworkspace/contents.xcworkspacedata

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

‎FineDust.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎FineDust/Common/Hour.swift

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
//
2+
// Hour.swift
3+
// FineDust
4+
//
5+
// Created by Presto on 29/01/2019.
6+
// Copyright © 2019 boostcamp3rd. All rights reserved.
7+
//
8+
9+
import Foundation
10+
11+
/// 시간대 정의
12+
enum Hour: Int, CaseIterable {
13+
14+
/// 0 ~ 1시
15+
case zero
16+
17+
/// 1 ~ 2시
18+
case one
19+
20+
/// 2 ~ 3시
21+
case two
22+
23+
/// 3 ~ 4시
24+
case three
25+
26+
/// 4 ~ 5시
27+
case four
28+
29+
/// 5 ~ 6시
30+
case five
31+
32+
/// 6 ~ 7시
33+
case six
34+
35+
/// 7 ~ 8시
36+
case seven
37+
38+
/// 8 ~ 9시
39+
case eight
40+
41+
/// 9 ~ 10시
42+
case nine
43+
44+
/// 10 ~ 11시
45+
case ten
46+
47+
/// 11 ~ 12시
48+
case eleven
49+
50+
/// 12 ~ 13시
51+
case twelve
52+
53+
/// 13 ~ 14시
54+
case thirteen
55+
56+
/// 14 ~ 15시
57+
case fourteen
58+
59+
/// 15 ~ 16시
60+
case fifteen
61+
62+
/// 16 ~ 17시
63+
case sixteen
64+
65+
/// 17 ~ 18시
66+
case seventeen
67+
68+
/// 18 ~ 19시
69+
case eighteen
70+
71+
/// 19 ~ 20시
72+
case nineteen
73+
74+
/// 20 ~ 21시
75+
case twenty
76+
77+
/// 21 ~ 22시
78+
case twentyOne
79+
80+
/// 22 ~ 23시
81+
case twentyTwo
82+
83+
/// 23 ~ 24시
84+
case twentyThree
85+
86+
/// 오류
87+
case `default`
88+
}

0 commit comments

Comments
 (0)