Merge pull request #212 from boostcamp3-iOS/develop

LastLast Master Commit!

FineDust/Common/FDCountingLabel.swift

@@ -13,17 +13,7 @@ final class FDCountingLabel: UILabel {
 
   /// 타이머.
   private var timer: Timer?
-
-  // MARK: Initializer
-
-  override init(frame: CGRect) {
-    super.init(frame: frame)
-  }
-
-  required init?(coder aDecoder: NSCoder) {
-    super.init(coder: aDecoder)
-  }
-
+
   /// 값이 없을 때 설정.
   func setNoValue(_ defaultText: String = "-") {
     text = defaultText

FineDust/Common/Log.swift

@@ -8,15 +8,21 @@
 
 import UIKit
 
-func debugLog(_ message: Any, file: String = #file, function: String = #function, line: Int = #line) {
+func debugLog(_ message: Any,
+              file: String = #file,
+              function: String = #function,
+              line: Int = #line) {
   #if DEBUG
   let fileName = file.split(separator: "/").last ?? ""
   let functionName = function.split(separator: "(").first ?? ""
   print("👻 [\(fileName)] \(functionName)(\(line)): \(message)")
   #endif
 }
 
-func errorLog(_ message: Any, file: String = #file, function: String = #function, line: Int = #line) {
+func errorLog(_ message: Any,
+              file: String = #file,
+              function: String = #function,
+              line: Int = #line) {
   let fileName = file.split(separator: "/").last ?? ""
   let functionName = function.split(separator: "(").first ?? ""
   print("❌ [\(fileName)] \(functionName)(\(line)): \(message)")

FineDust/Statistics/GraphDrawable.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 /// 그래프를 그리는 프로토콜.
 protocol GraphDrawable: class {

FineDust/Statistics/IntakeData.swift

@@ -24,7 +24,7 @@ struct IntakeData {
   var todayUltrafineDust: Int = 1
 
   /// 초기화.
-  mutating func reset(_ intakeData: IntakeData) {
+  mutating func reset(to intakeData: IntakeData) {
     self = intakeData
   }
 }

FineDust/Statistics/IntakeRequestable.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 /// 흡입량을 호출하는 프로토콜.
 protocol IntakeRequestable: class {
@@ -30,7 +31,9 @@ protocol IntakeRequestable: class {
   var requestIntakeHandler: (IntakeData?, Error?) -> Void { get }
 }
 
-extension IntakeRequestable {
+// MARK: - IntakeRequestable 프로토콜 초기 구현
+
+extension IntakeRequestable where Self: UIViewController {
 
   func injectDependency(_ intakeService: IntakeServiceType,
                         _ coreDataService: CoreDataServiceType) {

FineDust/Statistics/StatisticsViewController.swift

@@ -121,7 +121,7 @@ extension StatisticsViewController: IntakeRequestable {
         return
       }
       guard let intakeData = intakeData else { return }
-      self.intakeData.reset(intakeData)
+      self.intakeData.reset(to: intakeData)
       DispatchQueue.main.async {
         self.initializeGraphViews()
       }
@@ -194,7 +194,7 @@ private extension StatisticsViewController {
                                     weekUltrafineDust: lastSavedData.weekUltrafineDust,
                                     todayFineDust: lastSavedData.todayFineDust,
                                     todayUltrafineDust: lastSavedData.todayUltrafineDust)
-        self.intakeData.reset(intakeData)
+        self.intakeData.reset(to: intakeData)
         DispatchQueue.main.async {
           self.initializeGraphViews()
         }

README.md

@@ -17,13 +17,13 @@
 
 ## 팀원 정보
 
-**[intmain](https://github.com/intmain)**
+⭐️ 튜터 오진성 [@intmain](https://github.com/intmain)
 
-[Jae-eun](https://github.com/Jae-eun)
+이재은 [@Jae-eun](https://github.com/Jae-eun)
 
-[zunzunzun](https://github.com/zunzunzun)
+이준상 [@zunzunzun](https://github.com/zunzunzun)
 
-[presto95](https://github.com/presto95)
+이한결 [@presto95](https://github.com/presto95)
 
 ## 기획