From 511bb11550d501822a14bf7ed1ffba8e095856fb Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Tue, 7 May 2024 18:45:05 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EC=B2=9C=20=EC=8B=9C=EB=A6=AC?= =?UTF-8?q?=EC=A6=88,=20=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=BD=98=ED=85=90?= =?UTF-8?q?=EC=B8=A0,=20=EC=A7=80=EA=B8=88=20=EB=9D=BC=EC=9D=B4=EB=B8=8C?= =?UTF-8?q?=EC=A4=91=20-=20=EC=83=88=EB=A1=9C=EA=B3=A0=EC=B9=A8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContentMainNewContentView.swift | 18 ++++++++++++++ .../ContentMainRecommendSeriesView.swift | 17 +++++++++++++ .../Sources/Live/Now/SectionLiveNowView.swift | 24 ++++++++++++++----- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift b/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift index 8911393..07f79be 100644 --- a/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift +++ b/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift @@ -48,6 +48,24 @@ struct ContentMainNewContentView: View { } } + HStack(spacing: 8) { + Image("ic_refresh") + + Text("새로고침") + .font(.custom(Font.medium.rawValue, size: 14.7)) + .foregroundColor(Color.grayd2) + } + .padding(.vertical, 11) + .frame(maxWidth: .infinity) + .overlay( + RoundedRectangle(cornerRadius: 26.7) + .stroke(Color.gray90, lineWidth: 1) + ) + .onTapGesture { + viewModel.getThemeList() + viewModel.getNewContentOfTheme() + } + if viewModel.isLoading { ActivityIndicatorView() .frame(width: 100, height: 100) diff --git a/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift b/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift index 0299eeb..78daccd 100644 --- a/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift +++ b/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift @@ -27,6 +27,23 @@ struct ContentMainRecommendSeriesView: View { } } } + + HStack(spacing: 8) { + Image("ic_refresh") + + Text("새로고침") + .font(.custom(Font.medium.rawValue, size: 14.7)) + .foregroundColor(Color.grayd2) + } + .padding(.vertical, 11) + .frame(maxWidth: .infinity) + .overlay( + RoundedRectangle(cornerRadius: 26.7) + .stroke(Color.gray90, lineWidth: 1) + ) + .onTapGesture { + viewModel.getRecommendSeriesList() + } } .padding(.bottom, 26.7) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift index 291bb74..bdfac93 100644 --- a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift +++ b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift @@ -26,12 +26,6 @@ struct SectionLiveNowView: View { .font(.custom(Font.bold.rawValue, size: 18.3)) .foregroundColor(Color(hex: "ff5c49")) - Image("ic_refresh") - .padding(.leading, 10) - .onTapGesture { - onClickRefresh() - } - Spacer() if items.count > 0 { @@ -88,6 +82,24 @@ struct SectionLiveNowView: View { .background(Color(hex: "13181b")) .cornerRadius(4.7) } + + HStack(spacing: 8) { + Image("ic_refresh") + + Text("새로고침") + .font(.custom(Font.medium.rawValue, size: 14.7)) + .foregroundColor(Color.grayd2) + } + .padding(.vertical, 11) + .frame(maxWidth: .infinity) + .overlay( + RoundedRectangle(cornerRadius: 26.7) + .stroke(Color.gray90, lineWidth: 1) + ) + .padding(.horizontal, 13.3) + .onTapGesture { + onClickRefresh() + } } } }