From 0968851ade69f71ded31ac20f72f26dcadefcc3b Mon Sep 17 00:00:00 2001
From: jeonjimin <cjjunn0827@gmail.com>
Date: Thu, 2 May 2024 17:06:40 +0900
Subject: [PATCH] =?UTF-8?q?[Feat]=20ShortcutIcon=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 RoundedRectanlge -> sf symbol의 app 이미지 사용
---
 .../app.imageset/Contents.json                | 24 +++++++++++++++++++
 .../Assets.xcassets/app.imageset/app.svg      |  3 +++
 .../appLarge.imageset/Contents.json           | 24 +++++++++++++++++++
 .../appLarge.imageset/appLarge.svg            |  3 +++
 .../Views/Components/ShortcutIcon.swift       | 19 ++++++++++-----
 5 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 HappyAnding/HappyAnding/Assets.xcassets/app.imageset/Contents.json
 create mode 100644 HappyAnding/HappyAnding/Assets.xcassets/app.imageset/app.svg
 create mode 100644 HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/Contents.json
 create mode 100644 HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/appLarge.svg

diff --git a/HappyAnding/HappyAnding/Assets.xcassets/app.imageset/Contents.json b/HappyAnding/HappyAnding/Assets.xcassets/app.imageset/Contents.json
new file mode 100644
index 00000000..2be286fa
--- /dev/null
+++ b/HappyAnding/HappyAnding/Assets.xcassets/app.imageset/Contents.json
@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "filename" : "app.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/HappyAnding/HappyAnding/Assets.xcassets/app.imageset/app.svg b/HappyAnding/HappyAnding/Assets.xcassets/app.imageset/app.svg
new file mode 100644
index 00000000..c70e67bf
--- /dev/null
+++ b/HappyAnding/HappyAnding/Assets.xcassets/app.imageset/app.svg
@@ -0,0 +1,3 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M39.7832 0.5C44.9791 0.5 49.1544 0.998232 52.0932 3.93706C55.0315 6.87537 55.5 10.9889 55.5 16.1866V39.7832C55.5 44.9816 55.0313 49.125 52.0932 52.0631C49.1544 55.0019 44.9791 55.5 39.7832 55.5H16.1866C11.0214 55.5 6.84565 55.002 3.90671 52.0631C0.968658 49.125 0.5 44.9816 0.5 39.7832V16.1258C0.5 11.0197 0.968288 6.87549 3.90671 3.93706C6.84591 0.997857 11.0222 0.5 16.1258 0.5H39.7832Z" stroke="white"/>
+</svg>
diff --git a/HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/Contents.json b/HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/Contents.json
new file mode 100644
index 00000000..2d4082a0
--- /dev/null
+++ b/HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/Contents.json
@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "filename" : "appLarge.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/appLarge.svg b/HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/appLarge.svg
new file mode 100644
index 00000000..c4fb9a0c
--- /dev/null
+++ b/HappyAnding/HappyAnding/Assets.xcassets/appLarge.imageset/appLarge.svg
@@ -0,0 +1,3 @@
+<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M68.1998 1C77.1078 1 84.209 1.85764 89.2017 6.85026C94.1933 11.8418 95 18.8368 95 27.7484V68.1998C95 77.1129 94.1928 84.1589 89.2017 89.15C84.209 94.1426 77.1078 95 68.1998 95H27.7484C18.8931 95 11.7911 94.1429 6.79823 89.15C1.80717 84.1589 1 77.1129 1 68.1998V27.6443C1 18.8896 1.80642 11.8421 6.79823 6.85026C11.7916 1.85689 18.8947 1 27.6443 1H68.1998Z" stroke="white" stroke-width="2"/>
+</svg>
diff --git a/HappyAnding/HappyAnding/Views/Components/ShortcutIcon.swift b/HappyAnding/HappyAnding/Views/Components/ShortcutIcon.swift
index 22798259..e00b6905 100644
--- a/HappyAnding/HappyAnding/Views/Components/ShortcutIcon.swift
+++ b/HappyAnding/HappyAnding/Views/Components/ShortcutIcon.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 
+//TODO: 추후 사이즈별 아이콘 크기 조절 필요
 struct ShortcutIcon: View {
     @Environment(\.colorScheme) var colorScheme
     
@@ -16,17 +17,23 @@ struct ShortcutIcon: View {
     
     var body: some View {
         ZStack {
-            RoundedRectangle(cornerRadius: 13)
-                .foregroundStyle(SCZColor.colors[color]?.color(for: colorScheme).fillGradient() ?? Color.clear.toGradient())
-                .roundedBorder(cornerRadius: 13, color: .white, isNormalBlend: true, opacity: 0.24)
+            Image(systemName: "app.fill")
+                .resizable()
+                .scaledToFit()
                 .frame(width: size, height: size)
+                .foregroundStyle(SCZColor.colors[color]?.color(for: colorScheme).fillGradient() ??  Color.clear.toGradient())
+            Image(size>50 ? "appLarge" : "app")
+                .resizable()
+                .scaledToFit()
+                .frame(width: size, height: size)
+                .foregroundStyle(SCZColor.colors[color]?.color(for: colorScheme).strokeGradient() ??  Color.clear.toGradient())
             Image(systemName: sfSymbol)
-                .font(.system(size: size/2 - 5))
+                .font(.system(size: size/2))
                 .foregroundStyle(Color.white)
         }
     }
 }
-
+ 
 #Preview {
-    ShortcutIcon(sfSymbol: "play.rectangle.fill", color: "Red", size: 56)
+    ShortcutIcon(sfSymbol: "alarm.fill", color: "Yellow", size: 96)
 }