From 9fd3a46f938fe66a100e287f90237b0bdae522c1 Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 13:08:16 +0900 Subject: [PATCH 01/11] =?UTF-8?q?[Add]=20SocialLoginButton=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 125 ++++++++++++++++++ CDSKit/Source/Foundation/CDSBaseColor.swift | 14 ++ CDSKit/Source/Foundation/CDSIcon.swift | 3 + .../icApple.imageset/Contents.json | 23 ++++ .../icApple.imageset/ic_Apple.png | Bin 0 -> 445 bytes .../icApple.imageset/ic_Apple@2x.png | Bin 0 -> 777 bytes .../icApple.imageset/ic_Apple@3x.png | Bin 0 -> 1078 bytes .../icKakao.imageset/Contents.json | 23 ++++ .../icKakao.imageset/ic_Kakao.png | Bin 0 -> 288 bytes .../icKakao.imageset/ic_Kakao@2x.png | Bin 0 -> 444 bytes .../icKakao.imageset/ic_Kakao@3x.png | Bin 0 -> 681 bytes .../icNaver.imageset/Contents.json | 23 ++++ .../icNaver.imageset/ic_Naver.png | Bin 0 -> 258 bytes .../icNaver.imageset/ic_Naver@2x.png | Bin 0 -> 434 bytes .../icNaver.imageset/ic_Naver@3x.png | Bin 0 -> 454 bytes 15 files changed, 211 insertions(+) create mode 100644 CDSKit/Source/Button/CDSSocialButton.swift create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/Contents.json create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/ic_Apple.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/ic_Apple@2x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/ic_Apple@3x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/Contents.json create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/ic_Kakao.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/ic_Kakao@2x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/ic_Kakao@3x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/Contents.json create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/ic_Naver.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/ic_Naver@2x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/ic_Naver@3x.png diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift new file mode 100644 index 0000000..e4fa367 --- /dev/null +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -0,0 +1,125 @@ +// +// CDSSocialButton.swift +// +// +// Created by SHIN YOON AH on 2021/12/25. +// + +#if !os(macOS) + import UIKit + import SnapKit + +/** + - Description: + + CDS 소셜 로그인 버튼입니다. + +*/ + +public class CDSSocialButton: UIButton { + + // MARK: - Enum + + public enum SocialType { + case kakao + case naver + case apple + + fileprivate var text: String { + switch self { + case .kakao, + return "카카오 로그인" + case .naver: + return "네이버 로그인" + case .apple: + return "Apple로 로그인" + } + } + + fileprivate var background: UIColor { + switch self { + case .kakao, + return CDSBaseColor.kakaoBackground + case .naver: + return CDSBaseColor.naverBackground + case .apple: + return CDSBaseColor.white + } + } + + fileprivate var foreground: UIColor { + switch self { + case .kakao, + .apple: + return .black + case .naver: + return .white + } + } + + fileprivate var icon: UIImage { + switch self { + case .kakao, + return CDSIcon.icKakao + case .naver: + return CDSIcon.icNaver + case .apple: + return CDSIcon.icApple + } + } + } + + // MARK: - Private Properties + + private var type: SocialType = .kakao + + private var font: UIFont = CDSFont.body3 + + private var width: CGFloat = 335 + + private var height: CGFloat = 50 + + private var rounding: CGFloat = 12 + + private var hoverColor: UIColor = CDSBaseColor.socialHover + + // MARK: - Initalizing + + public init(type: SocialType) { + super.init(frame: .zero) + + self.type = type + + setButtonConfiguration() + setSize() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: - Setting Method + + private func setButtonConfiguration() { + setImage(type.icon, for: .normal) + + setTitle(type.text, for: .normal) + setTitleColor(type.foreground, for: .normal) + setTitleColor(hoverColor, for: .highlighted) + + backgroundColor = type.background + + self.layer.cornerRadius = rounding + + self.titleLabel?.font = font + } + + private func setSize() { + self.snp.makeConstraints { + $0.height.equalTo(height) + $0.width.equalTo(width) + } + } + +} +#endif diff --git a/CDSKit/Source/Foundation/CDSBaseColor.swift b/CDSKit/Source/Foundation/CDSBaseColor.swift index 9c6fb3f..e4b7017 100644 --- a/CDSKit/Source/Foundation/CDSBaseColor.swift +++ b/CDSKit/Source/Foundation/CDSBaseColor.swift @@ -101,6 +101,14 @@ public enum CDSBaseColor { return UIColor(hex: "#000000", alpha: 0.8) } + public static var kakaoBackground: UIColor { + return UIColor(hex: "#FEE500") + } + + public static var naverBackground: UIColor { + return UIColor(hex: "#03C75A") + } + // MARK: - Catchu-back Colors public static var catchu100: UIColor { @@ -136,6 +144,7 @@ public enum CDSBaseColor { } // MARK: - Check Colors + public static var red100: UIColor { return UIColor(hex: "#EA4545") } @@ -145,6 +154,7 @@ public enum CDSBaseColor { } // MARK: - Hover Colors + public static var hover100: UIColor { return UIColor(hex: "#FCFCFC", alpha: 0.35) } @@ -156,5 +166,9 @@ public enum CDSBaseColor { public static var hover200: UIColor { return UIColor(hex: "#928D60") } + + public static var socialHover: UIColor { + return UIColor(hex: "#57886D") + } } #endif diff --git a/CDSKit/Source/Foundation/CDSIcon.swift b/CDSKit/Source/Foundation/CDSIcon.swift index 1008a5e..1aef357 100644 --- a/CDSKit/Source/Foundation/CDSIcon.swift +++ b/CDSKit/Source/Foundation/CDSIcon.swift @@ -107,6 +107,9 @@ public enum CDSIcon { public static var icWarning: UIImage { .load(name: "icWarning") } public static var icLock2Fill: UIImage { .load(name: "systemsLock2Fill") } public static var icUser3Fill: UIImage { .load(name: "usersUser3Fill") } + public static var icKakao: UIImage { .load(name: "icKakao") } + public static var icNaver: UIImage { .load(name: "icNaver") } + public static var icApple: UIImage { .load(name: "icApple") } // MARK: - Image diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/Contents.json b/CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/Contents.json new file mode 100644 index 0000000..9c1eb38 --- /dev/null +++ b/CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ic_Apple.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_Apple@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_Apple@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/ic_Apple.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/ic_Apple.png new file mode 100644 index 0000000000000000000000000000000000000000..cab9558e54792f39dae22e51c6bbbb2ca873db05 GIT binary patch literal 445 zcmV;u0Yd(XP) z%21&0Cs{h#{?B*kJHZ-+Vc2gp>i6}!-p#UXQaua)6L&hDfk^NKsJ>Ea3Lm1v)OF+uyhbb z(GajVE^4e#8CA`_Oz{|=SZm*@O#)W<8vevuH%19@MLdNkMPYB9*xAm3Pu?X#5F|^R zD}g7>zgKk-!xN=2WRGpJh!CyyKKG8`M>o&Sp0#*Y?RMC=*7f>Eyv-Y_Sq=-lQRn3> z3gt)6}bUs$1?2L5l&DzLBkD_6O^8S+<@L7?v7oP6C~_lMfzUagv7S^ zvXkH#yK$dw@!#`{BWpCH(TwIxL>0qvoURbfkr2+WC&01(4XOx2m@bC9z-xzy6_%^S zfLOUX!fSHIvpH}~wzL7ZZMTVdTDgK(M4nSgaLz6=lv5CdgCg>!JRpRC>t#3H&KM0= ztJSQ?7^OTQWw!Fg;=WG>Q8otJiFX8?g!1KQdIWL}P&o`Yx}5V4X7xf!`i|zYWm(=X zx)}>SI8hRX*QRM-sdgo|Uavd&?C#_kW78lAuCtbfWhur0=Me5uMsUTD9uyDJZ?f5J z#wrsGBg+3XJZ`=m4OMU^4LLAC4TPv3!QwX6hj|#v!EzZdm623#82kpxpHaQAq2q0% z(YW<}{~O;aS2L%4*Hw*~VaTz1iGmO_@6%yK*Qy+G@MaeWZ0q_d>A@VzUnPT(V?Da0 z3COI=bSfgv=^bf;?}x*58^=b`COsHuZA850oKHYza)Z+4xUhOjx0GYRQPxrg;OUoH z?T7)X#Q>n4MN;7bHYQC#@#@jP2GE2w0sFvtOkfiRaIR{)Hed=}_d&%u-q=|fbO_d8(_ z$d9BItgmXro|1tc%}-9Or=%qoq<43B|0yyf*&H+C-#2xW(j+N4C`O9cGv>diTGNvC zl4aRQf8K1uAC_hOM90dRk~+4*^_K^2d7V#Boo*P?7kc<`GWlD~q^fpq-ts;6%oss! znYd~hs_Pa!(s7#8R?F!>boC;H{b74WBV)PdsMWGNdHw$YY&rZ#FQT!|00000NkvXX Hu0mjfXlG+> literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/ic_Apple@3x.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icApple.imageset/ic_Apple@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..5ef6c8219a502f0ad1092feb3a8343c429c5f30d GIT binary patch literal 1078 zcmV-61j+k}P)Hn3WaL9T)HWhim!a66y#_Fl*{GgAn?zH5EVYh zkKho0B_HQSGmVdKF~ zelUc5f$|n#@0iCZ?z zGn_!JKbIyH$bj$>LnX$%kgjWYI8;b+*rP??hYFNRrE?s1No`;@;;hwj>d}SJg!-A1 z_DX7F$F1JsN(|vINO{C*-0B^^0aOJ3;;>EXk{EJpT-qSDg(q3at?9b1*kUyfR`q*X zx`{d9e<6iINOC7@hXO)r^Wk_(*3Mo?Y2P0OgGsEVtg;MI%#(!j3h*K;Yi9+d8g3e7 ze9}3p!A&Wx0Ft1ptX)H7r?djd;0~niK|oSBwRuGK)2A?6h=on)L&_VgBnZTLQk!m? zW(UU~q%?vH0&l%u@Ap&-e`FvU4H3exwOZr#qHrC+Jh-O}fTGs}%JrwC*L40cO`TJ< zW6A*Vn%@i~j|@_Ofl1k+32`0Bb-SEWDsM&;)I$^M#~Wg1Nl-*OICebM8{+Q9H^%&|+_bA7~+l9C@(VU9gW( zcv)$2?mv6Xx&6c&*;q&X=49L+F&K07*qoM6N<$f-vCjtpET3 literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/Contents.json b/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/Contents.json new file mode 100644 index 0000000..ed9529a --- /dev/null +++ b/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ic_Kakao.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_Kakao@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_Kakao@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/ic_Kakao.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/ic_Kakao.png new file mode 100644 index 0000000000000000000000000000000000000000..ad44b1f9718d3a8a8f0d544dbee16d0302a59918 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy}!3HFwFZ>e#Qk(@Ik;M!Q+`=Ht$S`Y;1W=H% zILO_JVcj{Imp~3nx}&cn1H;CC?mvmFK>k)w7srqa#x!d(!gz&_a<*OqU}zO_i=x|8L*&!s3QQ zfBk8veE##!KNkw@KJIOsc>DUdOCBr2k7T737%MqCrPX{+RElu@Jb91ndSjV*T`>U{ gc2*su^q4;Rx|Fr$+e%NG0X@Lr>FVdQ&MBb@0Qq=mIsgCw literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/ic_Kakao@2x.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakao.imageset/ic_Kakao@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e7c38840058844ee9b6d01dec70ad895918577ed GIT binary patch literal 444 zcmV;t0YmebU^b{5zzA+oHn2`mH*f@W0(FA0fjB|UXTupOVvZ#AeePbkqQyYz{bom?*SO6Cw3iqD7@`_Zh^J zh)O%n0&;%qHwdI$P;8izS?*s+MIa}UQDU^+hD7k_Tnb-qMSApV6%vo^ ziI5iGir^N!+=!q8FM5SjziC;691-lmODBRYcxgrO1-yK(z%}>=={~wQHH31;FJ(n2 zSYkj!B-daB1&&r5Ow4YVmYkHkv}BN+FZr~fT!Wd5mI`^RDT~rOM52)X3m35(ga3{g zV)kQvsRO*(A%v@ddo-q>^ugvDzu%$GC&3uo ziY!at%o$BG9?v~=bqx2|4U3@c+O+{$X1ZZME- z`J_yNv?rQmF*jllH@k3^9<_F<$u7`!;BE9u4bzH#X7;m8S9Whjzs78pWK0jfGJNVl zkfwEBW;S*xNRyKB9DQbZ>R_;@G+8wpI~u6TEbkNzCyobfLRVsRi{;GhJ7W6RHV$pB zEf9<09l}6*^KUV%2#2A#mSyCCFnAKfDdCWA6BuIH>DsSh=Ajv$iQzHf@F0fo2m_g% z$Du7P|K>ju`m+gWDk>)Kd0=f>|n%SI~evN54Puim; z3ipfjlGRpc!>h=`WCWxRO3WU!p)!?AHv+_{d}AXl5CbUz7|j`C->6JTt&RSq8MW_F zG(^fz*DRL2XBa3)H8uRN#8AwW#E z(J3As(p^w5tG%aesp(Z#b0PxCYR>BN(#xzCDPHgQHmgM>qX`CgCAN73=CO3EvTL|4 P00000NkvXXu0mjf3=AUt literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/Contents.json b/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/Contents.json new file mode 100644 index 0000000..8dcad14 --- /dev/null +++ b/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ic_Naver.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_Naver@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_Naver@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/ic_Naver.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/ic_Naver.png new file mode 100644 index 0000000000000000000000000000000000000000..5dccc5134807f856134f2c20561459998057faac GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oVGw3ym^DWND9BhG zR}H`6EwpQO)ZFF z4R7oaz0nxac%$J)XW0VL6`K`=uB|ZSZ#(;bqUyn-B`vJaC;7~ssVwue=y9|3qRC$; z6*Vy!ib*mq`tWS+e}O=cnMcCstohizGFD0EzM}vARa-AUw{DR)j{1CKd8kA(+cX*R zId*(co0eAV|#J BUD*Ht literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/ic_Naver@2x.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaver.imageset/ic_Naver@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d4bebae62ac8485d8d78e80e6a7e13fc95632794 GIT binary patch literal 434 zcmV;j0ZsmiP)1YF$zQTvSXj1v# z!-+XVc}Yw6fvGxsXge0^)<1`X=5xrPpL93qq)F0UI86mKppEDWsD0Fa+Rk5^=4ox} zqqk_JJ42Bg_6zLNMsGm57HNIAMS2fOdtshr=zmoO;`B}WY*=dSrL`+XnJg*+^BODiuSfPC?qQC{MxB5P(()5@d)%NAS>!Q-J^i4s57@yT|o>( z)EU$fV2OGJju65Ub!L8?I5Tz8CsOS}Kq>D>b^kD0ZHc}DD{Pjy)w}#)Ric46u>$2r%CI)(C`1i%t<(LJZ{|HQAGGI|yN3_#@iy*N>rz+NpX@Wf7o` zP?J4F6amGoA0dbUU37}T56DQ`lgVCe`v(zO%?nPgm#F(FZE8tHgT>`3@`lffK*gts wla4@%D5JPkooKqal!;D^2u`h1(M)l90Q=&_rI45Xx&QzG07*qoM6N<$f==1FRsaA1 literal 0 HcmV?d00001 From 2bc0708223354685e8e9cdda45fb8fd602200a5f Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 13:45:46 +0900 Subject: [PATCH 02/11] =?UTF-8?q?[Fix]=20case=20:=20=EC=88=98=EC=A0=95(#14?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index e4fa367..94f9cf5 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -27,7 +27,7 @@ public class CDSSocialButton: UIButton { fileprivate var text: String { switch self { - case .kakao, + case .kakao: return "카카오 로그인" case .naver: return "네이버 로그인" @@ -38,7 +38,7 @@ public class CDSSocialButton: UIButton { fileprivate var background: UIColor { switch self { - case .kakao, + case .kakao: return CDSBaseColor.kakaoBackground case .naver: return CDSBaseColor.naverBackground @@ -59,7 +59,7 @@ public class CDSSocialButton: UIButton { fileprivate var icon: UIImage { switch self { - case .kakao, + case .kakao: return CDSIcon.icKakao case .naver: return CDSIcon.icNaver From cf53379a7c182b4a22874737d7d0e5d5c92af4e0 Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 13:48:52 +0900 Subject: [PATCH 03/11] =?UTF-8?q?[Add]=20ContentInset=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index 94f9cf5..75c0fae 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -112,6 +112,8 @@ public class CDSSocialButton: UIButton { self.layer.cornerRadius = rounding self.titleLabel?.font = font + + self.titleEdgeInsets = UIEdgeInsets(top: 0, left: 9, bottom: 0, right: 0) } private func setSize() { From f99645188aece9323f4dceb0766e0a60885d8112 Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 13:51:11 +0900 Subject: [PATCH 04/11] =?UTF-8?q?[Chore]=20Inset=20=EB=B3=80=EA=B2=BD(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index 75c0fae..49f2d92 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -113,7 +113,7 @@ public class CDSSocialButton: UIButton { self.titleLabel?.font = font - self.titleEdgeInsets = UIEdgeInsets(top: 0, left: 9, bottom: 0, right: 0) + self.titleEdgeInsets = UIEdgeInsets(top: 0, left: 12, bottom: 0, right: 0) } private func setSize() { From 0a888a8f6d965c8a4834364621eaa1fd4f9cedde Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 13:52:28 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[Chore]=20Inset=2018=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index 49f2d92..a2f3fa7 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -113,7 +113,7 @@ public class CDSSocialButton: UIButton { self.titleLabel?.font = font - self.titleEdgeInsets = UIEdgeInsets(top: 0, left: 12, bottom: 0, right: 0) + self.titleEdgeInsets = UIEdgeInsets(top: 0, left: 18, bottom: 0, right: 0) } private func setSize() { From 7132d93c7b79425e54d76fca8716721f7f175d92 Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 13:59:27 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[Add]=20HoverIcon=20=EC=B6=94=EA=B0=80(#1?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 12 +++++++++ CDSKit/Source/Foundation/CDSIcon.swift | 4 +++ .../icAppleHover.imageset/Contents.json | 23 ++++++++++++++++++ .../icAppleHover.imageset/icAppleHover.png | Bin 0 -> 425 bytes .../icAppleHover.imageset/icAppleHover@2x.png | Bin 0 -> 755 bytes .../icAppleHover.imageset/icAppleHover@3x.png | Bin 0 -> 1007 bytes .../icKakaoHover.imageset/Contents.json | 23 ++++++++++++++++++ .../icKakaoHover.imageset/icKakaoHover.png | Bin 0 -> 427 bytes .../icKakaoHover.imageset/icKakaoHover@2x.png | Bin 0 -> 733 bytes .../icKakaoHover.imageset/icKakaoHover@3x.png | Bin 0 -> 1045 bytes .../icNaverHover.imageset/Contents.json | 23 ++++++++++++++++++ .../icNaverHover.imageset/icNaverHover.png | Bin 0 -> 314 bytes .../icNaverHover.imageset/icNaverHover@2x.png | Bin 0 -> 484 bytes .../icNaverHover.imageset/icNaverHover@3x.png | Bin 0 -> 537 bytes 14 files changed, 85 insertions(+) create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/Contents.json create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover@2x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover@3x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakaoHover.imageset/Contents.json create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakaoHover.imageset/icKakaoHover.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakaoHover.imageset/icKakaoHover@2x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icKakaoHover.imageset/icKakaoHover@3x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/Contents.json create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/icNaverHover.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/icNaverHover@2x.png create mode 100644 CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/icNaverHover@3x.png diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index a2f3fa7..2e81905 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -67,6 +67,17 @@ public class CDSSocialButton: UIButton { return CDSIcon.icApple } } + + fileprivate var hoverIcon: UIImage { + switch self { + case .kakao: + return CDSIcon.icKakaoHover + case .naver: + return CDSIcon.icNaverHover + case .apple: + return CDSIcon.icAppleHover + } + } } // MARK: - Private Properties @@ -102,6 +113,7 @@ public class CDSSocialButton: UIButton { private func setButtonConfiguration() { setImage(type.icon, for: .normal) + setImage(type.hoverIcon, for: .highlighted) setTitle(type.text, for: .normal) setTitleColor(type.foreground, for: .normal) diff --git a/CDSKit/Source/Foundation/CDSIcon.swift b/CDSKit/Source/Foundation/CDSIcon.swift index 1aef357..95bbb82 100644 --- a/CDSKit/Source/Foundation/CDSIcon.swift +++ b/CDSKit/Source/Foundation/CDSIcon.swift @@ -110,6 +110,10 @@ public enum CDSIcon { public static var icKakao: UIImage { .load(name: "icKakao") } public static var icNaver: UIImage { .load(name: "icNaver") } public static var icApple: UIImage { .load(name: "icApple") } + public static var icKakaoHover: UIImage { .load(name: "icKakaoHover") } + public static var icNaverHover: UIImage { .load(name: "icNaverHover") } + public static var icAppleHover: UIImage { .load(name: "icAppleHover") } + // MARK: - Image diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/Contents.json b/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/Contents.json new file mode 100644 index 0000000..0311eaa --- /dev/null +++ b/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "icAppleHover.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icAppleHover@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icAppleHover@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover.png new file mode 100644 index 0000000000000000000000000000000000000000..46b04786bd548cab9ee5ee2642f3636a7d3ca6b4 GIT binary patch literal 425 zcmV;a0apHrP)^?_j!E zG7Q7X>7BC~n5H>Bl99#yuRDCC=0fcm=8bZ2zUuq_8+AKMNeFN33xeQd2!J{tad8QU z!!C!c>w0dIGL%*zGfjM9Rl>5Y1=9zqCqP9_yl0v~#&1L>TWHp;fPPg+TOeAc$){Iv z2RqO69S){U53*^RTZsQq23w{N`ZMp?C)C6>y8;mQ5ad%meo+)^SePbI`jeUkeADEL zW~%S30{Ff!vAt@L_YhV0hiQzWXo)Ssl80>8ZQDNJ&1niLLmF#r{RZT_gDCq2b=H9? TG~4N+00000NkvXXu0mjfg%Gjh literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover@2x.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b04145a87eaee94b3960e593bbd7fd82c699c17f GIT binary patch literal 755 zcmVM z+E5T(iRY&~h+IKP2TBDdpTIB<6+k+G3W6)(F+4u)4lGv?QGt~T;(YSXIU0!|<%%dH zbaQ4HNvpfs-Mde&Ay>w9I;|H9h3@fqtZld3+fJwRc4>W4u7vq~Uc==pem0*C!$`%K zZdD55u=p85Z_dbGtJS*w8?PxDF&d35g>b@2!=Kp&<#L(Z9v3dAX%5oxXW9W+PrujW z^uysWXfzsLice%ypja#_g}2-7zNADZ7r^gUc#k+>x>5L0{sD;!V0&+1A-C9uKi|Q! z@5pa=yq8JJfEY~6&@Ze&XH@*U}yf67~dqg;b^CM!%<5n*u?p7L@{809XH1(aj{ya=?2PkwK_S0gHVm zPNWN5(F9~cFHSSjE?1%nsDRyIdj3t5l*8kdKo>l+`i2C*8_s64AG*3=01xu|=!O$N z4Uq{G(F>09~_08E}rCwU?@55c0_?--v5+me}Jodk%=h2fO9@4R>=YU+ZJwph{W>& zo^(LlQBr}TAMtL5kNUfXwd{5*vsRLD)qlo|2NcWY(n7A1=`K)&fjU8~43mytkj|f> l+&$LYfh%2HDcn)5{{^7UBMgnORCE9U002ovPDHLkV1g{=ONIad literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover@3x.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icAppleHover.imageset/icAppleHover@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..eb71498965ef9116345bf4edc2980cae3501f293 GIT binary patch literal 1007 zcmV`05kkOhE#x4!EqJD9US+{Z@%?N3>aHB zCK&mf@d#TUYd`I3wYwriXGFK#H4Vdf%w#g=dcC$wrBam+M3&Bge!u^OrhzNR_Yj`q zB2fbEb~|@Ngz#e$v+f1V=nut!K?xvCcm@c3Pz)qOAWV2(zz+`( z4#mL931GoKlR|h`2*a=_CX&!VEu`Nn7K|mF^8Xd zzK1Yu!&8+o!c-<`KNgEct6Hs2Ro?{Z>2kT8mdjvFr81*7{XQW?cS~iE-x>eq&eW4Yw$pO8>Ug5x)__)+gb^9L`qC%~Jms^1V9leR#Fpj@N82DB!C2{u*z+G_w4tc((P4Jh4|1~55V z282}~*3l+ZY&53Fs|kq9K<*508mP1b{h>O|eI zLz&dGy0{{IW)gf7S_rC6L_MXXsgr_QOCtRb!4>E&r2XM%8z9WZ=l=~!j$x9D$}<=mHqVxx$y42`Mwq52cY zU)oI={yB0gngi!!2aQsVZ&dPXd2Fp0y`gckk!!p1YWEBlw{@-F+^LR5}ju$4S(~Zewnh zLVb0UJ)Dcbe~ZMmA^cLt^s}c47r{R`QJrCTC@wyLzj~z?H+j$0)VI}$uL?ChmjGt) zSDD0M3Qxt_Gt~z81y7|ErrKCsz*Ef(hHfVra3@ioC2PwXv3->6xm8Rz_u-qAI(Cn| zPb-eLaPHVhTpZ)}hh$&c^E_xYS{Bu>Xkjn`T6zCoMJ+`um-VQscyw@@#p;~{)PqA) zRglZzL=Uz)nIIF{+*$gOm|F%XDm=KytQGkWdfT!lt(GZ+{@ZSH`q-S+Hw!l|KYPv< zE?~@U15?8(tyWkIl)9T?)%^#X-^a|MXswGGFzj@baoP83t0u_Z3<}^FKLZvVFIiWH z`Ir(5S!5jhYq+1{AI6C;3YRvT8zEpB5 zUd0Qy4bEzonP`m|da4R7NVsO+woC`@ZgPwrs}PVDYw|I6v39gskUv$|dW-Y!>uonH P00000NkvXXu0mjfMhQoG literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakaoHover.imageset/icKakaoHover@3x.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icKakaoHover.imageset/icKakaoHover@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..3bd80b6b25821f4f53309f6532a400f8f7f574f3 GIT binary patch literal 1045 zcmV+w1nT>VP)Y~f+q+| z7tFM;8;HYyW*lVx{HiDhXei#i{`%|wx&;1uLLAhYzp;9O-paj7O5vuzfpsfU2 zP-qLFB?R1#haV`wt<{`1Vn!e)>Tm3d6xf8s8by^61H2I~d|dkqm$hA|ff)EF!E~}z zP}ri2FZr^F#nR%V;Yl3Q`4%D)Nw9HKVxM2GU^zHZg@+QX9hE-LmMCZ-oXoCB$XtUrsq-gp5snx zFtJO2INsi(*ej$*tY*cs@U8yV-kj86tiz}L0=vis(u?vGo!)UShd&q*tYcOWPFQ?i zT{O4s-s{8Ndq8kcY}&f~%pu=+~@01}d`PXG5xaV#O*`>rZyP+?PV6IoUkZpvgRMlMcM&>56kK%}ZUs7xZ zIl=0{)?Io7`9Ls$AILE^rp%)2Yf_2)2xft>q`P$5=geU!&Ry}y3R-aNwciBOmK?is zBbb9$ODYz+ksp5PwB#ZmC~CcyUICZL2`u|Gq%Lc6@z6lVVf?zf++)&`@bMYhMnQ^q z`oaiiw|0=>^u!+As=hk=q_2%&UF7nBLu3=hIpsnB#X!~a19cR7& zdSGhlOKc-UU7KCG>05Xnd~ZOo9Bdx~tJd__q^n`7LsZlVh96G^b_m?MS@M~md5y`dx>6*!OM z>}6Dk*XC`ix>MEmthm>stf{^zw3P+d@8EjcX`HBpj^QwyZ)WtgaL{+goU;8rl+*8_ zy@*q@lL+nbJezMOC;HePj!Vw_Z+MjqA8?+(e1t%D6WtxtcUWIjoNj zW6Zod>8=I|<*+&N9w05Q1_|Xb8{eg)G`Siil*3H^Md)drWhx1&+_Crr>*I@af`#3O P00000NkvXXu0mjf>0R}D literal 0 HcmV?d00001 diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/Contents.json b/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/Contents.json new file mode 100644 index 0000000..ab33525 --- /dev/null +++ b/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "icNaverHover.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icNaverHover@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icNaverHover@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/icNaverHover.png b/CDSKit/Source/Foundation/CDSIcon.xcassets/icNaverHover.imageset/icNaverHover.png new file mode 100644 index 0000000000000000000000000000000000000000..98ce2ed82d9f8c14e44e6311a8165286fd086b8f GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa&H|6fVg?3oVGw3ym^DWND9BhG z4?RnLT=Z=49Kk@X< zZ|(4w;G~P}ohOx7ch0dr*OKDasWSKcj=8D^eC{f@PL%q)EVRD*w9<-ES%rI%6E=3 z$7Jc#7d5*!uqL9BYZaPqnOGEw9DyTv1dc$c!S2|DF(uQ} zJzqk!RbMS{=e=Dze;hajLe8DeM$;t(bSC|bh{gz{1_6$!XlKI)5+V|1nukZ_GZG>d z^;~ow`fVg4Mif+|qC2^4A^}mNOvBNBfds^gdRm>Q!4Sr1i1KlTv2_GgM43i~gHITu zB?=;U;tz8ep(g6_jnkdZ0(ib?kz>{68#2`LB zRBJ6uQNFEcYqgfGDD+y(Tog*fMJl>N7}3K;_A27sJO3<0u8EC+_^&5d@A1z%;F74} zA{L#E@|CNq`;cq=aN#|01p!eH)BNr=M_>dPQ3*sp^@0e9h!)*MfLss8sGOto+v$SO zf)^N~cHsYf?_~%-Uw1}Lbdlw2{w8G>0o4lq`*3Cx0rjr8ih#PPk3hXvo Date: Sat, 25 Dec 2021 14:02:23 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[Chore]=20Hover=20=EC=BB=AC=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 2 +- CDSKit/Source/Foundation/CDSBaseColor.swift | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index 2e81905..6c7cb58 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -117,7 +117,7 @@ public class CDSSocialButton: UIButton { setTitle(type.text, for: .normal) setTitleColor(type.foreground, for: .normal) - setTitleColor(hoverColor, for: .highlighted) + setTitleColor(type.foreground.withAlphaComponent(0.5), for: .highlighted) backgroundColor = type.background diff --git a/CDSKit/Source/Foundation/CDSBaseColor.swift b/CDSKit/Source/Foundation/CDSBaseColor.swift index e4b7017..ea60a6c 100644 --- a/CDSKit/Source/Foundation/CDSBaseColor.swift +++ b/CDSKit/Source/Foundation/CDSBaseColor.swift @@ -166,9 +166,5 @@ public enum CDSBaseColor { public static var hover200: UIColor { return UIColor(hex: "#928D60") } - - public static var socialHover: UIColor { - return UIColor(hex: "#57886D") - } } #endif From 1f35e94401ca858c1ca5c8651e2a1d0365fe183b Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 14:03:18 +0900 Subject: [PATCH 08/11] =?UTF-8?q?[Del]=20Hover=20=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index 6c7cb58..d0147c5 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -91,8 +91,6 @@ public class CDSSocialButton: UIButton { private var height: CGFloat = 50 private var rounding: CGFloat = 12 - - private var hoverColor: UIColor = CDSBaseColor.socialHover // MARK: - Initalizing From b75e98570d3f75edd9b0e67f76c465d8f9700dc1 Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 14:13:50 +0900 Subject: [PATCH 09/11] =?UTF-8?q?[Chore]=20Hover=20=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index d0147c5..0ae64c3 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -115,7 +115,7 @@ public class CDSSocialButton: UIButton { setTitle(type.text, for: .normal) setTitleColor(type.foreground, for: .normal) - setTitleColor(type.foreground.withAlphaComponent(0.5), for: .highlighted) + setTitleColor(type.foreground.withAlphaComponent(0.7), for: .highlighted) backgroundColor = type.background From 9c3a45e515cbb9cdb6f88de59976137f43fe5392 Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 14:15:19 +0900 Subject: [PATCH 10/11] =?UTF-8?q?[Chore]=20Hover=20=EA=B0=92=200.5?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Button/CDSSocialButton.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CDSKit/Source/Button/CDSSocialButton.swift b/CDSKit/Source/Button/CDSSocialButton.swift index 0ae64c3..d0147c5 100644 --- a/CDSKit/Source/Button/CDSSocialButton.swift +++ b/CDSKit/Source/Button/CDSSocialButton.swift @@ -115,7 +115,7 @@ public class CDSSocialButton: UIButton { setTitle(type.text, for: .normal) setTitleColor(type.foreground, for: .normal) - setTitleColor(type.foreground.withAlphaComponent(0.7), for: .highlighted) + setTitleColor(type.foreground.withAlphaComponent(0.5), for: .highlighted) backgroundColor = type.background From 4374f6496498f3234dd177ffa8c112fe282d13c6 Mon Sep 17 00:00:00 2001 From: Yoon Ah Shin Date: Sat, 25 Dec 2021 18:52:38 +0900 Subject: [PATCH 11/11] =?UTF-8?q?[Add]=20Catpion2=20=EC=B6=94=EA=B0=80(#15?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CDSKit/Source/Foundation/CDSFont.swift | 1 + CDSKit/Source/Foundation/CDSTypography.swift | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CDSKit/Source/Foundation/CDSFont.swift b/CDSKit/Source/Foundation/CDSFont.swift index 0c98b14..8fefd0e 100644 --- a/CDSKit/Source/Foundation/CDSFont.swift +++ b/CDSKit/Source/Foundation/CDSFont.swift @@ -34,6 +34,7 @@ public enum CDSFont { public static let caption0 = UIFont.regularDINProFont(ofSize: 14) public static let caption1 = UIFont.boldSpoqaFont(ofSize: 12) + public static let caption2 = UIFont.regularSpoqaFont(ofSize: 12) public static let button0 = UIFont.mediumSpoqaFont(ofSize: 16) public static let button1 = UIFont.mediumSpoqaFont(ofSize: 14) diff --git a/CDSKit/Source/Foundation/CDSTypography.swift b/CDSKit/Source/Foundation/CDSTypography.swift index 8ec1f63..56f7f6d 100644 --- a/CDSKit/Source/Foundation/CDSTypography.swift +++ b/CDSKit/Source/Foundation/CDSTypography.swift @@ -26,6 +26,7 @@ extension String { case body7 case caption0 case caption1 + case caption2 case button0 case button1 case catchu0 @@ -65,6 +66,8 @@ extension String { return CDSFont.caption0 case .caption1: return CDSFont.caption1 + case .caption2: + return CDSFont.caption2 case .button0: return CDSFont.button0 case .button1: