Merge branch 'main' into feature/i18n

2025-12-26 18:25:01 +09:00
parent 57f24f2481 fba3940a94
commit c6da15f42c
5 changed files with 15 additions and 23 deletions
--- a/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.png
+++ b/SodaLive/Resources/Assets.xcassets/splash/splash_bg.imageset/splash_bg.png
--- a/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/Contents.json
+++ b/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "splash_text.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/splash_text.png
+++ b/SodaLive/Resources/Assets.xcassets/splash/splash_text.imageset/splash_text.png
--- a/SodaLive/Resources/Assets.xcassets/splash/splash_text_logo.imageset/splash_text_logo.png
+++ b/SodaLive/Resources/Assets.xcassets/splash/splash_text_logo.imageset/splash_text_logo.png