Merge pull request #61 from DeveloperAcademy-POSTECH/fix/#58-alertBug

[#58] [fix] Asset 수정
DeveloperAcademy-POSTECH · Nov 7, 2024 · 4ac203a · 4ac203a
2 parents 371909f + 017c296
commit 4ac203a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 23 deletions.
diff --git a/hearo/LiveActivity/Assets.xcassets/AppIcon.appiconset/Contents.json b/hearo/LiveActivity/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "Icon.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

diff --git a/hearo/LiveActivity/Assets.xcassets/AppIcon.appiconset/Icon.png b/hearo/LiveActivity/Assets.xcassets/AppIcon.appiconset/Icon.png
diff --git a/hearo/hearo.xcodeproj/project.pbxproj b/hearo/hearo.xcodeproj/project.pbxproj
@@ -1038,7 +1038,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";
-				DEVELOPMENT_TEAM = J5N8Y9F8Z8;
+				DEVELOPMENT_TEAM = 2H928F4Z7L;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1069,7 +1069,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";
-				DEVELOPMENT_TEAM = J5N8Y9F8Z8;
+				DEVELOPMENT_TEAM = 2H928F4Z7L;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1099,7 +1099,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = J5N8Y9F8Z8;
+				DEVELOPMENT_TEAM = 2H928F4Z7L;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = LiveActivity/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;
@@ -1127,7 +1127,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = J5N8Y9F8Z8;
+				DEVELOPMENT_TEAM = 2H928F4Z7L;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = LiveActivity/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;

diff --git a/hearo/hearo/Assets.xcassets/Color/SubFontColor.colorset/Contents.json b/hearo/hearo/Assets.xcassets/Color/SubFontColor.colorset/Contents.json
@@ -5,15 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-<<<<<<<< HEAD:hearo/hearo/Resources/Assets.xcassets/MainFontColor.colorset/Contents.json
-          "blue" : "44",
-          "green" : "44",
-          "red" : "44"
-========
-          "blue" : "79",
-          "green" : "79",
-          "red" : "79"
->>>>>>>> develop:hearo/hearo/Assets.xcassets/Color/SubFontColor.colorset/Contents.json
+          "blue" : "0x4F",
+          "green" : "0x4F",
+          "red" : "0x4F"
         }
       },
       "idiom" : "universal"
@@ -29,15 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-<<<<<<<< HEAD:hearo/hearo/Resources/Assets.xcassets/MainFontColor.colorset/Contents.json
-          "blue" : "44",
-          "green" : "44",
-          "red" : "44"
-========
-          "blue" : "79",
-          "green" : "79",
-          "red" : "79"
->>>>>>>> develop:hearo/hearo/Assets.xcassets/Color/SubFontColor.colorset/Contents.json
+          "blue" : "0x4F",
+          "green" : "0x4F",
+          "red" : "0x4F"
         }
       },
       "idiom" : "universal"

diff --git a/hearo/hearo/Assets.xcassets/SVGIcon/시작하기.imageset/Contents.json b/hearo/hearo/Assets.xcassets/SVGIcon/시작하기.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "시작하기.svg",
+      "filename" : "시작하기.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },