diff --git a/SodaLive/Sources/Message/Text/TextMessageView.swift b/SodaLive/Sources/Message/Text/TextMessageView.swift index ef7234c..9a9cd0c 100644 --- a/SodaLive/Sources/Message/Text/TextMessageView.swift +++ b/SodaLive/Sources/Message/Text/TextMessageView.swift @@ -22,7 +22,8 @@ struct TextMessageView: View { ScrollView(.vertical, showsIndicators: false) { if viewModel.items.count > 0 { LazyVStack(spacing: 26.7) { - ForEach(viewModel.items, id: \.self) { item in + ForEach(0...self, from: responseData) if let data = decoded.data, decoded.success { - self.items.append(contentsOf: data.items) + if data.items.count <= 0 { + self.isLast = true + } else { + self.items.append(contentsOf: data.items) + self.page += 1 + } } else { if let message = decoded.message { self.errorMessage = message @@ -171,7 +178,12 @@ final class TextMessageViewModel: ObservableObject { let decoded = try jsonDecoder.decode(ApiResponse.self, from: responseData) if let data = decoded.data, decoded.success { - self.items.append(contentsOf: data.items) + if data.items.count <= 0 { + self.isLast = true + } else { + self.items.append(contentsOf: data.items) + self.page += 1 + } } else { if let message = decoded.message { self.errorMessage = message @@ -214,7 +226,12 @@ final class TextMessageViewModel: ObservableObject { let decoded = try jsonDecoder.decode(ApiResponse.self, from: responseData) if let data = decoded.data, decoded.success { - self.items.append(contentsOf: data.items) + if data.items.count <= 0 { + self.isLast = true + } else { + self.items.append(contentsOf: data.items) + self.page += 1 + } } else { if let message = decoded.message { self.errorMessage = message diff --git a/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift b/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift index 36f64cf..4f83d6c 100644 --- a/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift +++ b/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift @@ -57,15 +57,17 @@ final class VoiceMessageViewModel: ObservableObject { } func loadMessage() { - switch currentFilter { - case .receive: - getReceivedVoiceMessage() - - case .sent: - getSentVoiceMessage() - - case .keep: - getKeepVoiceMessage() + if !isLast { + switch currentFilter { + case .receive: + getReceivedVoiceMessage() + + case .sent: + getSentVoiceMessage() + + case .keep: + getKeepVoiceMessage() + } } }