From e3226db75475ac762cb953cdc1a6c299387539b9 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Thu, 25 Nov 2021 19:40:21 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE]=20#82=20-=20=EB=8B=A4=ED=81=AC=EB=AA=A8?= =?UTF-8?q?=EB=93=9C=20=EB=8C=80=EC=9D=91=20=EC=BB=AC=EB=9F=AC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../background.colorset/Contents.json | 6 +-- .../quaternary.colorset/Contents.json | 6 +-- .../secondary.colorset/Contents.json | 6 +-- .../tertiary.colorset/Contents.json | 6 +-- .../Extensions/UIColor+Extension.swift | 45 +++++++++---------- .../Resouces/Storyboards/CardList.storyboard | 7 +-- .../Storyboards/Main/Front.storyboard | 8 +--- .../Resouces/Storyboards/More/More.storyboard | 11 +++-- .../Resouces/Storyboards/TabBar.storyboard | 9 ++-- .../Sources/Cells/CardCell/BackCardCell.xib | 14 +++--- .../Cells/CardList/CardListTableViewCell.xib | 5 ++- .../Cells/MoreList/MoreListTableViewCell.xib | 4 ++ 12 files changed, 61 insertions(+), 66 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/background.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/background.colorset/Contents.json index 4d7ab39a..4c17d79f 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/background.colorset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/background.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "22", - "green" : "20", - "red" : "19" + "blue" : "0x16", + "green" : "0x14", + "red" : "0x13" } }, "idiom" : "universal" diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json index a290db51..94e0a763 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "118", - "green" : "108", - "red" : "102" + "blue" : "0x76", + "green" : "0x6C", + "red" : "0x66" } }, "idiom" : "universal" diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json index 0dc1dac8..e46bd787 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "245", - "green" : "243", - "red" : "241" + "blue" : "0xF5", + "green" : "0xF3", + "red" : "0xF1" } }, "idiom" : "universal" diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/tertiary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/tertiary.colorset/Contents.json index 0310beb6..0c66d4b6 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/tertiary.colorset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/tertiary.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "179", - "green" : "172", - "red" : "168" + "blue" : "0xB3", + "green" : "0xAC", + "red" : "0xA8" } }, "idiom" : "universal" diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift index de4653a8..aef44bc3 100644 --- a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift @@ -32,17 +32,17 @@ extension UIColor { } } - @nonobjc class var secondary: UIColor { + @nonobjc class var textBox: UIColor { if #available(iOS 13, *) { return UIColor { (traitCollection: UITraitCollection) -> UIColor in if traitCollection.userInterfaceStyle == .light { - return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0) - } else { return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0) + } else { + return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0) } } } else { - return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0) + return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0) } } @@ -60,20 +60,6 @@ extension UIColor { } } - @nonobjc class var textBox: UIColor { - if #available(iOS 13, *) { - return UIColor { (traitCollection: UITraitCollection) -> UIColor in - if traitCollection.userInterfaceStyle == .light { - return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0) - } else { - return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0) - } - } - } else { - return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0) - } - } - @nonobjc class var tertiary: UIColor { if #available(iOS 13, *) { return UIColor { (traitCollection: UITraitCollection) -> UIColor in @@ -88,17 +74,17 @@ extension UIColor { } } - @nonobjc class var background: UIColor { + @nonobjc class var secondary: UIColor { if #available(iOS 13, *) { return UIColor { (traitCollection: UITraitCollection) -> UIColor in if traitCollection.userInterfaceStyle == .light { - return UIColor(white: 1.0, alpha: 1.0) + return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0) } else { - return UIColor(red: 19.0 / 255.0, green: 20.0 / 255.0, blue: 22.0 / 255.0, alpha: 1.0) + return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0) } } } else { - return UIColor(white: 1.0, alpha: 1.0) + return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0) } } @@ -119,5 +105,18 @@ extension UIColor { @nonobjc class var stateColorError: UIColor { return UIColor(red: 243.0 / 255.0, green: 66.0 / 255.0, blue: 53.0 / 255.0, alpha: 1.0) } - + + @nonobjc class var background: UIColor { + if #available(iOS 13, *) { + return UIColor { (traitCollection: UITraitCollection) -> UIColor in + if traitCollection.userInterfaceStyle == .light { + return UIColor(white: 1.0, alpha: 1.0) + } else { + return UIColor(red: 19.0 / 255.0, green: 20.0 / 255.0, blue: 22.0 / 255.0, alpha: 1.0) + } + } + } else { + return UIColor(white: 1.0, alpha: 1.0) + } + } } diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard index 6b9beb61..1c3b335c 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard @@ -6,7 +6,6 @@ - @@ -45,7 +44,7 @@ - + @@ -55,6 +54,7 @@ + @@ -84,8 +84,5 @@ - - - diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard index 15054da3..a39780db 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard @@ -6,7 +6,6 @@ - @@ -53,7 +52,7 @@ - + @@ -68,7 +67,7 @@ - + @@ -129,8 +128,5 @@ - - - diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard index c1ee1795..3ce39232 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard @@ -6,7 +6,6 @@ - @@ -33,7 +32,7 @@ - + @@ -47,7 +46,7 @@ - + @@ -72,14 +71,14 @@ + + + - - - diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard index 03f5dbef..f238d7db 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard @@ -17,13 +17,11 @@ + - - - - + @@ -75,6 +73,9 @@ + + + diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib index 5fd673e3..7a47f13b 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib @@ -4,7 +4,6 @@ - @@ -42,13 +41,13 @@ @@ -110,19 +109,19 @@ @@ -205,8 +204,5 @@ - - - diff --git a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.xib index 222e3822..f8d33bb3 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.xib @@ -50,7 +50,7 @@ - + @@ -89,5 +89,8 @@ + + + diff --git a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib index 9d16cd9c..610cb9f1 100644 --- a/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/MoreList/MoreListTableViewCell.xib @@ -38,6 +38,7 @@ + @@ -59,6 +60,9 @@ + + +