Merge remote-tracking branch 'refs/remotes/origin/develop'

Conflicts:
	HappyAnding/HappyAnding/Views/MyPageViews/SettingView.swift

HappyAnding/HappyAnding/Assets.xcassets/Colors/SystemColors/Error.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.239",
-          "green" : "0.306",
-          "red" : "0.922"
+          "blue" : "0x3D",
+          "green" : "0x4E",
+          "red" : "0xEB"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.271",
-          "green" : "0.333",
-          "red" : "0.922"
+          "blue" : "0x45",
+          "green" : "0x54",
+          "red" : "0xEB"
         }
       },
       "idiom" : "universal"

HappyAnding/HappyAnding/Extensions/Color+Extension.swift

@@ -38,41 +38,41 @@ extension Color {
 
 extension Color {
     // Semantic Color
-    static let Background_plus = Color(light: .Gray1, dark: .White)
-    static let Background_tabbar = Color(light: .White, dark: Color("Grey005"))
-    static let Background_list = Color(light:.White, dark:.Background)
-    static let Background_list_border = Color(light:.Gray1, dark:.White)
+    static let backgroundPlus = Color(light: .gray1, dark: .shortcutsZipWhite)
+    static let backgroundTabbar = Color(light: .shortcutsZipWhite, dark: Color("Grey005"))
+    static let backgroudList = Color(light: .shortcutsZipWhite, dark: .shortcutsZipBackground)
+    static let backgroudListBorder = Color(light: .gray1, dark: .shortcutsZipWhite)
 
-    static let Text_curation = Color(light: .Gray5, dark: .Background)
-    static let Text_icon = Color(light: .White, dark: .Gray6)
+    static let textCuration = Color(light: .gray5, dark: .shortcutsZipBackground)
+    static let textIcon = Color(light: .shortcutsZipWhite, dark: .gray6)
 
-    static let Text_Button = Color(light: .Background, dark: .Gray6)
-    static let Text_Button_Disable = Color(light: .White .opacity(0.8), dark: .Gray2.opacity(0.8))
+    static let textButton = Color(light: .shortcutsZipBackground, dark: .gray6)
+    static let textButtonDisable = Color(light: .shortcutsZipWhite .opacity(0.8), dark: .gray2.opacity(0.8))
 
-    static let Category_Pick_Fill = Color(light:.White, dark:.Primary)
-    static let Category_Pick_Text = Color(light:.Primary, dark:.Gray6)
+    static let categoryPickFill = Color(light: .shortcutsZipWhite, dark: .shortcutsZipPrimary)
+    static let categoryPickText = Color(light: .shortcutsZipPrimary, dark: .gray6)
 
-    static let Tag_Pick_Background = Color(light: Color.clear, dark:.Primary)
-    static let Tag_Background = Color(light: .Background, dark: .Primary)
-    static let Tag_Text = Color(light: .Primary, dark: .white)
+    static let tagPickBackground = Color(light: Color.clear, dark: .shortcutsZipPrimary)
+    static let tagBackground = Color(light: .shortcutsZipBackground, dark: .shortcutsZipPrimary)
+    static let tagText = Color(light: .shortcutsZipPrimary, dark: .white)
 }
 
 extension Color {
     ///System Colors
-    static let Background = Color("Grey020")
-    static let White = Color("Grey010")
-    static let Primary = Color("Primary")
-    static let Error = Color("Error")
-    static let Danger = Color("Danger")
-    static let Success = Color("Success")
+    static let shortcutsZipBackground = Color("Grey020")
+    static let shortcutsZipWhite = Color("Grey010")
+    static let shortcutsZipPrimary = Color("Primary")
+    static let shortcutsZipError = Color("Error")
+    static let shortcutsZipDanger = Color("Danger")
+    static let shortcutsZipSuccess = Color("Success")
 
     ///Text Colors
-    static let Gray1 = Color("Grey030")
-    static let Gray2 = Color("Grey040")
-    static let Gray3 = Color("Grey050")
-    static let Gray4 = Color("Grey060")
-    static let Gray5 = Color("Grey070")
-    static let Gray6 = Color("Grey080")
+    static let gray1 = Color("Grey030")
+    static let gray2 = Color("Grey040")
+    static let gray3 = Color("Grey050")
+    static let gray4 = Color("Grey060")
+    static let gray5 = Color("Grey070")
+    static let gray6 = Color("Grey080")
 
     //gradient사용하는 곳에서 Color.fetchGradient(color: "Red")와 같이 사용해주세요
     //컬러명은 숫자를 제외하고 UpperCamelCase로 입력해주세요
@@ -81,26 +81,29 @@ extension Color {
         return LinearGradient(colors: colors, startPoint: .topLeading, endPoint: .bottomTrailing)
 
     }
+    static func fetchDefualtGradient() -> LinearGradient {
+        LinearGradient(colors: [Color.gray1], startPoint: .topLeading, endPoint: .bottomTrailing)
+    }
 }
 
 extension UIColor {
-    static var Gray4: UIColor {
+    static var gray4: UIColor {
         guard let color = UIColor(named: "Grey060") else { return .label }
         return color
     }
-    static var Gray5: UIColor {
+    static var gray5: UIColor {
         guard let color = UIColor(named: "Grey070") else { return .label }
         return color
     }
-    static var Background: UIColor {
+    static var shortcutsZipBackground: UIColor {
         guard let color = UIColor(named: "Grey020") else { return .label }
         return color
     }
-    static var Primary: UIColor {
+    static var shortcutsZipPrimary: UIColor {
         guard let color = UIColor(named: "Primary") else { return .label }
         return color
     }
-    static var PrimaryOpacity: UIColor {
+    static var shortcutsZipPrimaryOpacity: UIColor {
         guard let color = UIColor(named: "Primary") else { return .label }
         return color.withAlphaComponent(0.3)
     }

HappyAnding/HappyAnding/Extensions/EnvironmentValues+Extension.swift

@@ -0,0 +1,15 @@
+//
+//  Alert+Extension.swift
+//  HappyAnding
+//
+//  Created by 전지민 on 2023/01/25.
+//
+
+import SwiftUI
+
+extension EnvironmentValues {
+    var loginAlertKey: Alerter {
+        get { return self[LoginAlertKey.self] }
+        set { self[LoginAlertKey.self] = newValue }
+    }
+}

HappyAnding/HappyAnding/Extensions/Image+Extension.swift

@@ -10,7 +10,7 @@ import SwiftUI
 extension Image {
     func setCellIcon() -> some View {
         self
-            .foregroundColor(.Gray4)
+            .foregroundColor(.gray4)
             .font(.system(size: 24, weight: .medium))
             .frame(height: 32)
     }

HappyAnding/HappyAnding/Extensions/Navigationbar+Extension.swift

@@ -22,7 +22,7 @@ struct NavigationBarColorModifier<Background>: ViewModifier where Background: Vi
         appearance.configureWithOpaqueBackground()
         appearance.backgroundColor = UIColor.clear
         appearance.shadowColor = .clear
-        appearance.largeTitleTextAttributes = [.font : UIFont.LargeTitle, .foregroundColor: UIColor(.Gray5)]
+        appearance.largeTitleTextAttributes = [.font : UIFont.LargeTitle, .foregroundColor: UIColor(.gray5)]
         //back button color 지정
         let backItemAppearance = UIBarButtonItemAppearance()
         backItemAppearance.normal.titleTextAttributes = [
@@ -32,14 +32,14 @@ struct NavigationBarColorModifier<Background>: ViewModifier where Background: Vi
 
         //indicator color 지정
         let image = UIImage(systemName: "chevron.backward")?
-            .withTintColor(UIColor(.Gray4), renderingMode: .alwaysOriginal)
+            .withTintColor(UIColor(.gray4), renderingMode: .alwaysOriginal)
         appearance.setBackIndicatorImage(image, transitionMaskImage: image)
 
         let scrollAppearance = UINavigationBarAppearance()
         scrollAppearance.configureWithDefaultBackground()
-        scrollAppearance.backgroundColor = UIColor(Color.White)
+        scrollAppearance.backgroundColor = UIColor(Color.shortcutsZipWhite)
         scrollAppearance.shadowColor = .clear
-        scrollAppearance.largeTitleTextAttributes = [.font : UIFont.LargeTitle, .foregroundColor: UIColor(.Gray5)]
+        scrollAppearance.largeTitleTextAttributes = [.font : UIFont.LargeTitle, .foregroundColor: UIColor(.gray5)]
         scrollAppearance.backButtonAppearance = backItemAppearance
         scrollAppearance.setBackIndicatorImage(image, transitionMaskImage: image)
 

HappyAnding/HappyAnding/Extensions/View+Extension.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 
+//MARK: - 제스쳐
 extension View {
     func readSize(onChange: @escaping (CGSize) -> Void) -> some View {
         background(
@@ -45,6 +46,7 @@ extension View {
     }
 }
 
+//MARK: - 둥근 모서리
 struct RoundedCorner: Shape {
 
     var radius: CGFloat = .infinity

HappyAnding/HappyAnding/Model/Category.swift

@@ -96,7 +96,7 @@ enum Category: String, CaseIterable {
         case .photo:
             return "사진 및 비디오"
         case .decoration:
-            return "데코레이션/꾸미기"
+            return "데코레이션"
         case .utility:
             return "유틸리티"
         case .sns:

HappyAnding/HappyAnding/Model/Shortcuts.swift

@@ -27,14 +27,6 @@ struct Shortcuts: Identifiable, Codable, Equatable, Hashable {
     var curationIDs: [String]
     var updateDescription: [String] = [""]
 
-    enum CodingKeys: String, CodingKey {
-        case id, sfSymbol, color, title, subtitle
-        case description = "description"
-        case category, requiredApp, date, numberOfLike, numberOfDownload, author, shortcutRequirements, downloadLink
-        case curationIDs
-        case updateDescription
-    }
-
     var dictionary: [String: Any] {
         let data = (try? JSONEncoder().encode(self)) ?? Data()
         return (try? JSONSerialization.jsonObject(with: data, options: .mutableContainers) as? [String: Any]) ?? [:]