diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/Contents.json index 42acdde..2aa81ec 100644 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "splash_bg.jpg", + "filename" : "splash_bg.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.jpg b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.jpg deleted file mode 100644 index 2b9bcc8..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.jpg and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.png b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.png new file mode 100644 index 0000000..8c6f1e8 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.png differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/splash_text.png b/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/splash_text.png deleted file mode 100644 index 11e027d..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/splash_text.png and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_text1.imageset/Contents.json similarity index 87% rename from SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/splash/splash_text1.imageset/Contents.json index 1214b3d..a5a6ad5 100644 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/splash/splash_text1.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "splash_text.png", + "filename" : "splash_text1.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_text1.imageset/splash_text1.png b/SodaLive/Resources/Assets.xcassets/splash/splash_text1.imageset/splash_text1.png new file mode 100644 index 0000000..1d35565 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/splash/splash_text1.imageset/splash_text1.png differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_text2.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_text2.imageset/Contents.json new file mode 100644 index 0000000..bc849bc --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/splash/splash_text2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "splash_text2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_text2.imageset/splash_text2.png b/SodaLive/Resources/Assets.xcassets/splash/splash_text2.imageset/splash_text2.png new file mode 100644 index 0000000..5aae6ae Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/splash/splash_text2.imageset/splash_text2.png differ diff --git a/SodaLive/Sources/Splash/SplashView.swift b/SodaLive/Sources/Splash/SplashView.swift index e6456d7..22185bb 100644 --- a/SodaLive/Sources/Splash/SplashView.swift +++ b/SodaLive/Sources/Splash/SplashView.swift @@ -21,12 +21,14 @@ struct SplashView: View { .scaledToFill() .edgesIgnoringSafeArea(.all) - HStack(spacing: 0) { + VStack(spacing: 0) { + Image("splash_text1") + .padding(.top, screenSize().height * 360 / 2337) + Spacer() - Image("splash_text") - .padding(.top, 94) - .padding(.trailing, 38) + Image("splash_text2") + .padding(.bottom, screenSize().height * 240 / 2337) } if isShowUpdatePopup { @@ -146,8 +148,6 @@ struct SplashView: View { } } -struct SplashView_Previews: PreviewProvider { - static var previews: some View { - SplashView() - } +#Preview { + SplashView() }