klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

콘텐츠 메인

Browse Source 
- 우측 최상단에 콘텐츠 보관함
- 배너와 추천 시리즈 순서 변경
- 내 보관함 제거
This commit is contained in:
Yu Sung
2024-08-21 21:49:21 +09:00
parent 47cd685f80
commit 81846f7f7b
5 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/Contents.json vendored Normal file
View File

@@ -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
}
}

BIN
SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/ic_content_keep.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 824 B

26
SodaLive/Sources/Content/Main/ContentMainView.swift
View File

@@ -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)

2
SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift
View File

@@ -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"))
}

4
SodaLive/Sources/MyPage/OrderList/OrderListView.swift
View File

@@ -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)
}