From 7fa3b1cd8a38fca43dafa6bd3ae03498d556dfa4 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Thu, 7 Oct 2021 15:22:54 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE]=20#34=20-=20=EC=BB=AC=EB=9F=AC=20?= =?UTF-8?q?=EC=9D=B5=EC=8A=A4=ED=85=90=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 8 +- .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Contents 2.json | 0 .../Contents.json | 0 .../Resouces/Constants/Color.swift | 90 ------------------- .../Extensions/UIColor+Extension.swift | 85 ++++++++++++++++++ 37 files changed, 89 insertions(+), 94 deletions(-) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{black.colorset => black1.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{black.colorset => black1.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{inputBlack.colorset => black2.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{inputBlack.colorset => black2.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{listSelectedBlack.colorset => black3.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{listSelectedBlack.colorset => black3.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{modalBackground.colorset => black4.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{modalBackground.colorset => black4.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{step.colorset => black5.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{step.colorset => black5.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{modalButton.colorset => black6.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{modalButton.colorset => black6.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{hint.colorset => gray1.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{hint.colorset => gray1.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group1.colorset => grp1.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group1.colorset => grp1.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group2.colorset => grp2.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group2.colorset => grp2.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group3.colorset => grp3.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group3.colorset => grp3.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group4.colorset => grp4.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{group4.colorset => grp4.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{delete.colorset => red1.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{delete.colorset => red1.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{errorText.colorset => red2.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{errorText.colorset => red2.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{errorBackground.colorset => red3.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{errorBackground.colorset => red3.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{white.colorset => white1.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{white.colorset => white1.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{unselectedOption.colorset => white2.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{unselectedOption.colorset => white2.colorset}/Contents.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{matchButton.colorset => white3.colorset}/Contents 2.json (100%) rename NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/{matchButton.colorset => white3.colorset}/Contents.json (100%) delete mode 100644 NADA-iOS-forRelease/Resouces/Constants/Color.swift create mode 100644 NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 703ed391..2d5d4a0f 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 39007F2C27080D8200E7143E /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39007F2B27080D8200E7143E /* UIViewController+Extension.swift */; }; 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 */; }; 39488E352706E17200BDC917 /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */; }; 394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 394F314B27081B3A00C83291 /* FrontViewController.swift */; }; @@ -21,6 +20,7 @@ 39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39523E5E2701AA9000536900 /* CardListDataModel.swift */; }; 3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3979709526FA0BE5003FB4F5 /* LoginViewController.swift */; }; 3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3979709726FA0BF0003FB4F5 /* Login.storyboard */; }; + 39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C1E88E270EC762006D2089 /* UIColor+Extension.swift */; }; 39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; @@ -57,7 +57,6 @@ 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 = ""; }; 39007F2B27080D8200E7143E /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = ""; }; 390515B72706CEBB00C5F7A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; - 390515B92706D29B00C5F7A5 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = ""; }; 3909242E26FA15E800236C51 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = ""; }; 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = ""; }; 394F314B27081B3A00C83291 /* FrontViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontViewController.swift; sourceTree = ""; }; @@ -69,6 +68,7 @@ 39523E5E2701AA9000536900 /* CardListDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListDataModel.swift; sourceTree = ""; }; 3979709526FA0BE5003FB4F5 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = ""; }; 3979709726FA0BF0003FB4F5 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = ""; }; + 39C1E88E270EC762006D2089 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = ""; }; 39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extension.swift"; sourceTree = ""; }; 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; @@ -384,7 +384,6 @@ F8FC43B726C0227D0033E151 /* Const.swift */, F8FC43B926C022900033E151 /* ViewController.swift */, F8FC43BB26C022A20033E151 /* Storyboard.swift */, - 390515B92706D29B00C5F7A5 /* Color.swift */, F8F5D0A9270800FD00D99D2E /* Xib.swift */, F822E7A82709CEB60020452C /* Notification.swift */, ); @@ -398,6 +397,7 @@ 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */, 39007F2B27080D8200E7143E /* UIViewController+Extension.swift */, 39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */, + 39C1E88E270EC762006D2089 /* UIColor+Extension.swift */, ); path = Extensions; sourceTree = ""; @@ -562,6 +562,7 @@ F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */, 3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */, 39488E352706E17200BDC917 /* UIAlertController+Extension.swift in Sources */, + 39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */, F8FC43AF26C0209A0033E151 /* TempModel.swift in Sources */, F8FC43B826C0227D0033E151 /* Const.swift in Sources */, 394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */, @@ -574,7 +575,6 @@ F8FC43BA26C022900033E151 /* ViewController.swift in Sources */, 39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */, F8FC43AD26C020940033E151 /* TempClass.swift in Sources */, - 390515BA2706D29B00C5F7A5 /* Color.swift in Sources */, F84BAFB126FDB552004CA335 /* BackCardCreationCollectionViewCell.swift in Sources */, F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */, F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/inputBlack.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/inputBlack.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/inputBlack.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/inputBlack.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/listSelectedBlack.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/listSelectedBlack.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/listSelectedBlack.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/listSelectedBlack.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalBackground.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalBackground.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalBackground.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalBackground.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/step.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/step.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/step.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/step.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalButton.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalButton.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalButton.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/modalButton.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/hint.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/hint.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/hint.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/hint.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group1.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group1.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group1.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group1.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group2.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group2.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group2.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group2.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group3.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group3.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group3.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group3.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group4.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group4.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group4.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/group4.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/delete.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/delete.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/delete.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/delete.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorText.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorText.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorText.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorText.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorBackground.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorBackground.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorBackground.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/errorBackground.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/unselectedOption.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/unselectedOption.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/unselectedOption.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/unselectedOption.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/matchButton.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents 2.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/matchButton.colorset/Contents 2.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents 2.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/matchButton.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/matchButton.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Constants/Color.swift b/NADA-iOS-forRelease/Resouces/Constants/Color.swift deleted file mode 100644 index 4533a308..00000000 --- a/NADA-iOS-forRelease/Resouces/Constants/Color.swift +++ /dev/null @@ -1,90 +0,0 @@ -// swiftlint:disable all -// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen - -#if os(macOS) - import AppKit -#elseif os(iOS) - import UIKit -#elseif os(tvOS) || os(watchOS) - import UIKit -#endif - -// Deprecated typealiases -@available(*, deprecated, renamed: "ColorAsset.Color", message: "This typealias will be removed in SwiftGen 7.0") -internal typealias AssetColorTypeAlias = ColorAsset.Color - -// swiftlint:disable superfluous_disable_command file_length implicit_return - -// MARK: - Asset Catalogs - -internal enum Colors { - internal static let black = ColorAsset(name: "black") - internal static let delete = ColorAsset(name: "delete") - internal static let errorBackground = ColorAsset(name: "errorBackground") - internal static let errorText = ColorAsset(name: "errorText") - internal static let group1 = ColorAsset(name: "group1") - internal static let group2 = ColorAsset(name: "group2") - internal static let group3 = ColorAsset(name: "group3") - internal static let group4 = ColorAsset(name: "group4") - internal static let hint = ColorAsset(name: "hint") - internal static let inputBlack = ColorAsset(name: "inputBlack") - internal static let listSelectedBlack = ColorAsset(name: "listSelectedBlack") - internal static let mainBlue = ColorAsset(name: "mainBlue") - internal static let matchButton = ColorAsset(name: "matchButton") - internal static let modalBackground = ColorAsset(name: "modalBackground") - internal static let modalButton = ColorAsset(name: "modalButton") - internal static let step = ColorAsset(name: "step") - internal static let unselectedOption = ColorAsset(name: "unselectedOption") - internal static let white = ColorAsset(name: "white") -} -// swiftlint:enable identifier_name line_length nesting type_body_length type_name - -// MARK: - Implementation Details - -internal final class ColorAsset { - internal fileprivate(set) var name: String - - #if os(macOS) - internal typealias Color = NSColor - #elseif os(iOS) || os(tvOS) || os(watchOS) - internal typealias Color = UIColor - #endif - - @available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, *) - internal private(set) lazy var color: Color = { - guard let color = Color(asset: self) else { - fatalError("Unable to load color asset named \(name).") - } - return color - }() - - fileprivate init(name: String) { - self.name = name - } -} - -internal extension ColorAsset.Color { - @available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, *) - convenience init?(asset: ColorAsset) { - let bundle = BundleToken.bundle - #if os(iOS) || os(tvOS) - self.init(named: asset.name, in: bundle, compatibleWith: nil) - #elseif os(macOS) - self.init(named: NSColor.Name(asset.name), bundle: bundle) - #elseif os(watchOS) - self.init(named: asset.name) - #endif - } -} - -// swiftlint:disable convenience_type -private final class BundleToken { - static let bundle: Bundle = { - #if SWIFT_PACKAGE - return Bundle.module - #else - return Bundle(for: BundleToken.self) - #endif - }() -} -// swiftlint:enable convenience_type diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift new file mode 100644 index 00000000..a28329ab --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift @@ -0,0 +1,85 @@ +// +// UIColor+Extension.swift +// NADA-iOS-forRelease +// +// Created by 민 on 2021/10/07. +// + +import Foundation +import UIKit + +extension UIColor { + + @nonobjc class var black1: UIColor { + return UIColor(white: 0.0, alpha: 1.0) + } + + @nonobjc class var inputBlack2: UIColor { + return UIColor(white: 27.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var deleteRed1: UIColor { + return UIColor(red: 1.0, green: 81.0 / 255.0, blue: 81.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var hintGray1: UIColor { + return UIColor(white: 108.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var errorTextRed2: UIColor { + return UIColor(red: 1.0, green: 59.0 / 255.0, blue: 48.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var errorbgRed3: UIColor { + return UIColor(red: 76.0 / 255.0, green: 18.0 / 255.0, blue: 14.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var white1: UIColor { + return UIColor(white: 1.0, alpha: 1.0) + } + + @nonobjc class var unSelecteDoptWhite2: UIColor { + return UIColor(white: 1.0, alpha: 0.41) + } + + @nonobjc class var matchBtnWhite3: UIColor { + return UIColor(white: 1.0, alpha: 0.3) + } + + @nonobjc class var mainBlue: UIColor { + return UIColor(red: 54.0 / 255.0, green: 116.0 / 255.0, blue: 1.0, alpha: 1.0) + } + + @nonobjc class var grp1: UIColor { + return UIColor(red: 1.0, green: 179.0 / 255.0, blue: 79.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var grp2: UIColor { + return UIColor(red: 158.0 / 255.0, green: 0.0, blue: 1.0, alpha: 1.0) + } + + @nonobjc class var grp3: UIColor { + return UIColor(red: 1.0, green: 97.0 / 255.0, blue: 97.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var grp4: UIColor { + return UIColor(red: 65.0 / 255.0, green: 195.0 / 255.0, blue: 98.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var listSelectedBlack3: UIColor { + return UIColor(white: 31.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var modalBgBlack4: UIColor { + return UIColor(white: 0.0, alpha: 0.5) + } + + @nonobjc class var stepBlack5: UIColor { + return UIColor(white: 14.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var btnModalBlack6: UIColor { + return UIColor(white: 40.0 / 255.0, alpha: 1.0) + } + +}