diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/Contents.json similarity index 87% rename from SodaLive/Resources/Assets.xcassets/splash/splash_logo.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/Contents.json index ae9fc61..2aa81ec 100644 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_logo.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "splash_logo.png", + "filename" : "splash_bg.png", "idiom" : "universal", "scale" : "3x" } 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..71a599d 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_bg_2024.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/Contents.json deleted file mode 100644 index d822b4c..0000000 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "splash_bg_2024.jpg", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} 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 deleted file mode 100644 index 3023062..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024.imageset/splash_bg_2024.jpg and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_bubble.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_bubble.imageset/Contents.json deleted file mode 100644 index f20a3f8..0000000 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_bubble.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "splash_bubble.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_bubble.imageset/splash_bubble.png b/SodaLive/Resources/Assets.xcassets/splash/splash_bubble.imageset/splash_bubble.png deleted file mode 100644 index 647356e..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_bubble.imageset/splash_bubble.png and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo.imageset/splash_logo.png b/SodaLive/Resources/Assets.xcassets/splash/splash_logo.imageset/splash_logo.png deleted file mode 100644 index e56aed8..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_logo.imageset/splash_logo.png and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/Contents.json deleted file mode 100644 index 4361041..0000000 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "splash_logo_2024.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} 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 deleted file mode 100644 index 70c72b2..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_2024.imageset/splash_logo_2024.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 deleted file mode 100644 index 364dd49..0000000 --- a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 2d68351..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_logo_dragon_2024.imageset/splash_logo_dragon_2024.png and /dev/null 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 index 98e27f8..b2abcbf 100644 Binary files a/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/splash_text.png and b/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/splash_text.png differ diff --git a/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/Contents.json deleted file mode 100644 index 2937c4b..0000000 --- a/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "vividnext_logo.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/vividnext_logo.png b/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/vividnext_logo.png deleted file mode 100644 index ce3f969..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/vividnext_logo.png and /dev/null differ diff --git a/SodaLive/Sources/Splash/SplashView.swift b/SodaLive/Sources/Splash/SplashView.swift index d469f72..390bafc 100644 --- a/SodaLive/Sources/Splash/SplashView.swift +++ b/SodaLive/Sources/Splash/SplashView.swift @@ -17,7 +17,7 @@ struct SplashView: View { var body: some View { ZStack(alignment: .top) { - Image("splash_bg_2024") + Image("splash_bg") .resizable() .aspectRatio(contentMode: .fill) .edgesIgnoringSafeArea(.all) @@ -25,15 +25,8 @@ struct SplashView: View { 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) + Image("splash_text") + .padding(.bottom, 86) } if isShowUpdatePopup {