Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CHORE] #34 - 컬러 익스텐션 추가 #35

Merged
merged 1 commit into from
Oct 7, 2021
Merged

[CHORE] #34 - 컬러 익스텐션 추가 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */; };
Expand Down Expand Up @@ -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 = "<group>"; };
39007F2B27080D8200E7143E /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; 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>"; };
39488E342706E17200BDC917 /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = "<group>"; };
394F314B27081B3A00C83291 /* FrontViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontViewController.swift; sourceTree = "<group>"; };
Expand All @@ -69,6 +68,7 @@
39523E5E2701AA9000536900 /* CardListDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListDataModel.swift; sourceTree = "<group>"; };
3979709526FA0BE5003FB4F5 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
3979709726FA0BF0003FB4F5 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
39C1E88E270EC762006D2089 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = "<group>"; };
39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extension.swift"; sourceTree = "<group>"; };
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 = "<group>"; };
Expand Down Expand Up @@ -384,7 +384,6 @@
F8FC43B726C0227D0033E151 /* Const.swift */,
F8FC43B926C022900033E151 /* ViewController.swift */,
F8FC43BB26C022A20033E151 /* Storyboard.swift */,
390515B92706D29B00C5F7A5 /* Color.swift */,
F8F5D0A9270800FD00D99D2E /* Xib.swift */,
F822E7A82709CEB60020452C /* Notification.swift */,
);
Expand All @@ -398,6 +397,7 @@
39488E342706E17200BDC917 /* UIAlertController+Extension.swift */,
39007F2B27080D8200E7143E /* UIViewController+Extension.swift */,
39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */,
39C1E88E270EC762006D2089 /* UIColor+Extension.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */,
Expand Down
0 ...s.xcassets/black.colorset/Contents 2.json → ....xcassets/black1.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...ors.xcassets/black.colorset/Contents.json → ...rs.xcassets/black1.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/inputBlack.colorset/Contents 2.json → ....xcassets/black2.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...cassets/inputBlack.colorset/Contents.json → ...rs.xcassets/black2.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...istSelectedBlack.colorset/Contents 2.json → ....xcassets/black3.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 .../listSelectedBlack.colorset/Contents.json → ...rs.xcassets/black3.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 .../modalBackground.colorset/Contents 2.json → ....xcassets/black4.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...ts/modalBackground.colorset/Contents.json → ...rs.xcassets/black4.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...rs.xcassets/step.colorset/Contents 2.json → ....xcassets/black5.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...lors.xcassets/step.colorset/Contents.json → ...rs.xcassets/black5.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...sets/modalButton.colorset/Contents 2.json → ....xcassets/black6.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...assets/modalButton.colorset/Contents.json → ...rs.xcassets/black6.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...rs.xcassets/hint.colorset/Contents 2.json → ...s.xcassets/gray1.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...lors.xcassets/hint.colorset/Contents.json → ...ors.xcassets/gray1.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ....xcassets/group1.colorset/Contents 2.json → ...rs.xcassets/grp1.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...rs.xcassets/group1.colorset/Contents.json → ...lors.xcassets/grp1.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ....xcassets/group2.colorset/Contents 2.json → ...rs.xcassets/grp2.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...rs.xcassets/group2.colorset/Contents.json → ...lors.xcassets/grp2.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ....xcassets/group3.colorset/Contents 2.json → ...rs.xcassets/grp3.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...rs.xcassets/group3.colorset/Contents.json → ...lors.xcassets/grp3.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ....xcassets/group4.colorset/Contents 2.json → ...rs.xcassets/grp4.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...rs.xcassets/group4.colorset/Contents.json → ...lors.xcassets/grp4.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ....xcassets/delete.colorset/Contents 2.json → ...rs.xcassets/red1.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...rs.xcassets/delete.colorset/Contents.json → ...lors.xcassets/red1.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...assets/errorText.colorset/Contents 2.json → ...rs.xcassets/red2.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...xcassets/errorText.colorset/Contents.json → ...lors.xcassets/red2.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 .../errorBackground.colorset/Contents 2.json → ...rs.xcassets/red3.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...ts/errorBackground.colorset/Contents.json → ...lors.xcassets/red3.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...s.xcassets/white.colorset/Contents 2.json → ....xcassets/white1.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...ors.xcassets/white.colorset/Contents.json → ...rs.xcassets/white1.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...unselectedOption.colorset/Contents 2.json → ....xcassets/white2.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...s/unselectedOption.colorset/Contents.json → ...rs.xcassets/white2.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...sets/matchButton.colorset/Contents 2.json → ....xcassets/white3.colorset/Contents 2.json
View file
Open in desktop
File renamed without changes.
0 ...assets/matchButton.colorset/Contents.json → ...rs.xcassets/white3.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
90 changes: 0 additions & 90 deletions NADA-iOS-forRelease/Resouces/Constants/Color.swift
View file
Open in desktop

This file was deleted.

85 changes: 85 additions & 0 deletions NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
}

}