콘텐츠 메인
- 우측 최상단에 콘텐츠 보관함 - 배너와 추천 시리즈 순서 변경 - 내 보관함 제거
This commit is contained in:
		
							
								
								
									
										21
									
								
								SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/Contents.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/Contents.json
									
									
									
									
										vendored
									
									
										Normal 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
									
								
							
							
						
						
									
										
											BIN
										
									
								
								SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/ic_content_keep.png
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 824 B | 
| @@ -17,19 +17,28 @@ struct ContentMainView: View { | |||||||
|              |              | ||||||
|             ScrollView(.vertical, showsIndicators: false) { |             ScrollView(.vertical, showsIndicators: false) { | ||||||
|                 VStack(alignment: .leading, spacing: 0) { |                 VStack(alignment: .leading, spacing: 0) { | ||||||
|  |                     HStack(spacing: 0) { | ||||||
|                         Text("콘텐츠 마켓") |                         Text("콘텐츠 마켓") | ||||||
|                             .font(.custom(Font.bold.rawValue, size: 21.3)) |                             .font(.custom(Font.bold.rawValue, size: 21.3)) | ||||||
|                             .foregroundColor(Color.button) |                             .foregroundColor(Color.button) | ||||||
|  |                          | ||||||
|  |                         Spacer() | ||||||
|  |                          | ||||||
|  |                         Image("ic_content_keep") | ||||||
|  |                             .onTapGesture { | ||||||
|  |                                 AppState.shared.setAppStep(step: .orderListAll) | ||||||
|  |                             } | ||||||
|  |                     } | ||||||
|                     .padding(.bottom, 26.7) |                     .padding(.bottom, 26.7) | ||||||
|                     .padding(.horizontal, 13.3) |                     .padding(.horizontal, 13.3) | ||||||
|                      |                      | ||||||
|                     if !viewModel.isLoading { |                     if !viewModel.isLoading { | ||||||
|                         ContentMainRecommendSeriesView() |  | ||||||
|                          |  | ||||||
|                         ContentMainBannerView() |                         ContentMainBannerView() | ||||||
|                             .padding(.bottom, 26.7) |                             .padding(.bottom, 26.7) | ||||||
|                             .padding(.horizontal, 13.3) |                             .padding(.horizontal, 13.3) | ||||||
|                          |                          | ||||||
|  |                         ContentMainRecommendSeriesView() | ||||||
|  |                          | ||||||
|                         HStack(spacing: 8) { |                         HStack(spacing: 8) { | ||||||
|                             ZStack { |                             ZStack { | ||||||
|                                 Image("img_bg_short_play") |                                 Image("img_bg_short_play") | ||||||
| @@ -78,9 +87,6 @@ struct ContentMainView: View { | |||||||
|                         .padding(.bottom, 40) |                         .padding(.bottom, 40) | ||||||
|                         .padding(.horizontal, 13.3) |                         .padding(.horizontal, 13.3) | ||||||
|                          |                          | ||||||
|                         ContentMainMyStashView() |  | ||||||
|                             .padding(.horizontal, 13.3) |  | ||||||
|                          |  | ||||||
|                         ContentMainNewContentView() |                         ContentMainNewContentView() | ||||||
|                             .padding(.horizontal, 13.3) |                             .padding(.horizontal, 13.3) | ||||||
|                          |                          | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ struct OrderListAllView: View { | |||||||
|                                 .resizable() |                                 .resizable() | ||||||
|                                 .frame(width: 20, height: 20) |                                 .frame(width: 20, height: 20) | ||||||
|                              |                              | ||||||
|                             Text("구매목록") |                             Text("콘텐츠 보관함") | ||||||
|                                 .font(.custom(Font.bold.rawValue, size: 18.3)) |                                 .font(.custom(Font.bold.rawValue, size: 18.3)) | ||||||
|                                 .foregroundColor(Color(hex: "eeeeee")) |                                 .foregroundColor(Color(hex: "eeeeee")) | ||||||
|                         } |                         } | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ struct OrderListView: View { | |||||||
|     var body: some View { |     var body: some View { | ||||||
|         VStack(spacing: 0) { |         VStack(spacing: 0) { | ||||||
|             HStack(spacing: 0) { |             HStack(spacing: 0) { | ||||||
|                 Text("구매목록") |                 Text("콘텐츠 보관함") | ||||||
|                     .font(.custom(Font.bold.rawValue, size: 18)) |                     .font(.custom(Font.bold.rawValue, size: 18)) | ||||||
|                     .foregroundColor(Color(hex: "eeeeee")) |                     .foregroundColor(Color(hex: "eeeeee")) | ||||||
|                  |                  | ||||||
| @@ -21,7 +21,7 @@ struct OrderListView: View { | |||||||
|                  |                  | ||||||
|                 Text("전체보기") |                 Text("전체보기") | ||||||
|                     .font(.custom(Font.medium.rawValue, size: 11)) |                     .font(.custom(Font.medium.rawValue, size: 11)) | ||||||
|                     .foregroundColor(Color(hex: "bbbbbb")) |                     .foregroundColor(Color.graybb) | ||||||
|                     .onTapGesture { |                     .onTapGesture { | ||||||
|                         AppState.shared.setAppStep(step: .orderListAll) |                         AppState.shared.setAppStep(step: .orderListAll) | ||||||
|                     } |                     } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Yu Sung
					Yu Sung