diff --git a/SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/Contents.json new file mode 100644 index 0000000..bebfade --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_content_keep.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/ic_content_keep.png b/SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/ic_content_keep.png new file mode 100644 index 0000000..3990aea Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/ic_content_keep.png differ diff --git a/SodaLive/Sources/Content/Main/ContentMainView.swift b/SodaLive/Sources/Content/Main/ContentMainView.swift index 05a40fa..0ffb3a6 100644 --- a/SodaLive/Sources/Content/Main/ContentMainView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainView.swift @@ -17,19 +17,28 @@ struct ContentMainView: View { ScrollView(.vertical, showsIndicators: false) { VStack(alignment: .leading, spacing: 0) { - Text("콘텐츠 마켓") - .font(.custom(Font.bold.rawValue, size: 21.3)) - .foregroundColor(Color.button) - .padding(.bottom, 26.7) - .padding(.horizontal, 13.3) + HStack(spacing: 0) { + Text("콘텐츠 마켓") + .font(.custom(Font.bold.rawValue, size: 21.3)) + .foregroundColor(Color.button) + + Spacer() + + Image("ic_content_keep") + .onTapGesture { + AppState.shared.setAppStep(step: .orderListAll) + } + } + .padding(.bottom, 26.7) + .padding(.horizontal, 13.3) if !viewModel.isLoading { - ContentMainRecommendSeriesView() - ContentMainBannerView() .padding(.bottom, 26.7) .padding(.horizontal, 13.3) + ContentMainRecommendSeriesView() + HStack(spacing: 8) { ZStack { Image("img_bg_short_play") @@ -78,9 +87,6 @@ struct ContentMainView: View { .padding(.bottom, 40) .padding(.horizontal, 13.3) - ContentMainMyStashView() - .padding(.horizontal, 13.3) - ContentMainNewContentView() .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift index 725c3a6..62354da 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift @@ -23,7 +23,7 @@ struct OrderListAllView: View { .resizable() .frame(width: 20, height: 20) - Text("구매목록") + Text("콘텐츠 보관함") .font(.custom(Font.bold.rawValue, size: 18.3)) .foregroundColor(Color(hex: "eeeeee")) } diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListView.swift index 06d6690..fbdd50d 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListView.swift @@ -13,7 +13,7 @@ struct OrderListView: View { var body: some View { VStack(spacing: 0) { HStack(spacing: 0) { - Text("구매목록") + Text("콘텐츠 보관함") .font(.custom(Font.bold.rawValue, size: 18)) .foregroundColor(Color(hex: "eeeeee")) @@ -21,7 +21,7 @@ struct OrderListView: View { Text("전체보기") .font(.custom(Font.medium.rawValue, size: 11)) - .foregroundColor(Color(hex: "bbbbbb")) + .foregroundColor(Color.graybb) .onTapGesture { AppState.shared.setAppStep(step: .orderListAll) }