Skip to content

Commit

Permalink
Merge pull request #81 from boostcamp3-iOS/develop
Browse files Browse the repository at this point in the history
2nd Master Commit!
  • Loading branch information
presto95 authored Feb 4, 2019
2 parents 80abcaf + 01412a3 commit 87b8df0
Show file tree
Hide file tree
Showing 104 changed files with 3,745 additions and 1,031 deletions.
100 changes: 87 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@

# Created by https://www.gitignore.io/api/git,xcode
# Edit at https://www.gitignore.io/?templates=git,xcode
# Created by https://www.gitignore.io/api/git,xcode,swift,cocoapods
# Edit at https://www.gitignore.io/?templates=git,xcode,swift,cocoapods

### CocoaPods ###
## CocoaPods GitIgnore Template

# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
# - Also handy if you have a large number of dependant pods
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
Pods/

### Git ###
# Created by git for backups. To disable backups in Git:
Expand All @@ -17,22 +25,16 @@
*_LOCAL_*.txt
*_REMOTE_*.txt

### Xcode ###
### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
## Build generated
build/
DerivedData/
*.moved-aside

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -41,6 +43,78 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
.build/

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

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### Xcode ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)

### Xcode Patch ###
*.xcodeproj/*
Expand All @@ -50,4 +124,4 @@ DerivedData/
/*.gcno
**/xcshareddata/WorkspaceSettings.xcsettings

# End of https://www.gitignore.io/api/git,xcode
# End of https://www.gitignore.io/api/git,xcode,swift,cocoapods
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ disabled_rules:
excluded:
- FineDust/Supporting Files/AppDelegate.swift
- FineDust/Supporting Files/GeoConverter.swift
- Pods/

line_length:
warning: 99
Expand Down
613 changes: 443 additions & 170 deletions FineDust.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

92 changes: 92 additions & 0 deletions FineDust.xcodeproj/xcshareddata/xcschemes/FineDust.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
BuildableName = "FineDust.app"
BlueprintName = "FineDust"
ReferencedContainer = "container:FineDust.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
BuildableName = "FineDust.app"
BlueprintName = "FineDust"
ReferencedContainer = "container:FineDust.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
BuildableName = "FineDust.app"
BlueprintName = "FineDust"
ReferencedContainer = "container:FineDust.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C359351F31356424279C6FAA7866E534"
BuildableName = "FineDust.app"
BlueprintName = "FineDust"
ReferencedContainer = "container:FineDust.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
57 changes: 57 additions & 0 deletions FineDust.xcodeproj/xcshareddata/xcschemes/FineDustTests.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FC670917DDB46DEF5B008F67A5D341D0"
BuildableName = "FineDustTests.xctest"
BlueprintName = "FineDustTests"
ReferencedContainer = "container:FineDust.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
10 changes: 10 additions & 0 deletions FineDust.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions FineDust.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
88 changes: 88 additions & 0 deletions FineDust/Common/Hour.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
//
// Hour.swift
// FineDust
//
// Created by Presto on 29/01/2019.
// Copyright © 2019 boostcamp3rd. All rights reserved.
//

import Foundation

/// 시간대 정의
enum Hour: Int, CaseIterable {

/// 0 ~ 1시
case zero

/// 1 ~ 2시
case one

/// 2 ~ 3시
case two

/// 3 ~ 4시
case three

/// 4 ~ 5시
case four

/// 5 ~ 6시
case five

/// 6 ~ 7시
case six

/// 7 ~ 8시
case seven

/// 8 ~ 9시
case eight

/// 9 ~ 10시
case nine

/// 10 ~ 11시
case ten

/// 11 ~ 12시
case eleven

/// 12 ~ 13시
case twelve

/// 13 ~ 14시
case thirteen

/// 14 ~ 15시
case fourteen

/// 15 ~ 16시
case fifteen

/// 16 ~ 17시
case sixteen

/// 17 ~ 18시
case seventeen

/// 18 ~ 19시
case eighteen

/// 19 ~ 20시
case nineteen

/// 20 ~ 21시
case twenty

/// 21 ~ 22시
case twentyOne

/// 22 ~ 23시
case twentyTwo

/// 23 ~ 24시
case twentyThree

/// 오류
case `default`
}
Loading

0 comments on commit 87b8df0

Please sign in to comment.