Merge pull request #19 from mini-min/feature/#17

[#17] - 컬러 에셋 추가
TeamNADA · Oct 1, 2021 · 9cbc8c6 · 9cbc8c6
2 parents 6d251e6 + 2f154ff
commit 9cbc8c6
Show file tree

Hide file tree

Showing 22 changed files with 458 additions and 30 deletions.
diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 390515B72706CEBB00C5F7A5 /* Colors.xcassets */; };
+		390515BA2706D29B00C5F7A5 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 390515B92706D29B00C5F7A5 /* Color.swift */; };
 		3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3909242E26FA15E800236C51 /* UIView+Extension.swift */; };
 		39523E09270184A700536900 /* CardListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39523E08270184A700536900 /* CardListViewController.swift */; };
 		39523E0B270184B100536900 /* CardList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39523E0A270184B100536900 /* CardList.storyboard */; };
@@ -49,6 +51,8 @@
 
 /* Begin PBXFileReference section */
 		1E770167DDA25A2CE063AA5C /* Pods-NADA-iOS-forRelease.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.release.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.release.xcconfig"; sourceTree = "<group>"; };
+		390515B72706CEBB00C5F7A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
+		390515B92706D29B00C5F7A5 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
 		3909242E26FA15E800236C51 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
 		39523E08270184A700536900 /* CardListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListViewController.swift; sourceTree = "<group>"; };
 		39523E0A270184B100536900 /* CardList.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardList.storyboard; sourceTree = "<group>"; };
@@ -205,6 +209,7 @@
 			isa = PBXGroup;
 			children = (
 				F8FC438E26C01CDE0033E151 /* Assets.xcassets */,
+				390515B72706CEBB00C5F7A5 /* Colors.xcassets */,
 			);
 			path = Assets;
 			sourceTree = "<group>";
@@ -355,6 +360,7 @@
 				F8FC43B726C0227D0033E151 /* Const.swift */,
 				F8FC43B926C022900033E151 /* ViewController.swift */,
 				F8FC43BB26C022A20033E151 /* Storyboard.swift */,
+				390515B92706D29B00C5F7A5 /* Color.swift */,
 			);
 			path = Constants;
 			sourceTree = "<group>";
@@ -449,6 +455,7 @@
 				39523E0B270184B100536900 /* CardList.storyboard in Resources */,
 				F8FC438D26C01CDD0033E151 /* Main.storyboard in Resources */,
 				F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */,
+				390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -536,6 +543,7 @@
 				F8FC43BA26C022900033E151 /* ViewController.swift in Sources */,
 				39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */,
 				F8FC43AD26C020940033E151 /* TempClass.swift in Sources */,
+				390515BA2706D29B00C5F7A5 /* Color.swift in Sources */,
 				F84BAFB126FDB552004CA335 /* BackCardCreationCell.swift in Sources */,
 				F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */,
 				F84BAFAD26FDB543004CA335 /* FrontCardCreationCell.swift in Sources */,

diff --git a/...assets/AccentColor.colorset/Contents.json → ...uces/Assets/Colors.xcassets/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...uces/Assets/Colors.xcassets/Contents.json
@@ -1,9 +1,4 @@
 {
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
   "info" : {
     "author" : "xcode",
     "version" : 1

diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0",
+          "green" : "0",
+          "red" : "0"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/delete.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/delete.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "81",
+          "green" : "81",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorBackground.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorBackground.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "14",
+          "green" : "18",
+          "red" : "76"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorText.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorText.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "48",
+          "green" : "59",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group1.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group1.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "79",
+          "green" : "179",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group2.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group2.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "255",
+          "green" : "0",
+          "red" : "158"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group3.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group3.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "97",
+          "green" : "97",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group4.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group4.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "98",
+          "green" : "195",
+          "red" : "65"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/hint.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/hint.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "108",
+          "green" : "108",
+          "red" : "108"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/inputBlack.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/inputBlack.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "27",
+          "green" : "27",
+          "red" : "27"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/listSelectedBlack.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/listSelectedBlack.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "31",
+          "green" : "31",
+          "red" : "31"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "255",
+          "green" : "116",
+          "red" : "54"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/matchButton.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/matchButton.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.300",
+          "blue" : "255",
+          "green" : "255",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalBackground.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalBackground.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.500",
+          "blue" : "0",
+          "green" : "0",
+          "red" : "0"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalButton.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalButton.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "40",
+          "green" : "40",
+          "red" : "40"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/step.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/step.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "14",
+          "green" : "14",
+          "red" : "14"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}