From 20f257de7ae594df6c78ef026f46dd997ef15aae Mon Sep 17 00:00:00 2001 From: baegteun Date: Tue, 30 May 2023 22:51:44 +0900 Subject: [PATCH 1/4] =?UTF-8?q?:bento:=20::=20Check=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B3=80=EA=B2=BD=20=EC=82=AC=ED=95=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Icon/Icons.xcassets/Check.imageset/Check 1.svg | 4 ---- .../Icon/Icons.xcassets/Check.imageset/Check 2.svg | 4 ++-- .../Icon/Icons.xcassets/Check.imageset/Check 3.svg | 4 ++++ .../Icon/Icons.xcassets/Check.imageset/Check.svg | 4 ++-- .../Icon/Icons.xcassets/Check.imageset/Contents.json | 2 +- Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift | 9 +++++++++ 6 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 1.svg create mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg create mode 100644 Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 1.svg deleted file mode 100644 index c0317d33..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 1.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg index c0317d33..e9f29d8d 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg @@ -1,4 +1,4 @@ - - + + diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg new file mode 100644 index 00000000..e9f29d8d --- /dev/null +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check.svg index c0317d33..e9f29d8d 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check.svg +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check.svg @@ -1,4 +1,4 @@ - - + + diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json index 36b1b048..f0fd04af 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json @@ -6,7 +6,7 @@ "scale" : "1x" }, { - "filename" : "Check 1.svg", + "filename" : "Check 3.svg", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift b/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift new file mode 100644 index 00000000..17c44148 --- /dev/null +++ b/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift @@ -0,0 +1,9 @@ +// +// SMSToast.swift +// DesignSystem +// +// Created by 최형우 on 2023/05/30. +// Copyright © 2023 com.msg. All rights reserved. +// + +import Foundation From 5738dd099f0dc0f2954da3324622ba42b0f78de6 Mon Sep 17 00:00:00 2001 From: baegteun Date: Tue, 30 May 2023 23:51:12 +0900 Subject: [PATCH 2/4] :sparkles: :: SMSToast --- .../DesignSystem/Demo/Sources/DemoView.swift | 27 ++---- .../DesignSystem/Sources/Toast/SMSToast.swift | 85 +++++++++++++++++-- 2 files changed, 81 insertions(+), 31 deletions(-) diff --git a/Projects/Core/DesignSystem/Demo/Sources/DemoView.swift b/Projects/Core/DesignSystem/Demo/Sources/DemoView.swift index 1900561b..d52cf3c4 100644 --- a/Projects/Core/DesignSystem/Demo/Sources/DemoView.swift +++ b/Projects/Core/DesignSystem/Demo/Sources/DemoView.swift @@ -6,30 +6,13 @@ public struct DemoView: View { public var body: some View { VStack { - } - .onAppear { - DispatchQueue.main.asyncAfter(deadline: .now() + 1) { - isShowing = true + Button { + self.isShowing = true + } label: { + Text("A") } } - .smsAlert( - title: "123", - description: "!23", - isShowing: - Binding( - get: { isShowing }, - set: { _ in isSeletedChange() } - ), - alertActions: - [ - .init(text: "Cancel", style: .outline, action: { isSeletedChange() }), - .init(text: "Success", style: .default, action: { print("asdf") }) - ] - ) - } - - func isSeletedChange() { - isShowing = false + .smsToast(text: "ASDF", isShowing: $isShowing) } } diff --git a/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift b/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift index 17c44148..711d98a0 100644 --- a/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift +++ b/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift @@ -1,9 +1,76 @@ -// -// SMSToast.swift -// DesignSystem -// -// Created by 최형우 on 2023/05/30. -// Copyright © 2023 com.msg. All rights reserved. -// - -import Foundation +import SwiftUI +import ViewUtil + +public extension View { + func smsToast( + text: String, + isShowing: Binding, + @ViewBuilder iconView: @escaping () -> IconView = { SMSIcon(.check) } + ) -> some View { + self.modifier(SMSToast(text: text, isShowing: isShowing, iconView: iconView)) + } +} + +public struct SMSToast: ViewModifier { + var text: String + @Binding var isShowing: Bool + var iconView: () -> IconView + + public init( + text: String, + isShowing: Binding, + @ViewBuilder iconView: @escaping () -> IconView = { SMSIcon(.check) } + ) { + self.text = text + _isShowing = isShowing + self.iconView = iconView + } + + public func body(content: Content) -> some View { + ZStack { + content + + toastView() + } + .onChange(of: isShowing) { _ in + if isShowing { + DispatchQueue.main.asyncAfter(deadline: .now() + 3) { + withAnimation { + isShowing = false + } + } + } + } + } + + @ViewBuilder + func toastView() -> some View { + VStack { + if isShowing { + HStack(spacing: 4) { + iconView() + + SMSText(text, font: .body1) + .foregroundColor(.sms(.system(.black))) + } + .padding(.vertical, 13.5) + .padding(.horizontal, 16) + .background { + Capsule() + .fill(Color.sms(.system(.white))) + } + .shadow(color: .sms(.system(.black)).opacity(0.08), radius: 16, y: 2) + .opacity(isShowing ? 1 : 0) + .transition(.move(edge: .top).combined(with: AnyTransition.opacity.animation(.easeInOut))) + .onTapGesture { + withAnimation { + isShowing = false + } + } + } + + Spacer() + } + .animation(.interactiveSpring(response: 0.7, dampingFraction: 1, blendDuration: 0), value: isShowing) + } +} From 7d9291f746b6cc8ef0640e373a0e8df44a80bb18 Mon Sep 17 00:00:00 2001 From: baegteun Date: Wed, 7 Jun 2023 15:19:13 +0900 Subject: [PATCH 3/4] :dizzy: :: interpolationSpring animation --- Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift b/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift index 711d98a0..a9e8418c 100644 --- a/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift +++ b/Projects/Core/DesignSystem/Sources/Toast/SMSToast.swift @@ -71,6 +71,6 @@ public struct SMSToast: ViewModifier { Spacer() } - .animation(.interactiveSpring(response: 0.7, dampingFraction: 1, blendDuration: 0), value: isShowing) + .animation(.interpolatingSpring(mass: 1, stiffness: 562.5, damping: 15), value: isShowing) } } From 4b0623f0b74b88c93e6d258c7703263fe0891815 Mon Sep 17 00:00:00 2001 From: baegteun Date: Wed, 7 Jun 2023 15:25:03 +0900 Subject: [PATCH 4/4] :bento: :: GreenCheck Icon --- .../Camera.imageset/Camera 1.svg | 6 ------ .../Camera.imageset/Camera 2.svg | 6 ------ .../Camera.imageset/Contents.json | 13 +----------- .../Icons.xcassets/Check.imageset/Check 2.svg | 4 ---- .../Icons.xcassets/Check.imageset/Check 3.svg | 4 ---- .../Check.imageset/Contents.json | 13 +----------- .../Checkmark.imageset/Contents.json | 13 +----------- .../Checkmark.imageset/checkmark 1.svg | 3 --- .../Checkmark.imageset/checkmark 2.svg | 3 --- .../DownChevron.imageset/ArrowDown 1.svg | 3 --- .../DownChevron.imageset/ArrowDown 2.svg | 3 --- .../DownChevron.imageset/Contents.json | 13 +----------- .../GreenCheck.imageset/Contents.json | 12 +++++++++++ .../GreenCheck.imageset/check.green 1.svg | 4 ++++ .../LeftArrow.imageset/Contents.json | 13 +----------- .../LeftArrow.imageset/RightArrow 1.svg | 3 --- .../LeftArrow.imageset/RightArrow 2.svg | 3 --- .../Photo.imageset/Contents.json | 13 +----------- .../Icons.xcassets/Photo.imageset/Image 1.svg | 6 ------ .../Icons.xcassets/Photo.imageset/Image 2.svg | 6 ------ .../Plus.imageset/Contents.json | 13 +----------- .../Icons.xcassets/Plus.imageset/Plus 1.svg | 3 --- .../Icons.xcassets/Plus.imageset/Plus 2.svg | 3 --- .../Profile.imageset/Contents.json | 13 +----------- .../Profile.imageset/Profile 1.svg | 21 ------------------- .../Profile.imageset/Profile 2.svg | 21 ------------------- .../ProfileSmallPlus.imageset/Contents.json | 13 +----------- .../Profile-Small-Plus 1.svg | 4 ---- .../Profile-Small-Plus 2.svg | 4 ---- .../SmallPlus.imageset/Contents.json | 13 +----------- .../SmallPlus.imageset/SmallPlus 1.svg | 4 ---- .../SmallPlus.imageset/SmallPlus 2.svg | 4 ---- .../Trash.imageset/Contents.json | 13 +----------- .../Icons.xcassets/Trash.imageset/trash 1.svg | 6 ------ .../Icons.xcassets/Trash.imageset/trash 2.svg | 6 ------ .../Xmark.imageset/Contents.json | 13 +----------- .../Icons.xcassets/Xmark.imageset/Xmark 1.svg | 4 ---- .../Icons.xcassets/Xmark.imageset/Xmark 2.svg | 4 ---- .../DesignSystem/Sources/Icon/SMSIcon.swift | 5 +++++ 39 files changed, 33 insertions(+), 278 deletions(-) delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 2.svg create mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/Contents.json create mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/check.green 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 2.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 1.svg delete mode 100644 Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 2.svg diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 1.svg deleted file mode 100644 index fcbea1e6..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 1.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 2.svg deleted file mode 100644 index fcbea1e6..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Camera 2.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Contents.json index 4eda0df2..3b2d022c 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Camera.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Camera.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Camera 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Camera 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg deleted file mode 100644 index e9f29d8d..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg deleted file mode 100644 index e9f29d8d..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Check 3.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json index f0fd04af..de185598 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Check.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Check.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Check 3.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Check 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/Contents.json index c96dd313..6b69c1c8 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "checkmark.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "checkmark 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "checkmark 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 1.svg deleted file mode 100644 index 0eaf97bf..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 2.svg deleted file mode 100644 index 0eaf97bf..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Checkmark.imageset/checkmark 2.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 1.svg deleted file mode 100644 index b27535df..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 2.svg deleted file mode 100644 index b27535df..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/ArrowDown 2.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/Contents.json index 0ad7447f..64fc6843 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/DownChevron.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "ArrowDown.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "ArrowDown 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "ArrowDown 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/Contents.json new file mode 100644 index 00000000..983f6a41 --- /dev/null +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "check.green 1.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/check.green 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/check.green 1.svg new file mode 100644 index 00000000..4e0a7b09 --- /dev/null +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/GreenCheck.imageset/check.green 1.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/Contents.json index 9e163cfa..4944f178 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "RightArrow.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "RightArrow 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "RightArrow 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 1.svg deleted file mode 100644 index c65c0884..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 2.svg deleted file mode 100644 index c65c0884..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/LeftArrow.imageset/RightArrow 2.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Contents.json index 0528e1ec..d2b87ab2 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Image.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Image 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Image 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 1.svg deleted file mode 100644 index 88ab692b..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 1.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 2.svg deleted file mode 100644 index 88ab692b..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Photo.imageset/Image 2.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Contents.json index ea57a9e4..375e4e00 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Plus.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Plus 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Plus 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 1.svg deleted file mode 100644 index a3523c18..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 2.svg deleted file mode 100644 index a3523c18..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Plus.imageset/Plus 2.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Contents.json index 17459ca4..0045e4ac 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Profile.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Profile 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Profile 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 1.svg deleted file mode 100644 index 7e6cfaff..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 1.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 2.svg deleted file mode 100644 index 7e6cfaff..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Profile.imageset/Profile 2.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Contents.json index be5f18d4..7c294fab 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Profile-Small-Plus.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Profile-Small-Plus 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Profile-Small-Plus 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 1.svg deleted file mode 100644 index ae4fac23..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 1.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 2.svg deleted file mode 100644 index ae4fac23..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/ProfileSmallPlus.imageset/Profile-Small-Plus 2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/Contents.json index be8fe107..11716b81 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "SmallPlus.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "SmallPlus 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "SmallPlus 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 1.svg deleted file mode 100644 index 3a3d92c5..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 1.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 2.svg deleted file mode 100644 index 3a3d92c5..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/SmallPlus.imageset/SmallPlus 2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/Contents.json index 084a511a..d633e980 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "trash.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "trash 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "trash 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 1.svg deleted file mode 100644 index e50cd602..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 1.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 2.svg deleted file mode 100644 index e50cd602..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Trash.imageset/trash 2.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Contents.json b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Contents.json index ca2db1c7..216479c2 100644 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Contents.json +++ b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Xmark.svg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Xmark 1.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Xmark 2.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 1.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 1.svg deleted file mode 100644 index b55e2791..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 1.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 2.svg b/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 2.svg deleted file mode 100644 index b55e2791..00000000 --- a/Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Xmark.imageset/Xmark 2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DesignSystem/Sources/Icon/SMSIcon.swift b/Projects/Core/DesignSystem/Sources/Icon/SMSIcon.swift index b0d36679..7e49a97f 100644 --- a/Projects/Core/DesignSystem/Sources/Icon/SMSIcon.swift +++ b/Projects/Core/DesignSystem/Sources/Icon/SMSIcon.swift @@ -23,6 +23,7 @@ public struct SMSIcon: View { case check case checkmark case downChevron + case greenCheck case photo case plus case profile @@ -55,6 +56,9 @@ public struct SMSIcon: View { case .downChevron: return DesignSystemAsset.Icons.downChevron.swiftUIImage + case .greenCheck: + return DesignSystemAsset.Icons.greenCheck.swiftUIImage + case .photo: return DesignSystemAsset.Icons.photo.swiftUIImage @@ -80,4 +84,5 @@ public struct SMSIcon: View { return DesignSystemAsset.Icons.xmark.swiftUIImage } } + // swiftlint: enable cyclomatic_complexity }