Merge branch 'develop' of https://github.com/TeamHavit/Havit-iOS into…

… feature/39-reachrate-view

.gitignore

@@ -61,7 +61,7 @@ playground.xcworkspace
 # 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/
+Pods/
 # Add this line if you want to avoid checking in source code from the Xcode workspace
 # *.xcworkspace
 

.precommit.yml

@@ -18,3 +18,7 @@ identifier_name:
     - id
 
 force_cast: warning
+
+identifier_name:
+  min_length:
+    warning: 1 # only warning

Havit/Havit/Coordinator/CategoryContentsCooridnator.swift

@@ -0,0 +1,29 @@
+//
+//  CategoryContentsCooridnator.swift
+//  Havit
+//
+//  Created by 박예빈 on 2022/01/14.
+//
+
+import Foundation
+
+final class CategoryContentsCoordinator: BaseCoordinator {
+
+    enum CategoryContentsTransition {
+        case pop
+    }
+
+    override func start() {
+        let categoryContents = CategoryContentsViewController()
+        categoryContents.coordinator = self
+        navigationController.pushViewController(categoryContents, animated: true)
+    }
+
+    func previous(to transition: CategoryContentsTransition) {
+        switch transition {
+        case .pop:
+            parentCoordinator?.didFinish(coordinator: self)
+            navigationController.popViewController(animated: true)
+        }
+    }
+}

Havit/Havit/Coordinator/EditCategoryCoordinator.swift

@@ -0,0 +1,29 @@
+//
+//  EditCategoryCoordinator.swift
+//  Havit
+//
+//  Created by 김수연 on 2022/01/16.
+//
+
+import Foundation
+
+final class EditCategoryCoordinator: BaseCoordinator {
+
+    enum EditCategoryTransition {
+        case previous
+    }
+
+    override func start() {
+        let editCategoryViewController = EditCategoryViewController()
+        editCategoryViewController.coordinator = self
+        navigationController.pushViewController(editCategoryViewController, animated: true)
+    }
+
+    func performTransition(to transition: EditCategoryTransition) {
+        switch transition {
+        case .previous:
+            parentCoordinator?.didFinish(coordinator: self)
+            navigationController.popViewController(animated: true)
+        }
+    }
+}

Havit/Havit/Global/Extension/UIView+Extension.swift

@@ -9,10 +9,10 @@ import UIKit
 
 extension UIView {
     @discardableResult
-    func makeShadow(_ color: UIColor,
-                    _ opacity: Float,
-                    _ offset: CGSize,
-                    _ radius: CGFloat) -> Self {
+    func makeShadow(color: UIColor,
+                    opacity: Float,
+                    offset: CGSize,
+                    radius: CGFloat) -> Self {
         layer.shadowColor = color.cgColor
         layer.shadowOpacity = opacity
         layer.shadowOffset = offset
@@ -35,6 +35,28 @@ extension UIView {
         return self
     }
 
+    @discardableResult
+    func applyZeplinShadow (color: UIColor = .black,
+                            alpha: Float,
+                            x: CGFloat,
+                            y: CGFloat,
+                            blur: CGFloat,
+                            spread: CGFloat) -> Self {
+        layer.masksToBounds = false
+        layer.shadowColor = color.cgColor
+        layer.shadowOpacity = alpha
+        layer.shadowOffset = CGSize(width: x, height: y)
+        layer.shadowRadius = blur / 2.0
+        if spread == 0 {
+            layer.shadowPath = nil
+        } else {
+            let dx = -spread
+            let rect = bounds.insetBy(dx: dx, dy: dx)
+            layer.shadowPath = UIBezierPath(rect: rect).cgPath
+        }
+        return self
+    }
+
     func addSubView<T: UIView>(_ subview: T, completionHandler closure: ((T) -> Void)? = nil) {
         addSubview(subview)
         closure?(subview)

Havit/Havit/Global/Literal/ImageLiteral.swift

@@ -22,16 +22,23 @@ enum ImageLiteral {
 
     static var iconAlarmtagEnd: UIImage { .load(named: "iconAlarmtagEnd")}
     static var iconAlarmtagPuple: UIImage { .load(named: "iconAlarmtagPuple")}
+    static var iconBackBlack: UIImage { .load(named: "iconBackBlack")}
+    static var iconBackspaceBlack: UIImage { .load(named: "iconBackspaceBlack")}
+    static var iconBackspaceGray: UIImage { .load(named: "iconBackspaceGray")}
     static var iconCategory: UIImage { .load(named: "iconCategory")}
     static var iconCategoryAdd: UIImage { .load(named: "iconCategoryAdd")}
     static var iconCategoryMove: UIImage { .load(named: "iconCategoryMove")}
     static var iconCategorySelected: UIImage { .load(named: "iconCategorySelected")}
     static var iconCategoryUnselected: UIImage { .load(named: "iconCategoryUnselected")}
     static var iconCheck: UIImage { .load(named: "iconCheck")}
     static var iconChipGray: UIImage { .load(named: "iconChipGray")}
+     static var iconContentsRead: UIImage { .load(named: "iconContentsRead")}
+     static var iconContentsUnread: UIImage { .load(named: "iconContentsUnread")}
     static var iconDelete: UIImage { .load(named: "iconDelete")}
     static var iconDropBlack: UIImage { .load(named: "iconDropBlack")}
     static var iconEdit: UIImage { .load(named: "iconEdit")}
+    static var iconForwardBlack: UIImage { .load(named: "iconForwardBlack")}
+    static var iconForwardGray: UIImage { .load(named: "iconForwardGray")}
     static var iconGoGray: UIImage { .load(named: "iconGoGray")}
     static var iconHandGray: UIImage { .load(named: "iconHandGray")}
     static var iconHomeSelected: UIImage { .load(named: "iconHomeSelected")}
@@ -42,6 +49,8 @@ enum ImageLiteral {
     static var iconMypageSelected: UIImage { .load(named: "iconMypageSelected")}
     static var iconMypageUnselected: UIImage { .load(named: "iconMypageUnselected")}
     static var iconNoticeIcon: UIImage { .load(named: "iconNoticeIcon")}
+    static var iconRefresh: UIImage { .load(named: "iconRefresh")}
+    static var iconSafari: UIImage { .load(named: "iconSafari")}
     static var iconSearch: UIImage { .load(named: "iconSearch")}
     static var iconShare: UIImage { .load(named: "iconShare")}
     static var iconUpdown: UIImage { .load(named: "iconUpdown")}

Havit/Havit/Global/Resource/Assets.xcassets/btnAdd.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "btnAdd.png"
+      "filename" : "btnAdd.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
+      "idiom" : "universal",
       "filename" : "[email protected]",
-      "scale" : "3x",
-      "idiom" : "universal"
+      "scale" : "3x"
     }
   ],
   "info" : {

Havit/Havit/Global/Resource/Assets.xcassets/iconBackBlack.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconBackBlack.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Havit/Havit/Global/Resource/Assets.xcassets/iconBackspaceBlack.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconBackspaceBlack.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Havit/Havit/Global/Resource/Assets.xcassets/iconBackspaceGray.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconBackspaceGray.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Havit/Havit/Global/Resource/Assets.xcassets/iconContentsRead.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconContentsRead.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Havit/Havit/Global/Resource/Assets.xcassets/iconContentsUnread.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconContentsUnread.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Havit/Havit/Global/Resource/Assets.xcassets/iconForwardBlack.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconForwardBlack.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Havit/Havit/Global/Resource/Assets.xcassets/iconForwardGray.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconForwardGray.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Havit/Havit/Global/Resource/Assets.xcassets/iconRefresh.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iconRefresh.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "2x",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "[email protected]",
+      "scale" : "3x",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}