feat(home): 홈 탭 당겨서 새로고침을 추가한다
This commit is contained in:
@@ -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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user