From ff995e8182b22a808e240670c18c8acb80135670 Mon Sep 17 00:00:00 2001 From: EungCheol Kim Date: Sun, 17 Mar 2024 17:04:17 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8D=B1=20Splash=20=ED=8E=B8=ED=96=89?= =?UTF-8?q?=20=EB=A1=9C=EA=B3=A0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=90?= =?UTF-8?q?=EC=85=8B=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../splash.logo.imageset/Contents.json | 12 ++++++++++++ .../splash.logo.imageset/SplashLogo.svg | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/Contents.json create mode 100644 Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/SplashLogo.svg diff --git a/Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/Contents.json b/Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/Contents.json new file mode 100644 index 0000000..89bb7e0 --- /dev/null +++ b/Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "SplashLogo.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/SplashLogo.svg b/Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/SplashLogo.svg new file mode 100644 index 0000000..fe0f84c --- /dev/null +++ b/Shared/Sources/DesignSystem/Resources/Images.xcassets/splash.logo.imageset/SplashLogo.svg @@ -0,0 +1,3 @@ + + + From 868335d5ebb40307cc789d084bbe4d68bbc838e5 Mon Sep 17 00:00:00 2001 From: EungCheol Kim Date: Sun, 17 Mar 2024 17:04:51 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20Splash=20=ED=8E=B8?= =?UTF-8?q?=ED=96=89=20=EB=A1=9C=EA=B3=A0=20=EC=A0=84=EC=97=AD=20=EC=83=81?= =?UTF-8?q?=EC=88=98=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/DesignSystem/Sources/Extensions/Image+Resource.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Shared/Sources/DesignSystem/Sources/Extensions/Image+Resource.swift b/Shared/Sources/DesignSystem/Sources/Extensions/Image+Resource.swift index 10f8b47..de41f27 100644 --- a/Shared/Sources/DesignSystem/Sources/Extensions/Image+Resource.swift +++ b/Shared/Sources/DesignSystem/Sources/Extensions/Image+Resource.swift @@ -81,6 +81,7 @@ public extension Image { static let store: Image = .init(.store) static let textLogo: Image = .init(.textLogo) + static let splashLogo: Image = .init(.splashLogo) static let xCircleFill: Image = .init(.xCircleFill) static let xCircle: Image = .init(.xCircle) From be0adbccb8cc0d05d58c02f4546276e78c182242 Mon Sep 17 00:00:00 2001 From: EungCheol Kim Date: Sun, 17 Mar 2024 17:05:01 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=92=84=20SplashView=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/SplashScene/SplashView.swift | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/PyeonHaeng-iOS/Sources/Scenes/SplashScene/SplashView.swift b/PyeonHaeng-iOS/Sources/Scenes/SplashScene/SplashView.swift index c4f31cf..c3d6e9f 100644 --- a/PyeonHaeng-iOS/Sources/Scenes/SplashScene/SplashView.swift +++ b/PyeonHaeng-iOS/Sources/Scenes/SplashScene/SplashView.swift @@ -5,6 +5,7 @@ // Created by 홍승현 on 1/19/24. // +import DesignSystem import SwiftUI struct SplashView: View { @@ -17,14 +18,21 @@ struct SplashView: View { var body: some View { if showingSplash { - Text(verbatim: "SplashView") - .onAppear { - DispatchQueue.main.asyncAfter(deadline: .now() + 1) { - withAnimation { - showingSplash = false - } + VStack { + Text("합리적인 편의점 소비의 시작!") + .font(.b1) + .foregroundStyle(.gray300) + .multilineTextAlignment(.center) + .padding(.horizontal, 20) + Image.splashLogo + } + .onAppear { + DispatchQueue.main.asyncAfter(deadline: .now() + 1) { + withAnimation { + showingSplash = false } } + } } else { HomeView(viewModel: HomeViewModel(service: dependency.homeService)) } From 629733fcd81ded701a2b016bd983d9ac43e2a1c5 Mon Sep 17 00:00:00 2001 From: EungCheol Kim Date: Sun, 17 Mar 2024 17:05:29 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=8C=90=20"=ED=95=A9=EB=A6=AC=EC=A0=81?= =?UTF-8?q?=EC=9D=B8=20=ED=8E=B8=EC=9D=98=EC=A0=90=20=EC=86=8C=EB=B9=84?= =?UTF-8?q?=EC=9D=98=20=EC=8B=9C=EC=9E=91!"=20Localizable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Localizable.xcstrings | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/PyeonHaeng-iOS/Resources/Localizable.xcstrings b/PyeonHaeng-iOS/Resources/Localizable.xcstrings index f8adfa0..a6898b3 100644 --- a/PyeonHaeng-iOS/Resources/Localizable.xcstrings +++ b/PyeonHaeng-iOS/Resources/Localizable.xcstrings @@ -995,6 +995,28 @@ } } }, + "합리적인 편의점 소비의 시작!" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "The start of rational convenience store consumption!" + } + }, + "ja" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "合理的なコンビニエンスストアの消費の始まり！" + } + }, + "ko" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "합리적인 편의점 소비의 시작!" + } + } + } + }, "행사 진행 편의점" : { "extractionState" : "manual", "localizations" : {