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

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

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] {

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 }