diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 0585ad6b..d6b81646 100644 --- 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 = ""; }; + 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 = ""; }; 39523E08270184A700536900 /* CardListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListViewController.swift; sourceTree = ""; }; 39523E0A270184B100536900 /* CardList.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardList.storyboard; sourceTree = ""; }; @@ -205,6 +209,7 @@ isa = PBXGroup; children = ( F8FC438E26C01CDE0033E151 /* Assets.xcassets */, + 390515B72706CEBB00C5F7A5 /* Colors.xcassets */, ); path = Assets; sourceTree = ""; @@ -355,6 +360,7 @@ F8FC43B726C0227D0033E151 /* Const.swift */, F8FC43B926C022900033E151 /* ViewController.swift */, F8FC43BB26C022A20033E151 /* Storyboard.swift */, + 390515B92706D29B00C5F7A5 /* Color.swift */, ); path = Constants; sourceTree = ""; @@ -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/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AccentColor.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/Contents.json similarity index 51% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AccentColor.colorset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/Contents.json index eb878970..73c00596 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/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 new file mode 100644 index 00000000..95a50e5d --- /dev/null +++ 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 new file mode 100644 index 00000000..d80faf6a --- /dev/null +++ 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 new file mode 100644 index 00000000..fed052af --- /dev/null +++ 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 new file mode 100644 index 00000000..f58a604a --- /dev/null +++ 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 new file mode 100644 index 00000000..b0724a13 --- /dev/null +++ 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 new file mode 100644 index 00000000..3d79929b --- /dev/null +++ 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 new file mode 100644 index 00000000..e5e6a39f --- /dev/null +++ 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 new file mode 100644 index 00000000..1b958771 --- /dev/null +++ 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 new file mode 100644 index 00000000..52ba7fc1 --- /dev/null +++ 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 new file mode 100644 index 00000000..1f50e6a8 --- /dev/null +++ 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 new file mode 100644 index 00000000..84b11664 --- /dev/null +++ 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 new file mode 100644 index 00000000..6b8b4651 --- /dev/null +++ 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 new file mode 100644 index 00000000..0967f4bd --- /dev/null +++ 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 new file mode 100644 index 00000000..d6e4aae0 --- /dev/null +++ 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 new file mode 100644 index 00000000..a2bf5e10 --- /dev/null +++ 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 new file mode 100644 index 00000000..ce238cf5 --- /dev/null +++ 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 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/unselectedOption.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/unselectedOption.colorset/Contents.json new file mode 100644 index 00000000..3e605134 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/unselectedOption.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "0.410", + "blue" : "255", + "green" : "255", + "red" : "255" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white.colorset/Contents.json new file mode 100644 index 00000000..97650a1a --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Constants/Color.swift b/NADA-iOS-forRelease/Resouces/Constants/Color.swift new file mode 100644 index 00000000..4533a308 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Constants/Color.swift @@ -0,0 +1,90 @@ +// 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/Sources/ViewControllers/CardList/CardListViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift index 9d9acae5..82d7a9d1 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift @@ -52,7 +52,6 @@ extension CardListViewController: UITableViewDelegate { func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? { let deleteAction = UIContextualAction(style: .normal, title: "삭제", handler: { (action, view, success) in }) - deleteAction.backgroundColor = .red let swipeActions = UISwipeActionsConfiguration(actions: [deleteAction]) @@ -77,27 +76,3 @@ extension CardListViewController: UITableViewDataSource { return serviceCell } } - -// 명함 삭제시 Alert창 구현 -extension CardListViewController { - func makeRequestAlert(title: String, - message: String, - cancelAction: ((UIAlertAction) -> Void)? = nil, - deleteAction: ((UIAlertAction) -> Void)?, - completion: (() -> Void)? = nil) { - let generator = UIImpactFeedbackGenerator(style: .medium) - generator.impactOccurred() - - let alertViewController = UIAlertController(title: title, message: message, preferredStyle: .alert) - - let cancelAction = UIAlertAction(title: "취소", style: .cancel, handler: cancelAction) - alertViewController.addAction(cancelAction) - - let deleteAction = UIAlertAction(title: "삭제", style: .default, handler: deleteAction) - alertViewController.addAction(deleteAction) - - alertViewController.view.subviews.first?.subviews.first?.subviews.first?.backgroundColor = UIColor(red: 30/255, green: 30/255, blue: 30/255, alpha: 75) - - self.present(alertViewController, animated: true, completion: completion) - } -}