Architecture update

Riot/Modules/Common/Recents/Model/DiscussionsCount.swift

@@ -0,0 +1,60 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// Noticiations counts per section
+@objcMembers
+public class DiscussionsCount: NSObject {
+    /// Number of notified rooms with regular notifications
+    public let numberOfNotified: Int
+    
+    /// Number of highlighted rooms with mentions like notications
+    public let numberOfHighlighted: Int
+    
+    /// Number of rooms that has unsent messages in it
+    public let numberOfUnsent: Int
+    
+    /// Flag indicating is there any unsent
+    public var hasUnsent: Bool {
+        return numberOfUnsent > 0
+    }
+    
+    /// Flag indicating is there any highlight
+    public var hasHighlight: Bool {
+        return numberOfHighlighted > 0
+    }
+    
+    public static let zero: DiscussionsCount = DiscussionsCount(numberOfNotified: 0,
+                                                                numberOfHighlighted: 0,
+                                                                numberOfUnsent: 0)
+    
+    public init(numberOfNotified: Int,
+                numberOfHighlighted: Int,
+                numberOfUnsent: Int) {
+        self.numberOfNotified = numberOfNotified
+        self.numberOfHighlighted = numberOfHighlighted
+        self.numberOfUnsent = numberOfUnsent
+        super.init()
+    }
+    
+    public init(withRoomListDataCounts counts: MXRoomListDataCounts) {
+        self.numberOfNotified = counts.numberOfNotifiedRooms
+        self.numberOfHighlighted = counts.numberOfHighlightedRooms + counts.numberOfInvitedRooms
+        self.numberOfUnsent = counts.numberOfUnsentRooms
+        super.init()
+    }
+}

Riot/Modules/Common/Recents/Model/RecentCellData.h

@@ -0,0 +1,27 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import <MatrixSDK/MatrixSDK.h>
+
+#import <MatrixKit/MatrixKit.h>
+
+/**
+ `RecentCellData` is Vector cuustomized MXKRecentCellData` cell.
+ */
+@interface RecentCellData : MXKRecentCellData
+
+@end

Riot/Modules/Common/Recents/Model/RecentCellData.m

@@ -0,0 +1,75 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "RecentCellData.h"
+
+#import "MXRoom+Riot.h"
+#import "MatrixSDK-Swift.h"
+
+#ifdef IS_SHARE_EXTENSION
+#import "RiotShareExtension-Swift.h"
+#else
+#import "Riot-Swift.h"
+#endif
+
+@implementation RecentCellData
+
+//  Adds K handling to super implementation
+- (NSString*)notificationCountStringValue
+{
+    NSString *stringValue;
+    NSUInteger notificationCount = self.notificationCount;
+    
+    if (notificationCount > 1000)
+    {
+        CGFloat value = notificationCount / 1000.0;
+        stringValue = [VectorL10n largeBadgeValueKFormat:value];
+    }
+    else
+    {
+        stringValue = [NSString stringWithFormat:@"%tu", notificationCount];
+    }
+    
+    return stringValue;
+}
+
+//  Adds mentions-only handling to super implementation
+- (NSUInteger)notificationCount
+{
+    MXRoom *room = [self.mxSession roomWithRoomId:self.roomSummary.roomId];
+    // Ignore the regular notification count if the room is in 'mentions only" mode at the Riot level.
+    if (room.isMentionsOnly)
+    {
+        // Only the highlighted missed messages must be considered here.
+        return super.highlightCount;
+    }
+    
+    return super.notificationCount;
+}
+
+//  Adds "Empty Room" case to super implementation
+- (NSString *)roomDisplayname
+{
+    NSString *result = [super roomDisplayname];
+    if (!result.length)
+    {
+        result = [MatrixKitL10n roomDisplaynameEmptyRoom];
+    }
+    return result;
+}
+
+@end