diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_christmas_bg.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/Contents.json similarity index 85% rename from SodaLive/Resources/Assets.xcassets/splash/splash_christmas_bg.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/Contents.json index 9c09e42..d822b4c 100644 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_christmas_bg.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "splash_christmas_bg.png", + "filename" : "splash_bg_2024.jpg", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/splash_bg_2024.jpg b/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/splash_bg_2024.jpg new file mode 100644 index 0000000..3023062 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/splash_bg_2024.jpg differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_christmas_bg.imageset/splash_christmas_bg.png b/SodaLive/Resources/Assets.xcassets/splash/splash_christmas_bg.imageset/splash_christmas_bg.png deleted file mode 100644 index 95bd04e..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_christmas_bg.imageset/splash_christmas_bg.png and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_christmas.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/Contents.json similarity index 84% rename from SodaLive/Resources/Assets.xcassets/splash/splash_logo_christmas.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/Contents.json index 9d4bfab..4361041 100644 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_christmas.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "splash_logo_christmas.png", + "filename" : "splash_logo_2024.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/splash_logo_2024.png b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/splash_logo_2024.png new file mode 100644 index 0000000..70c72b2 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/splash_logo_2024.png differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_christmas.imageset/splash_logo_christmas.png b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_christmas.imageset/splash_logo_christmas.png deleted file mode 100644 index 02b14d9..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_christmas.imageset/splash_logo_christmas.png and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/Contents.json new file mode 100644 index 0000000..364dd49 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "splash_logo_dragon_2024.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/splash_logo_dragon_2024.png b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/splash_logo_dragon_2024.png new file mode 100644 index 0000000..2d68351 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/splash_logo_dragon_2024.png differ diff --git a/SodaLive/Sources/Splash/SplashView.swift b/SodaLive/Sources/Splash/SplashView.swift index 5763eed..d469f72 100644 --- a/SodaLive/Sources/Splash/SplashView.swift +++ b/SodaLive/Sources/Splash/SplashView.swift @@ -17,13 +17,24 @@ struct SplashView: View { var body: some View { ZStack(alignment: .top) { - Image("splash_christmas_bg") + Image("splash_bg_2024") .resizable() .aspectRatio(contentMode: .fill) .edgesIgnoringSafeArea(.all) - Image("splash_logo_christmas") - .padding(.top, 188) + VStack(spacing: 0) { + Spacer() + + Image("splash_logo_2024") + + Image("splash_logo_dragon_2024") + .padding(.leading, 25) + .padding(.top, 50) + .padding(.bottom, 45) + + Image("vividnext_logo") + .padding(.bottom, 45) + } if isShowUpdatePopup { SodaDialog(