Merge pull request #212 from boostcamp3-iOS/develop

LastLast Master Commit!

Author: presto95

FineDust.xcodeproj/project.pbxproj

@@ -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/FDCountingLabel.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/Common/Log.swift

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

FineDust/Feedback/View/Base.lproj/Feedback.storyboard renamed to FineDust/Feedback/Base.lproj/Feedback.storyboard

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