diff --git a/SodaLive/Resources/Assets.xcassets/ic_short_play.imageset/ic_short_play.png b/SodaLive/Resources/Assets.xcassets/ic_short_play.imageset/ic_short_play.png index 51b75d6..65057fe 100644 Binary files a/SodaLive/Resources/Assets.xcassets/ic_short_play.imageset/ic_short_play.png and b/SodaLive/Resources/Assets.xcassets/ic_short_play.imageset/ic_short_play.png differ diff --git a/SodaLive/Resources/Assets.xcassets/ic_thumb_play_blue.imageset/ic_thumb_play_blue.png b/SodaLive/Resources/Assets.xcassets/ic_thumb_play_blue.imageset/ic_thumb_play_blue.png index 2d392a6..9688e54 100644 Binary files a/SodaLive/Resources/Assets.xcassets/ic_thumb_play_blue.imageset/ic_thumb_play_blue.png and b/SodaLive/Resources/Assets.xcassets/ic_thumb_play_blue.imageset/ic_thumb_play_blue.png differ diff --git a/SodaLive/Resources/Assets.xcassets/img_bg_review_live.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/img_bg_review_live.imageset/Contents.json new file mode 100644 index 0000000..d273e65 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/img_bg_review_live.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "img_bg_review_live.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/img_bg_review_live.imageset/img_bg_review_live.png b/SodaLive/Resources/Assets.xcassets/img_bg_review_live.imageset/img_bg_review_live.png new file mode 100644 index 0000000..87f554d Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/img_bg_review_live.imageset/img_bg_review_live.png differ diff --git a/SodaLive/Resources/Assets.xcassets/img_bg_short_play.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/img_bg_short_play.imageset/Contents.json new file mode 100644 index 0000000..f7d6b2c --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/img_bg_short_play.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "img_bg_short_play.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/img_bg_short_play.imageset/img_bg_short_play.png b/SodaLive/Resources/Assets.xcassets/img_bg_short_play.imageset/img_bg_short_play.png new file mode 100644 index 0000000..d497918 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/img_bg_short_play.imageset/img_bg_short_play.png differ diff --git a/SodaLive/Sources/Content/Main/ContentMainView.swift b/SodaLive/Sources/Content/Main/ContentMainView.swift index 86fbd5b..50032e1 100644 --- a/SodaLive/Sources/Content/Main/ContentMainView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainView.swift @@ -38,47 +38,47 @@ struct ContentMainView: View { .padding(.bottom, 26.7) .padding(.horizontal, 13.3) - HStack(spacing: 13.3) { - VStack(spacing: 2.7) { + HStack(spacing: 8) { + ZStack { + Image("img_bg_short_play") + .resizable() + .frame(maxWidth: .infinity) + .cornerRadius(2.6) + HStack(spacing: 2.7) { Image("ic_short_play") Text("숏플") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .font(.custom(Font.bold.rawValue, size: 16.7)) .foregroundColor(Color(hex: "dd158d")) } - - Text("짧지만 꼴릿한 이야기") - .font(.custom(Font.light.rawValue, size: 10)) - .foregroundColor(Color(hex: "dd158d")) + .padding(.vertical, 16) + .frame(maxWidth: .infinity) + .cornerRadius(2.6) } - .padding(.vertical, 10) - .frame(maxWidth: .infinity) - .background(Color(hex: "ffecf7")) - .cornerRadius(2.6) .onTapGesture { AppState.shared.setAppStep( step: .contentAllByTheme(themeId: 11) ) } - VStack(spacing: 2.7) { + ZStack { + Image("img_bg_review_live") + .resizable() + .frame(maxWidth: .infinity) + .cornerRadius(2.6) + HStack(spacing: 2.7) { Image("ic_thumb_play_blue") Text("라이브 다시듣기") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .font(.custom(Font.bold.rawValue, size: 16.7)) .foregroundColor(Color(hex: "0057ff")) } - - Text("놓쳤던 라이브 다시듣기") - .font(.custom(Font.light.rawValue, size: 10)) - .foregroundColor(Color(hex: "0057ff")) + .padding(.vertical, 16) + .frame(maxWidth: .infinity) + .cornerRadius(2.6) } - .padding(.vertical, 10) - .frame(maxWidth: .infinity) - .background(Color(hex: "ecf9ff")) - .cornerRadius(2.6) .onTapGesture { AppState.shared.setAppStep( step: .contentAllByTheme(themeId: 7)