Merge branch 'develop' of https://github.com/YAPP-Github/21st-iOS-Team-2-iOS into feature/admin-report

Author: dudtjs1021ej

Fitfty/Projects/App/Support/Info.plist

@@ -14,6 +14,8 @@
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundleDisplayName</key>
+	<string>핏프티</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>

Fitfty/Projects/Common/Resources/Images.xcassets/IntroImage.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "IntroImage.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

Fitfty/Projects/Common/Resources/Images.xcassets/ProfileDummy.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "ProfileDummy.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

Fitfty/Projects/Common/Resources/Images.xcassets/appleLoginImage.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "appleLoginImage.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

Fitfty/Projects/Common/Resources/Images.xcassets/bellIcon.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "bell.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

Fitfty/Projects/Common/Resources/Images.xcassets/fitftyLogoImage.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "fitftyLogoImage.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

Fitfty/Projects/Common/Resources/Images.xcassets/info.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "info.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Fitfty/Projects/Common/Resources/Images.xcassets/info.imageset/info.svg

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "instagram.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

Fitfty/Projects/Common/Resources/Images.xcassets/instagramForPermission.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "introImage2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {