From 81846f7f7bc277bf05c8992df5a1f7f05245313b Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Wed, 21 Aug 2024 21:49:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20-=20=EC=9A=B0=EC=B8=A1=20=EC=B5=9C=EC=83=81?= =?UTF-8?q?=EB=8B=A8=EC=97=90=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=B3=B4?= =?UTF-8?q?=EA=B4=80=ED=95=A8=20-=20=EB=B0=B0=EB=84=88=EC=99=80=20?= =?UTF-8?q?=EC=B6=94=EC=B2=9C=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EC=88=9C?= =?UTF-8?q?=EC=84=9C=20=EB=B3=80=EA=B2=BD=20-=20=EB=82=B4=20=EB=B3=B4?= =?UTF-8?q?=EA=B4=80=ED=95=A8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_content_keep.imageset/Contents.json | 21 ++++++++++++++ .../ic_content_keep.png | Bin 0 -> 824 bytes .../Content/Main/ContentMainView.swift | 26 +++++++++++------- .../MyPage/OrderList/OrderListAllView.swift | 2 +- .../MyPage/OrderList/OrderListView.swift | 4 +-- 5 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/Contents.json create mode 100644 SodaLive/Resources/Assets.xcassets/ic_content_keep.imageset/ic_content_keep.png 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 0000000000000000000000000000000000000000..3990aeab4f09213b36cbab70eac72b8e33679f87 GIT binary patch literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&di3`}P|T^vIy7~jru%)9I$;_$!cw(b#g4?l<9 z&YB%5jJ{;<}G;1drMd#??SAGj?fa7B=`Oa(n}fybRPYm>8QI(Yk9rQ?M~aj z`NBu#R6kArf9A(|d1j6#1rDdkzzu5W+q&6SKH$~Nnjyc^DKemd)r)tTzP#*CQ~wi} zA1;z&IasZb<x<0|Dm@~(>G35F$MUeb!5!+>^$$w^SnX+Ik%_5MKQZIw!{n)7 z>n%BrY&vbdDoirlmp?FES9>Au&cVC)4H(XQnw+_>ni(;5Vn~x5lTwExi(!WXo8S?J zCJ7gTW{xBQM;;VGE?p17c@q!SI{aaXUNobrIUM zX+Bdse%Cnj&d0mL@wXq|sVRAV_~;FtjWYRJf(s?eC&coZ{mh+Qvi|7FooCm`@}(`4 zm7J(1Y~McT<}QWX=imH0bZg60ouB!xib=-rH{6cvxLMb>qFmN0yHL0+?do=UhA)cj z+te~{tuj$m&U10(J7I&(*(=q$wuwkgeW$^yf97+@)#E~YLz+BZU;IC5-I>=%yBb?0 zV7^nV-E}yHIkY9+yTNhR9lv=wi+C*Ll-n6*tF5f#oHt49NY1V+>#Q1%FA>_}vU2ji z>5INuMm|zIp?CU7!gi0w=Q}tT{rIZB_Os^{aZYtdmmjL{cHG^XUar`5+=BBG%X4kN zP?48`e?Om3jz4_1GWh+$&y=*hrQL`-TPTXEbvP7)yUsHn-#2=1h@EApRHB8 zXmdi0=f)~7|92|OvpsAAw@g~Z@xAkfj8{*kPthu_$lq5*rqw(D5!$5{pr*d|)WpgA o&e{3g`V%eA;wZqf@XjCBKOIliwQsg`0~0!fr>mdKI;Vst04E?`r2qf` literal 0 HcmV?d00001 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) }