diff --git a/SodaLive/Resources/Assets.xcassets/img_text_logo.imageset/img_text_logo.png b/SodaLive/Resources/Assets.xcassets/img_text_logo.imageset/img_text_logo.png deleted file mode 100644 index f5e6fce4..00000000 Binary files a/SodaLive/Resources/Assets.xcassets/img_text_logo.imageset/img_text_logo.png and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/Contents.json index 890a6273..289cd5ef 100644 --- a/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "ic_content_tag_original.png", "idiom" : "universal", "scale" : "1x" }, @@ -10,6 +9,7 @@ "scale" : "2x" }, { + "filename" : "ic_content_tag_original.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/ic_content_tag_original.png b/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/ic_content_tag_original.png index 9935750f..8c1d41a1 100644 Binary files a/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/ic_content_tag_original.png and b/SodaLive/Resources/Assets.xcassets/v2/ic_content_tag_original.imageset/ic_content_tag_original.png differ diff --git a/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/Contents.json index f870b794..1e3d476c 100644 --- a/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "ic_series_original.png", "idiom" : "universal", "scale" : "1x" }, @@ -10,6 +9,7 @@ "scale" : "2x" }, { + "filename" : "ic_series_original.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/ic_series_original.png b/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/ic_series_original.png index 29708072..f324ae18 100644 Binary files a/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/ic_series_original.png and b/SodaLive/Resources/Assets.xcassets/v2/ic_series_original.imageset/ic_series_original.png differ diff --git a/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/Contents.json index bcee9859..84f81a0c 100644 --- a/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "img_new_only.png", "idiom" : "universal", "scale" : "1x" }, @@ -10,6 +9,7 @@ "scale" : "2x" }, { + "filename" : "img_new_only.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/img_new_only.png b/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/img_new_only.png index a36e818c..f50e8545 100644 Binary files a/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/img_new_only.png and b/SodaLive/Resources/Assets.xcassets/v2/img_new_only.imageset/img_new_only.png differ diff --git a/SodaLive/Resources/Assets.xcassets/img_text_logo.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/v2/img_text_logo.imageset/Contents.json similarity index 100% rename from SodaLive/Resources/Assets.xcassets/img_text_logo.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/v2/img_text_logo.imageset/Contents.json index f9d33fca..7fb90a97 100644 --- a/SodaLive/Resources/Assets.xcassets/img_text_logo.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/v2/img_text_logo.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "img_text_logo.png", "idiom" : "universal", "scale" : "1x" }, @@ -10,6 +9,7 @@ "scale" : "2x" }, { + "filename" : "img_text_logo.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/v2/img_text_logo.imageset/img_text_logo.png b/SodaLive/Resources/Assets.xcassets/v2/img_text_logo.imageset/img_text_logo.png new file mode 100644 index 00000000..f6f850fe Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/v2/img_text_logo.imageset/img_text_logo.png differ diff --git a/SodaLive/Resources/Assets.xcassets/v2/img_text_logo_v2.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/v2/img_text_logo_v2.imageset/Contents.json deleted file mode 100644 index 3b387aaa..00000000 --- a/SodaLive/Resources/Assets.xcassets/v2/img_text_logo_v2.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "img_text_logo_v2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/SodaLive/Resources/Assets.xcassets/v2/img_text_logo_v2.imageset/img_text_logo_v2.png b/SodaLive/Resources/Assets.xcassets/v2/img_text_logo_v2.imageset/img_text_logo_v2.png deleted file mode 100644 index c6d7135f..00000000 Binary files a/SodaLive/Resources/Assets.xcassets/v2/img_text_logo_v2.imageset/img_text_logo_v2.png and /dev/null differ diff --git a/SodaLive/Sources/V2/Component/HomeTitleBar.swift b/SodaLive/Sources/V2/Component/HomeTitleBar.swift index 95a9c932..4bbda854 100644 --- a/SodaLive/Sources/V2/Component/HomeTitleBar.swift +++ b/SodaLive/Sources/V2/Component/HomeTitleBar.swift @@ -14,7 +14,7 @@ struct HomeTitleBar: View { var body: some View { TitleBar { - Image("img_text_logo_v2") + Image("img_text_logo") } trailing: { menu }