ios: events ordering

apps/ios/Shared/Model/ChatModel.swift

@@ -556,9 +556,10 @@ final class ChatModel: ObservableObject {
     }
 
     // this function analyses "connected" events and assumes that each member will be there only once
-    func getConnectedMemberNames(_ chatItem: ChatItem) -> (Int, [String]) {
+    func getConnectedMemberNames(_ chatItem: ChatItem) -> (Int, [String], String?) {
         var count = 0
         var ns: [String] = []
+        var lastNonConnectedEvent: String? = nil
         if let ciCategory = chatItem.mergeCategory,
            var i = getChatItemIndex(chatItem) {
             while i < reversedChatItems.count {
@@ -566,12 +567,14 @@ final class ChatModel: ObservableObject {
                 if ci.mergeCategory != ciCategory { break }
                 if let m = ci.memberConnected {
                     ns.append(m.displayName)
+                } else if count == 0 {
+                    lastNonConnectedEvent = if let name = ci.memberDisplayName { name + " " + ci.text } else { ci.text }
                 }
                 count += 1
                 i += 1
             }
         }
-        return (count, ns)
+        return (count, ns, lastNonConnectedEvent)
     }
 
     // returns the index of the passed item and the next item (it has smaller index)

apps/ios/Shared/Views/Chat/ChatItemView.swift

@@ -149,7 +149,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private var mergedGroupEventText: Text? {
-        let (count, ns) = chatModel.getConnectedMemberNames(chatItem)
+        let (count, ns, lastNonConnectedEvent) = chatModel.getConnectedMemberNames(chatItem)
         let members: LocalizedStringKey =
             switch ns.count {
             case 1: "\(ns[0]) connected"
@@ -162,6 +162,8 @@ struct ChatItemContentView<Content: View>: View {
             }
         return if count <= 1 {
             nil
+        } else if let last = lastNonConnectedEvent {
+            Text(last) + Text(" ") + Text("and \(count - ns.count) other events")
         } else if ns.count == 0 {
             Text("\(count) group events")
         } else if count > ns.count {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -494,10 +494,11 @@ object ChatModel {
   }
 
   // this function analyses "connected" events and assumes that each member will be there only once
-  fun getConnectedMemberNames(cItem: ChatItem): Pair<Int, List<String>> {
+  fun getConnectedMemberNames(cItem: ChatItem): Triple<Int, List<String>, String?> {
     var count = 0
     val ns = mutableListOf<String>()
     var idx = getChatItemIndexOrNull(cItem)
+    var lastNonConnectedEvent: String? = null
     if (cItem.mergeCategory != null && idx != null) {
       val reversedChatItems = chatItems.asReversed()
       while (idx < reversedChatItems.size) {
@@ -506,12 +507,14 @@ object ChatModel {
         val m = ci.memberConnected
         if (m != null) {
           ns.add(m.displayName)
+        } else if (count == 0) {
+          lastNonConnectedEvent = if (ci.memberDisplayName != null) ci.memberDisplayName + " " + ci.text else ci.text
         }
         count++
         idx++
       }
     }
-    return count to ns
+    return Triple(count, ns, lastNonConnectedEvent)
   }
 
   // returns the index of the passed item and the next item (it has smaller index)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt

@@ -332,7 +332,7 @@ fun ChatItemView(
         }
 
         fun mergedGroupEventText(chatItem: ChatItem): String? {
-          val (count, ns) = chatModel.getConnectedMemberNames(chatItem)
+          val (count, ns, lastNonConnectedEvent) = chatModel.getConnectedMemberNames(chatItem)
           val members = when {
             ns.size == 1 -> String.format(generalGetString(MR.strings.rcv_group_event_1_member_connected), ns[0])
             ns.size == 2 -> String.format(generalGetString(MR.strings.rcv_group_event_2_members_connected), ns[0], ns[1])
@@ -342,6 +342,8 @@ fun ChatItemView(
           }
           return if (count <= 1) {
             null
+          } else if (lastNonConnectedEvent != null) {
+            lastNonConnectedEvent + " " + generalGetString(MR.strings.rcv_group_and_other_events).format(count - ns.size)
           } else if (ns.isEmpty()) {
             generalGetString(MR.strings.rcv_group_events_count).format(count)
           } else if (count > ns.size) {