From 9155a2f02ad63238fe75327bce094148cb2d443a Mon Sep 17 00:00:00 2001 From: Diogo Date: Wed, 6 Nov 2024 15:25:10 +0000 Subject: [PATCH] placeholders looking good and sync page sizes with android --- apps/ios/Shared/Model/SimpleXAPI.swift | 4 ++-- apps/ios/Shared/Views/Chat/ChatItemView.swift | 2 -- apps/ios/Shared/Views/Chat/ReverseList.swift | 6 +++++- apps/ios/SimpleXChat/ChatTypes.swift | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift index 45ac944e3d..3556780f58 100644 --- a/apps/ios/Shared/Model/SimpleXAPI.swift +++ b/apps/ios/Shared/Model/SimpleXAPI.swift @@ -318,8 +318,8 @@ private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] { throw r } -let loadItemsPerPage = 50 -let preloadItem = 8 +let loadItemsPerPage = 100 +let preloadItem = 25 let idealChatListSize = 500 func apiGetChat(type: ChatType, id: Int64, search: String = "") async throws -> (Chat, Int?) { diff --git a/apps/ios/Shared/Views/Chat/ChatItemView.swift b/apps/ios/Shared/Views/Chat/ChatItemView.swift index d462872f08..418c2d7c34 100644 --- a/apps/ios/Shared/Views/Chat/ChatItemView.swift +++ b/apps/ios/Shared/Views/Chat/ChatItemView.swift @@ -62,8 +62,6 @@ struct ChatItemView: View { CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, allowMenu: $allowMenu) } else if ci.content.msgContent == nil { ChatItemContentView(chat: chat, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case - } else if ci.isPlaceholder { - EmptyView() } else { framedItemView() } diff --git a/apps/ios/Shared/Views/Chat/ReverseList.swift b/apps/ios/Shared/Views/Chat/ReverseList.swift index 60d5dbe9a3..e7e55e8cf4 100644 --- a/apps/ios/Shared/Views/Chat/ReverseList.swift +++ b/apps/ios/Shared/Views/Chat/ReverseList.swift @@ -220,7 +220,11 @@ struct ReverseList: UIViewControllerRepresentable { var snapshot = NSDiffableDataSourceSnapshot() if let gap = gap { var itemsCopy = items - let blanks = (0.. ChatItem { + public static func placeholder(idx: Int, text: String, chatDir: CIDirection) -> ChatItem { var item = ChatItem( - chatDir: CIDirection.directSnd, + chatDir: chatDir, meta: CIMeta( itemId: Int64(idx * -10), itemTs: .now, - itemText: "", + itemText: text, itemStatus: .rcvRead, createdAt: .now, updatedAt: .now, @@ -2681,7 +2681,7 @@ public struct ChatItem: Identifiable, Decodable, Hashable { deletable: false, editable: false ), - content: .sndMsgContent(msgContent: .text("")), + content: .sndMsgContent(msgContent: .text(text)), quotedItem: nil, file: nil )