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

feat(content): 콘텐츠 탭 당겨서 새로고침을 추가한다

Browse Source
This commit is contained in:
Yu Sung
2026-08-18 13:30:15 +09:00
parent d2561272c0
commit bdd885a082
6 changed files with 135 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
SodaLive/Sources/V2/Main/Content/All/MainContentAllView.swift
View File

@@ -70,11 +70,9 @@ struct MainContentAllView: View {
sortBar
if viewModel.isLoading && viewModel.hasLoaded == false {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity, maxHeight: .infinity)
loadingContent
} else if viewModel.shouldShowEmptyState {
MainContentAudioEmptyStateView(message: I18n.MainContentAll.emptyStateMessage)
emptyContent
} else {
ScrollView(showsIndicators: false) {
gridContent
@@ -88,6 +86,35 @@ struct MainContentAllView: View {
.padding(.vertical, SodaSpacing.s20)
}
}
.refreshable {
await viewModel.refresh()
}
}
}
}
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
MainContentAudioEmptyStateView(message: I18n.MainContentAll.emptyStateMessage)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
@@ -197,4 +224,3 @@ struct MainContentAllView_Previews: PreviewProvider {
)
}
}

13
SodaLive/Sources/V2/Main/Content/All/MainContentAllViewModel.swift
View File

@@ -32,7 +32,7 @@ final class MainContentAllViewModel: ObservableObject {
}
func fetchFirstPageIfNeeded() {
guard hasLoaded == false else { return }
guard hasLoaded == false, isLoading == false else { return }
fetchFirstPage()
}
@@ -40,6 +40,16 @@ final class MainContentAllViewModel: ObservableObject {
fetchContents(page: 0, isNextPage: false)
}
func refresh() async {
if !isLoading {
fetchFirstPage()
}
for await isLoading in $isLoading.values {
if !isLoading { return }
}
}
func apply(type: MainContentAllType, sort: ContentSort) {
guard allowedSorts(for: type).contains(sort) else { return }
@@ -247,4 +257,3 @@ extension SeriesPublishedDaysOfWeek {
}
}
}

36
SodaLive/Sources/V2/Main/Content/Ranking/MainContentRankingView.swift
View File

@@ -22,12 +22,9 @@ struct MainContentRankingView: View {
)
if viewModel.isLoading && !viewModel.hasLoaded {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity, maxHeight: .infinity)
loadingContent
} else if viewModel.shouldShowEmptyState {
MainContentAudioRankingEmptyStateView(message: viewModel.emptyStateMessage)
.frame(maxWidth: .infinity, maxHeight: .infinity)
emptyContent
} else {
rankingContent
}
@@ -41,6 +38,20 @@ struct MainContentRankingView: View {
.sodaToast(isPresented: $viewModel.isShowPopup, message: viewModel.errorMessage, autohideIn: 2)
}
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var rankingContent: some View {
ScrollView(showsIndicators: false) {
VStack(alignment: .leading, spacing: SodaSpacing.s8) {
@@ -93,6 +104,21 @@ struct MainContentRankingView: View {
.padding(.horizontal, SodaSpacing.s8)
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
MainContentAudioRankingEmptyStateView(message: viewModel.emptyStateMessage)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var twoColumns: [GridItem] {

24
SodaLive/Sources/V2/Main/Content/Ranking/MainContentRankingViewModel.swift
View File

@@ -32,19 +32,17 @@ final class MainContentRankingViewModel: ObservableObject {
repository.getAudioRankings(type: selectedType)
.sink { [weak self] result in
guard let self else { return }
switch result {
case .finished:
DEBUG_LOG("finish")
case .failure(let error):
ERROR_LOG(error.localizedDescription)
self.items = []
self.showRankChange = false
self.errorMessage = I18n.MainContentRanking.loadFailedMessage
self.isShowPopup = true
self.isLoading = false
self.hasLoaded = true
self?.items = []
self?.showRankChange = false
self?.errorMessage = I18n.MainContentRanking.loadFailedMessage
self?.isShowPopup = true
self?.isLoading = false
self?.hasLoaded = true
}
} receiveValue: { [weak self] response in
guard let self else { return }
@@ -79,6 +77,16 @@ final class MainContentRankingViewModel: ObservableObject {
.store(in: &subscription)
}
func refresh() async {
if !isLoading {
fetchRankings()
}
for await isLoading in $isLoading.values {
if !isLoading { return }
}
}
func selectType(_ type: AudioRankingType) {
guard selectedType != type else { return }

36
SodaLive/Sources/V2/Main/Content/Recommendation/MainContentRecommendationView.swift
View File

@@ -17,11 +17,10 @@ struct MainContentRecommendationView: View {
Color.black
.ignoresSafeArea()
if viewModel.isLoading && viewModel.recommendations == nil {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
if viewModel.isLoading && !viewModel.hasLoaded {
loadingContent
} else if viewModel.shouldShowEmptyState {
MainContentAudioEmptyStateView(message: viewModel.emptyStateMessage)
emptyContent
} else {
ScrollView(showsIndicators: false) {
VStack(alignment: .leading, spacing: SodaSpacing.s24) {
@@ -81,6 +80,9 @@ struct MainContentRecommendationView: View {
}
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
}
.onAppear {
@@ -94,4 +96,30 @@ struct MainContentRecommendationView: View {
autohideIn: 2
)
}
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
MainContentAudioEmptyStateView(message: viewModel.emptyStateMessage)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
}

20
SodaLive/Sources/V2/Main/Content/Recommendation/MainContentRecommendationViewModel.swift
View File

@@ -30,17 +30,15 @@ final class MainContentRecommendationViewModel: ObservableObject {
repository.getAudioRecommendations()
.sink { [weak self] result in
guard let self else { return }
switch result {
case .finished:
DEBUG_LOG("finish")
case .failure(let error):
ERROR_LOG(error.localizedDescription)
self.errorMessage = I18n.MainContentRecommendation.loadFailedMessage
self.isShowPopup = true
self.isLoading = false
self.hasLoaded = true
self?.errorMessage = I18n.MainContentRecommendation.loadFailedMessage
self?.isShowPopup = true
self?.isLoading = false
self?.hasLoaded = true
}
} receiveValue: { [weak self] response in
guard let self else { return }
@@ -69,4 +67,14 @@ final class MainContentRecommendationViewModel: ObservableObject {
}
.store(in: &subscription)
}
func refresh() async {
if !isLoading {
fetchRecommendations()
}
for await isLoading in $isLoading.values {
if !isLoading { return }
}
}
}