[#24] Snackbar Error 타입 제작

yourssu · Nov 8, 2024 · efc482f · efc482f
1 parent 149ce32
commit efc482f
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 21 deletions.
diff --git a/Handy/Handy-Storybook/Atom/SnackbarViewController.swift b/Handy/Handy-Storybook/Atom/SnackbarViewController.swift
@@ -41,8 +41,8 @@ final class SnackbarViewController: BaseViewController {
 
     override func setViewHierarchies() {
         self.view.addSubview(snackbar1)
-        self.view.addSubview(snackbar2)
-        self.view.addSubview(snackbar3)
+//        self.view.addSubview(snackbar2)
+//        self.view.addSubview(snackbar3)
         self.view.addSubview(snackbar4)
     }
 
@@ -51,14 +51,14 @@ final class SnackbarViewController: BaseViewController {
             $0.bottom.equalToSuperview().inset(56)
             $0.centerX.equalToSuperview()
         }
-        snackbar2.snp.makeConstraints {
-            $0.bottom.equalToSuperview().inset(156)
-            $0.centerX.equalToSuperview()
-        }
-        snackbar3.snp.makeConstraints {
-            $0.bottom.equalToSuperview().inset(256)
-            $0.centerX.equalToSuperview()
-        }
+//        snackbar2.snp.makeConstraints {
+//            $0.bottom.equalToSuperview().inset(156)
+//            $0.centerX.equalToSuperview()
+//        }
+//        snackbar3.snp.makeConstraints {
+//            $0.bottom.equalToSuperview().inset(256)
+//            $0.centerX.equalToSuperview()
+//        }
         snackbar4.snp.makeConstraints {
             $0.bottom.equalToSuperview().inset(356)
             $0.centerX.equalToSuperview()

diff --git a/Handy/Handy/Source/Atom/HandySnackbar.swift b/Handy/Handy/Source/Atom/HandySnackbar.swift
@@ -66,11 +66,18 @@ final public class HandySnackbar: UIView {
 
     private let errorIcon: UIImageView = {
         let imageView = UIImageView()
-        imageView.image = UIImage(systemName: "exclamationmark.circle.fill")
+        imageView.image = HandyIcon.alertTriangleFilled.withRenderingMode(.alwaysTemplate)
         imageView.tintColor = HandySemantic.bgStatusNegative
         return imageView
     }()
 
+    private let cancelButton: UIButton = {
+        let button = UIButton()
+        button.setImage(HandyIcon.closeLine, for: .normal)
+        button.setTitleColor(HandySemantic.iconBasicTertiary, for: .normal)
+        return button
+    }()
+
 
     public init() {
         super.init(frame: .zero)
@@ -96,13 +103,28 @@ final public class HandySnackbar: UIView {
 
     private func setViewHierarchy() {
         self.addSubview(label)
+        self.addSubview(errorIcon)
+        self.addSubview(cancelButton)
     }
 
     private func setAutoLayout() {
+        self.snp.makeConstraints {
+            $0.width.equalTo(343)
+        }
         label.snp.makeConstraints {
             $0.edges.equalToSuperview().inset(16)
             $0.width.equalTo(311)
         }
+        errorIcon.snp.makeConstraints {
+            $0.size.equalTo(20)
+            $0.leading.equalToSuperview().inset(16)
+            $0.centerY.equalToSuperview()
+        }
+        cancelButton.snp.makeConstraints {
+            $0.size.equalTo(20)
+            $0.trailing.equalToSuperview().inset(16)
+            $0.centerY.equalToSuperview()
+        }
     }
 
     private func setLabel() {
@@ -113,6 +135,24 @@ final public class HandySnackbar: UIView {
         if snackbarType == .error {
             // 경고 아이콘
             print(" === error === ")
+            errorIcon.isHidden = false
+            cancelButton.isHidden = false
+
+//            label.snp.makeConstraints {
+//                $0.width.equalTo(255)
+//                $0.leading.equalTo(errorIcon).offset(28)
+//                $0.trailing.equalToSuperview().inset(44)
+//                $0.bottom.top.equalToSuperview().inset(16)
+//            }
+
+        } else {
+            errorIcon.isHidden = true
+            cancelButton.isHidden = true
+
+//            label.snp.makeConstraints {
+//                $0.width.equalTo(311)
+//                $0.edges.equalToSuperview().inset(16)
+//            }
         }
     }
 
@@ -124,7 +164,7 @@ final public class HandySnackbar: UIView {
     private func showSnackbar() {
         print("== showSnackbar ==")
         UIView.animate(
-            withDuration: 0.5,
+            withDuration: 1.5,
             delay: 0.0,
             options: .curveEaseInOut,
             animations: {
@@ -135,15 +175,15 @@ final public class HandySnackbar: UIView {
     }
 
     private func hideSnackbar() {
-        UIView.animate(
-            withDuration: 2.0,
-            delay: 5.0,
-            options: .curveEaseOut,
-            animations: {
-                self.alpha = 0.0
-            }, completion: { _ in
-                self.removeFromSuperview()
-            })
+//        UIView.animate(
+//            withDuration: 2.0,
+//            delay: 5.0,
+//            options: .curveEaseOut,
+//            animations: {
+//                self.alpha = 0.0
+//            }, completion: { _ in
+//                self.removeFromSuperview()
+//            })
     }
 
     override public func setNeedsLayout() {

diff --git a/...ource/Foundation/Asset/HandyIcon.xcassets/checkBox/ic_close_filled.imageset/Contents.json b/...ource/Foundation/Asset/HandyIcon.xcassets/checkBox/ic_close_filled.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_close_filled.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/.../Asset/HandyIcon.xcassets/checkBox/ic_close_filled.imageset/ic_close_filled.svg b/.../Asset/HandyIcon.xcassets/checkBox/ic_close_filled.imageset/ic_close_filled.svg
diff --git a/.../Source/Foundation/Asset/HandyIcon.xcassets/checkBox/ic_close_line.imageset/Contents.json b/.../Source/Foundation/Asset/HandyIcon.xcassets/checkBox/ic_close_line.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_close_line.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...tion/Asset/HandyIcon.xcassets/checkBox/ic_close_line.imageset/ic_close_line.svg b/...tion/Asset/HandyIcon.xcassets/checkBox/ic_close_line.imageset/ic_close_line.svg
diff --git a/Handy/Handy/Source/Foundation/HandyIcon.swift b/Handy/Handy/Source/Foundation/HandyIcon.swift
@@ -32,6 +32,8 @@ public enum HandyIcon {
     public static var volumeLine: UIImage { .load(name: "ic_volume_line") }
     public static var wifiFilled: UIImage { .load(name: "ic_wifi_filled") }
     public static var wifiLine: UIImage { .load(name: "ic_wifi_line") }
+    public static var closeFilled: UIImage { .load(name: "ic_close_filled") }
+    public static var closeLine: UIImage { .load(name: "ic_close_line") }
 
     public static var checkBoxFilled: UIImage { .load(name: "checkBoxFilled") }
     public static var checkBoxLine: UIImage { .load(name: "checkBoxLine") }

diff --git a/Handy/Handy/Source/Foundation/HandySematic.swift b/Handy/Handy/Source/Foundation/HandySematic.swift
@@ -294,4 +294,15 @@ public enum HandySemantic {
     public static var paginationBasicUnSelected: UIColor {
         return .gray500
     }
+
+    // MARK: - Snackbar
+
+    public static var snackbarInfo: UIColor {
+        return .gray800
+    }
+
+    public static var snackbarError: UIColor {
+        return .redSub
+    }
+
 }