diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_4.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_alarm.imageset/Contents.json
similarity index 88%
rename from SodaLive/Resources/Assets.xcassets/loading/loading_4.imageset/Contents.json
rename to SodaLive/Resources/Assets.xcassets/ic_alarm.imageset/Contents.json
index 08349c1..90649ba 100644
--- a/SodaLive/Resources/Assets.xcassets/loading/loading_4.imageset/Contents.json
+++ b/SodaLive/Resources/Assets.xcassets/ic_alarm.imageset/Contents.json
@@ -5,11 +5,11 @@
"scale" : "1x"
},
{
- "filename" : "loading_4.png",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "ic_alarm.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_alarm.imageset/ic_alarm.png b/SodaLive/Resources/Assets.xcassets/ic_alarm.imageset/ic_alarm.png
new file mode 100644
index 0000000..d1b1e59
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_alarm.imageset/ic_alarm.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/ic_alarm_selected.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_alarm_selected.imageset/Contents.json
new file mode 100644
index 0000000..2bac9c2
--- /dev/null
+++ b/SodaLive/Resources/Assets.xcassets/ic_alarm_selected.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "ic_alarm_selected.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_alarm_selected.imageset/ic_alarm_selected.png b/SodaLive/Resources/Assets.xcassets/ic_alarm_selected.imageset/ic_alarm_selected.png
new file mode 100644
index 0000000..7d99d63
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_alarm_selected.imageset/ic_alarm_selected.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_3.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_blog_purple.imageset/Contents.json
similarity index 86%
rename from SodaLive/Resources/Assets.xcassets/loading/loading_3.imageset/Contents.json
rename to SodaLive/Resources/Assets.xcassets/ic_blog_purple.imageset/Contents.json
index 9c5c108..ea73283 100644
--- a/SodaLive/Resources/Assets.xcassets/loading/loading_3.imageset/Contents.json
+++ b/SodaLive/Resources/Assets.xcassets/ic_blog_purple.imageset/Contents.json
@@ -5,11 +5,11 @@
"scale" : "1x"
},
{
- "filename" : "loading_3.png",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "ic_blog_purple.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_blog_purple.imageset/ic_blog_purple.png b/SodaLive/Resources/Assets.xcassets/ic_blog_purple.imageset/ic_blog_purple.png
new file mode 100644
index 0000000..e108bc0
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_blog_purple.imageset/ic_blog_purple.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple 1.imageset/ic_headphones_purple.png b/SodaLive/Resources/Assets.xcassets/ic_headphones_purple 1.imageset/ic_headphones_purple.png
deleted file mode 100644
index d285d38..0000000
Binary files a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple 1.imageset/ic_headphones_purple.png and /dev/null differ
diff --git a/SodaLive/Resources/Assets.xcassets/ic_instagram_purple.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_instagram_purple.imageset/Contents.json
new file mode 100644
index 0000000..5eacaed
--- /dev/null
+++ b/SodaLive/Resources/Assets.xcassets/ic_instagram_purple.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "ic_instagram_purple.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_instagram_purple.imageset/ic_instagram_purple.png b/SodaLive/Resources/Assets.xcassets/ic_instagram_purple.imageset/ic_instagram_purple.png
new file mode 100644
index 0000000..2962f40
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_instagram_purple.imageset/ic_instagram_purple.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_1.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_message_send.imageset/Contents.json
similarity index 86%
rename from SodaLive/Resources/Assets.xcassets/loading/loading_1.imageset/Contents.json
rename to SodaLive/Resources/Assets.xcassets/ic_message_send.imageset/Contents.json
index 16ca8fc..495cc5d 100644
--- a/SodaLive/Resources/Assets.xcassets/loading/loading_1.imageset/Contents.json
+++ b/SodaLive/Resources/Assets.xcassets/ic_message_send.imageset/Contents.json
@@ -5,11 +5,11 @@
"scale" : "1x"
},
{
- "filename" : "loading_1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "ic_message_send.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_message_send.imageset/ic_message_send.png b/SodaLive/Resources/Assets.xcassets/ic_message_send.imageset/ic_message_send.png
new file mode 100644
index 0000000..3a797f8
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_message_send.imageset/ic_message_send.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_2.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_mic_paint.imageset/Contents.json
similarity index 87%
rename from SodaLive/Resources/Assets.xcassets/loading/loading_2.imageset/Contents.json
rename to SodaLive/Resources/Assets.xcassets/ic_mic_paint.imageset/Contents.json
index 1340f9a..1c701e5 100644
--- a/SodaLive/Resources/Assets.xcassets/loading/loading_2.imageset/Contents.json
+++ b/SodaLive/Resources/Assets.xcassets/ic_mic_paint.imageset/Contents.json
@@ -5,11 +5,11 @@
"scale" : "1x"
},
{
- "filename" : "loading_2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "ic_mic_paint.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_mic_paint.imageset/ic_mic_paint.png b/SodaLive/Resources/Assets.xcassets/ic_mic_paint.imageset/ic_mic_paint.png
new file mode 100644
index 0000000..29c1fb9
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_mic_paint.imageset/ic_mic_paint.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/ic_place_holder.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_place_holder.imageset/Contents.json
new file mode 100644
index 0000000..21f7b48
--- /dev/null
+++ b/SodaLive/Resources/Assets.xcassets/ic_place_holder.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "ic_place_holder.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_place_holder.imageset/ic_place_holder.png b/SodaLive/Resources/Assets.xcassets/ic_place_holder.imageset/ic_place_holder.png
new file mode 100644
index 0000000..504b3fb
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_place_holder.imageset/ic_place_holder.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/ic_website_purple.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_website_purple.imageset/Contents.json
new file mode 100644
index 0000000..5cdcfb9
--- /dev/null
+++ b/SodaLive/Resources/Assets.xcassets/ic_website_purple.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "ic_website_purple.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_website_purple.imageset/ic_website_purple.png b/SodaLive/Resources/Assets.xcassets/ic_website_purple.imageset/ic_website_purple.png
new file mode 100644
index 0000000..32d75d6
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_website_purple.imageset/ic_website_purple.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple 1.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_youtube_play_purple.imageset/Contents.json
similarity index 84%
rename from SodaLive/Resources/Assets.xcassets/ic_headphones_purple 1.imageset/Contents.json
rename to SodaLive/Resources/Assets.xcassets/ic_youtube_play_purple.imageset/Contents.json
index 5f15106..67eeeb3 100644
--- a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple 1.imageset/Contents.json
+++ b/SodaLive/Resources/Assets.xcassets/ic_youtube_play_purple.imageset/Contents.json
@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
- "filename" : "ic_headphones_purple.png",
+ "filename" : "ic_youtube_play_purple.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/SodaLive/Resources/Assets.xcassets/ic_youtube_play_purple.imageset/ic_youtube_play_purple.png b/SodaLive/Resources/Assets.xcassets/ic_youtube_play_purple.imageset/ic_youtube_play_purple.png
new file mode 100644
index 0000000..9ac3995
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_youtube_play_purple.imageset/ic_youtube_play_purple.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/img_compleate_book.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/img_compleate_book.imageset/Contents.json
new file mode 100644
index 0000000..378cb1c
--- /dev/null
+++ b/SodaLive/Resources/Assets.xcassets/img_compleate_book.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "img_compleate_book.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/SodaLive/Resources/Assets.xcassets/img_compleate_book.imageset/img_compleate_book.png b/SodaLive/Resources/Assets.xcassets/img_compleate_book.imageset/img_compleate_book.png
new file mode 100644
index 0000000..a9ec0af
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/img_compleate_book.imageset/img_compleate_book.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/img_thumb_default.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/img_thumb_default.imageset/Contents.json
new file mode 100644
index 0000000..903e5ba
--- /dev/null
+++ b/SodaLive/Resources/Assets.xcassets/img_thumb_default.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "img_thumb_default.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/SodaLive/Resources/Assets.xcassets/img_thumb_default.imageset/img_thumb_default.png b/SodaLive/Resources/Assets.xcassets/img_thumb_default.imageset/img_thumb_default.png
new file mode 100644
index 0000000..784143a
Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/img_thumb_default.imageset/img_thumb_default.png differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/Contents.json b/SodaLive/Resources/Assets.xcassets/loading/Contents.json
deleted file mode 100644
index 73c0059..0000000
--- a/SodaLive/Resources/Assets.xcassets/loading/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_1.imageset/loading_1.png b/SodaLive/Resources/Assets.xcassets/loading/loading_1.imageset/loading_1.png
deleted file mode 100644
index d916f59..0000000
Binary files a/SodaLive/Resources/Assets.xcassets/loading/loading_1.imageset/loading_1.png and /dev/null differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_2.imageset/loading_2.png b/SodaLive/Resources/Assets.xcassets/loading/loading_2.imageset/loading_2.png
deleted file mode 100644
index ee58be3..0000000
Binary files a/SodaLive/Resources/Assets.xcassets/loading/loading_2.imageset/loading_2.png and /dev/null differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_3.imageset/loading_3.png b/SodaLive/Resources/Assets.xcassets/loading/loading_3.imageset/loading_3.png
deleted file mode 100644
index e1e50ef..0000000
Binary files a/SodaLive/Resources/Assets.xcassets/loading/loading_3.imageset/loading_3.png and /dev/null differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_4.imageset/loading_4.png b/SodaLive/Resources/Assets.xcassets/loading/loading_4.imageset/loading_4.png
deleted file mode 100644
index c4fc517..0000000
Binary files a/SodaLive/Resources/Assets.xcassets/loading/loading_4.imageset/loading_4.png and /dev/null differ
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_5.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/loading/loading_5.imageset/Contents.json
deleted file mode 100644
index 0f1ea75..0000000
--- a/SodaLive/Resources/Assets.xcassets/loading/loading_5.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "loading_5.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/SodaLive/Resources/Assets.xcassets/loading/loading_5.imageset/loading_5.png b/SodaLive/Resources/Assets.xcassets/loading/loading_5.imageset/loading_5.png
deleted file mode 100644
index e08ba00..0000000
Binary files a/SodaLive/Resources/Assets.xcassets/loading/loading_5.imageset/loading_5.png and /dev/null differ
diff --git a/SodaLive/Resources/Assets.xcassets/vividnext_logo.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/Contents.json
similarity index 100%
rename from SodaLive/Resources/Assets.xcassets/vividnext_logo.imageset/Contents.json
rename to SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/Contents.json
diff --git a/SodaLive/Resources/Assets.xcassets/vividnext_logo.imageset/vividnext_logo.png b/SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/vividnext_logo.png
similarity index 100%
rename from SodaLive/Resources/Assets.xcassets/vividnext_logo.imageset/vividnext_logo.png
rename to SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/vividnext_logo.png
diff --git a/SodaLive/Sources/Content/ContentListItemView.swift b/SodaLive/Sources/Content/ContentListItemView.swift
index da38402..eb31765 100644
--- a/SodaLive/Sources/Content/ContentListItemView.swift
+++ b/SodaLive/Sources/Content/ContentListItemView.swift
@@ -49,7 +49,7 @@ struct ContentListItemView: View {
HStack(spacing: 13.3) {
HStack(spacing: 6) {
- Image("ic_heart")
+ Image("ic_heart_777")
.resizable()
.frame(width: 13.3, height: 13.3)
diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift
index a8c4114..6aa954f 100644
--- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift
+++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift
@@ -88,7 +88,7 @@ struct LiveRoomInfoEditDialog: View {
.clipped()
.cornerRadius(10)
} else {
- Image("ic_logo_220")
+ Image("ic_logo")
.resizable()
.scaledToFit()
.frame(width: 80, height: 116.8)