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

feat(home): 홈 탭 당겨서 새로고침을 추가한다

Browse Source
This commit is contained in:
Yu Sung
2026-08-18 13:29:55 +09:00
parent 9297cd28f9
commit d2561272c0
6 changed files with 131 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
SodaLive/Sources/V2/Main/Home/Following/MainHomeFollowingView.swift
View File

@@ -46,18 +46,15 @@ struct MainHomeFollowingView: View {
@ViewBuilder
private var content: some View {
if viewModel.isLoading {
ProgressView()
.tint(.white)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(Color.black)
if viewModel.isLoading && !viewModel.hasLoaded {
loadingContent
} else if viewModel.isLoginRequired {
MainHomeFollowingEmptyStateView(
emptyContent(
message: I18n.HomeFollowing.loginRequiredMessage,
loginAction: onTapLogin
)
} else if !viewModel.message.isEmpty {
MainHomeFollowingEmptyStateView(message: viewModel.message)
emptyContent(message: viewModel.message)
} else if let response = viewModel.response {
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 0) {
@@ -107,8 +104,41 @@ struct MainHomeFollowingView: View {
.padding(.bottom, SodaSpacing.s20)
}
.background(Color.black)
.refreshable {
await viewModel.refresh()
}
} else {
MainHomeFollowingEmptyStateView(message: I18n.HomeFollowing.emptyStateMessage)
emptyContent(message: I18n.HomeFollowing.emptyStateMessage)
}
}
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
ProgressView()
.tint(.white)
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.background(Color.black)
.refreshable {
await viewModel.refresh()
}
}
}
private func emptyContent(message: String, loginAction: (() -> Void)? = nil) -> some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
MainHomeFollowingEmptyStateView(
message: message,
loginAction: loginAction
)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
}

22
SodaLive/Sources/V2/Main/Home/Following/MainHomeFollowingViewModel.swift
View File

@@ -17,18 +17,16 @@ final class MainHomeFollowingViewModel: ObservableObject {
repository.getFollowing()
.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.response = nil
self.isLoginRequired = false
self.message = I18n.HomeFollowing.loadFailedMessage
self.hasLoaded = true
self.isLoading = false
self?.response = nil
self?.isLoginRequired = false
self?.message = I18n.HomeFollowing.loadFailedMessage
self?.hasLoaded = true
self?.isLoading = false
}
} receiveValue: { [weak self] response in
guard let self else { return }
@@ -60,6 +58,16 @@ final class MainHomeFollowingViewModel: ObservableObject {
}
.store(in: &subscription)
}
func refresh() async {
if !isLoading {
fetchFollowing()
}
for await isLoading in $isLoading.values {
if !isLoading { return }
}
}
}
private extension HomeFollowingTabResponse {

34
SodaLive/Sources/V2/Main/Home/Ranking/MainHomeRankingView.swift
View File

@@ -15,10 +15,9 @@ struct MainHomeRankingView: View {
.ignoresSafeArea()
if viewModel.isLoading && !viewModel.hasLoaded {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
loadingContent
} else if viewModel.items.isEmpty {
MainHomeRankingEmptyStateView()
emptyContent
} else {
rankingContent
}
@@ -30,6 +29,20 @@ struct MainHomeRankingView: View {
}
}
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) {
@@ -83,6 +96,21 @@ struct MainHomeRankingView: View {
.padding(.horizontal, SodaSpacing.s8)
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
MainHomeRankingEmptyStateView()
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var twoColumns: [GridItem] {

22
SodaLive/Sources/V2/Main/Home/Ranking/MainHomeRankingViewModel.swift
View File

@@ -17,18 +17,16 @@ final class MainHomeRankingViewModel: ObservableObject {
repository.getCreatorRankings()
.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.emptyMessage = I18n.HomeRanking.emptyStateMessage
self.hasLoaded = true
self.isLoading = false
self?.items = []
self?.showRankChange = false
self?.emptyMessage = I18n.HomeRanking.emptyStateMessage
self?.hasLoaded = true
self?.isLoading = false
}
} receiveValue: { [weak self] response in
guard let self else { return }
@@ -60,4 +58,14 @@ final class MainHomeRankingViewModel: ObservableObject {
}
.store(in: &subscription)
}
func refresh() async {
if !isLoading {
fetchRankings()
}
for await isLoading in $isLoading.values {
if !isLoading { return }
}
}
}

22
SodaLive/Sources/V2/Main/Home/Recommendation/MainHomeRecommendationView.swift
View File

@@ -18,9 +18,8 @@ struct MainHomeRecommendationView: View {
Color.black
.ignoresSafeArea()
if viewModel.isLoading && viewModel.recommendations == nil {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
if viewModel.isLoading && viewModel.recommendations == nil && viewModel.errorMessage.isEmpty {
loadingContent
} else {
ScrollView(showsIndicators: false) {
VStack(alignment: .leading, spacing: SodaSpacing.s24) {
@@ -83,6 +82,9 @@ struct MainHomeRecommendationView: View {
}
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
}
.onAppear {
@@ -114,6 +116,20 @@ struct MainHomeRecommendationView: View {
}
}
}
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()
}
}
}
}
struct MainHomeRecommendationView_Previews: PreviewProvider {

18
SodaLive/Sources/V2/Main/Home/Recommendation/MainHomeRecommendationViewModel.swift
View File

@@ -21,16 +21,14 @@ final class MainHomeRecommendationViewModel: ObservableObject {
repository.getRecommendations()
.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.Common.commonError
self.isShowPopup = true
self.isLoading = false
self?.errorMessage = I18n.Common.commonError
self?.isShowPopup = true
self?.isLoading = false
}
} receiveValue: { [weak self] response in
guard let self else { return }
@@ -58,6 +56,16 @@ final class MainHomeRecommendationViewModel: ObservableObject {
.store(in: &subscription)
}
func refresh() async {
if !isLoading {
fetchRecommendations()
}
for await isLoading in $isLoading.values {
if !isLoading { return }
}
}
func followAll(creatorIds: [Int], completionKey: String) {
guard !creatorIds.isEmpty, !completionKey.isEmpty else { return }
guard !completedFollowKeys.contains(completionKey), !followingKeys.contains(completionKey) else { return }