Thread Notifications & Badges

Config/CommonConfiguration.swift

@@ -74,6 +74,9 @@ class CommonConfiguration: NSObject, Configurable {
 
         // Disable key backup on common
         sdkOptions.enableKeyBackupWhenStartingMXCrypto = false
+
+        // Pass threading option to the SDK
+        sdkOptions.enableThreads = RiotSettings.shared.enableThreads
 
         sdkOptions.clientPermalinkBaseUrl = BuildSettings.clientPermalinkBaseUrl
 

Riot/Categories/UIImage.swift

@@ -59,6 +59,7 @@ extension UIImage {
 
     // Based on https://stackoverflow.com/a/31314494
     @objc func vc_resized(with targetSize: CGSize) -> UIImage? {
+        let originalRenderingMode = self.renderingMode
         let size = self.size
 
         let widthRatio  = targetSize.width/size.width
@@ -79,7 +80,7 @@ extension UIImage {
         let newImage = UIGraphicsGetImageFromCurrentImageContext()
         UIGraphicsEndImageContext()
 
-        return newImage
+        return newImage?.withRenderingMode(originalRenderingMode)
     }
 
     @objc func vc_notRenderedImage() -> UIImage {

Riot/Modules/Application/LegacyAppDelegate.m

@@ -1252,8 +1252,8 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
 {
     NSString *fragment = universalLinkParameters.fragment;
     NSURL *universalLinkURL = universalLinkParameters.universalLinkURL;
-    ScreenPresentationParameters *screenPresentationParameters = universalLinkParameters.presentationParameters;
-    BOOL restoreInitialDisplay = screenPresentationParameters.restoreInitialDisplay;
+    ScreenPresentationParameters *presentationParameters = universalLinkParameters.presentationParameters;
+    BOOL restoreInitialDisplay = presentationParameters.restoreInitialDisplay;
 
     BOOL continueUserActivity = NO;
     MXKAccountManager *accountManager = [MXKAccountManager sharedManager];
@@ -1281,7 +1281,6 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
     }
 
     NSString *roomIdOrAlias;
-    ThreadParameters *threadParameters;
     NSString *eventId;
     NSString *userId;
     NSString *groupId;
@@ -1356,7 +1355,7 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
 
                 if (room.summary.roomType == MXRoomTypeSpace)
                 {
-                    SpaceNavigationParameters *spaceNavigationParameters = [[SpaceNavigationParameters alloc] initWithRoomId:room.roomId mxSession:account.mxSession presentationParameters:screenPresentationParameters];
+                    SpaceNavigationParameters *spaceNavigationParameters = [[SpaceNavigationParameters alloc] initWithRoomId:room.roomId mxSession:account.mxSession presentationParameters:presentationParameters];
 
                     [self showSpaceWithParameters:spaceNavigationParameters];
                 }
@@ -1365,25 +1364,60 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
                     // Open the room page
                     if (eventId)
                     {
-                        MXEvent *event = [account.mxSession.store eventWithEventId:eventId inRoom:roomId];
-                        if (event.threadId)
-                        {
-                            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.threadId
-                                                                          stackRoomScreen:YES];
-                        }
-                        else if ([account.mxSession.threadingService isEventThreadRoot:event])
+                        __block MXEvent *event = [account.mxSession.store eventWithEventId:eventId inRoom:roomId];
+                        dispatch_group_t eventDispatchGroup = dispatch_group_create();
+
+                        if (event == nil)
                         {
-                            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.eventId
-                                                                          stackRoomScreen:YES];
+                            dispatch_group_enter(eventDispatchGroup);
+                            //  event doesn't exist in the store
+                            [account.mxSession eventWithEventId:eventId
+                                                         inRoom:roomId
+                                                        success:^(MXEvent *eventFromServer) {
+                                event = eventFromServer;
+                                dispatch_group_leave(eventDispatchGroup);
+                            } failure:^(NSError *error) {
+                                dispatch_group_leave(eventDispatchGroup);
+                            }];
                         }
+
+                        dispatch_group_notify(eventDispatchGroup, dispatch_get_main_queue(), ^{
+                            if (event == nil)
+                            {
+                                return;
+                            }
+
+                            ThreadParameters *threadParameters = nil;
+                            if (event.threadId)
+                            {
+                                threadParameters = [[ThreadParameters alloc] initWithThreadId:event.threadId
+                                                                              stackRoomScreen:NO];
+                            }
+                            else if ([account.mxSession.threadingService threadWithId:eventId])
+                            {
+                                threadParameters = [[ThreadParameters alloc] initWithThreadId:eventId
+                                                                              stackRoomScreen:NO];
+                            }
+
+                            RoomNavigationParameters *parameters = [[RoomNavigationParameters alloc] initWithRoomId:roomId
+                                                                                                            eventId:eventId
+                                                                                                          mxSession:account.mxSession
+                                                                                                   threadParameters:threadParameters
+                                                                                             presentationParameters:presentationParameters];
+                            [self showRoomWithParameters:parameters];
+                        });
+                    }
+                    else
+                    {
+                        //  open the regular room timeline
+                        RoomNavigationParameters *parameters = [[RoomNavigationParameters alloc] initWithRoomId:roomId
+                                                                                                        eventId:eventId
+                                                                                                      mxSession:account.mxSession
+                                                                                               threadParameters:nil
+                                                                                         presentationParameters:presentationParameters];
+
+                        [self showRoomWithParameters:parameters];
                     }
-                    RoomNavigationParameters *roomNavigationParameters = [[RoomNavigationParameters alloc] initWithRoomId:roomId
-                                                                                                                  eventId:eventId
-                                                                                                                mxSession:account.mxSession
-                                                                                                         threadParameters:threadParameters
-                                                                                                   presentationParameters:screenPresentationParameters];
-
-                    [self showRoomWithParameters:roomNavigationParameters];
                 }
 
                 continueUserActivity = YES;
@@ -1431,7 +1465,7 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
                                     {
                                         universalLinkFragmentPendingRoomAlias = @{roomId: roomIdOrAlias};
 
-                                        UniversalLinkParameters *newParameters = [[UniversalLinkParameters alloc] initWithFragment:newUniversalLinkFragment universalLinkURL:universalLinkURL presentationParameters:screenPresentationParameters];
+                                        UniversalLinkParameters *newParameters = [[UniversalLinkParameters alloc] initWithFragment:newUniversalLinkFragment universalLinkURL:universalLinkURL presentationParameters:presentationParameters];
 
                                         [self handleUniversalLinkWithParameters:newParameters];
                                     }
@@ -1490,14 +1524,14 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
                                 roomPreviewData.viaServers = queryParams[@"via"];
                             }
 
-                            RoomPreviewNavigationParameters *roomPreviewNavigationParameters = [[RoomPreviewNavigationParameters alloc] initWithPreviewData:roomPreviewData presentationParameters:screenPresentationParameters];
+                            RoomPreviewNavigationParameters *roomPreviewNavigationParameters = [[RoomPreviewNavigationParameters alloc] initWithPreviewData:roomPreviewData presentationParameters:presentationParameters];
 
                             [account.mxSession.matrixRestClient roomSummaryWith:roomIdOrAlias via:roomPreviewData.viaServers success:^(MXPublicRoom *room) {
                                 if ([room.roomTypeString isEqualToString:MXRoomTypeStringSpace])
                                 {
                                     [homeViewController stopActivityIndicator];
 
-                                    SpacePreviewNavigationParameters *spacePreviewNavigationParameters = [[SpacePreviewNavigationParameters alloc] initWithPublicRoom:room mxSession:account.mxSession presentationParameters:screenPresentationParameters];
+                                    SpacePreviewNavigationParameters *spacePreviewNavigationParameters = [[SpacePreviewNavigationParameters alloc] initWithPublicRoom:room mxSession:account.mxSession presentationParameters:presentationParameters];
 
                                     [self showSpacePreviewWithParameters:spacePreviewNavigationParameters];  
                                 }
@@ -1575,7 +1609,7 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
 
         // Create the contact related to this member
         MXKContact *contact = [[MXKContact alloc] initMatrixContactWithDisplayName:displayName andMatrixID:userId];
-        [self showContact:contact presentationParameters:screenPresentationParameters];
+        [self showContact:contact presentationParameters:presentationParameters];
 
         continueUserActivity = YES;
     }
@@ -1594,7 +1628,7 @@ - (BOOL)handleUniversalLinkWithParameters:(UniversalLinkParameters*)universalLin
             }
 
             // Display the group details
-            [self showGroup:group withMatrixSession:account.mxSession presentationParamters:screenPresentationParameters];
+            [self showGroup:group withMatrixSession:account.mxSession presentationParamters:presentationParameters];
 
             continueUserActivity = YES;
         }

Riot/Modules/Common/Views/BadgedBarButtonItem.swift

@@ -0,0 +1,121 @@
+// 
+// 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 UIKit
+
+@objcMembers
+class BadgedBarButtonItem: UIBarButtonItem {
+
+    var baseButton: UIButton
+    private var badgeLabel: UILabel
+
+    private var theme: Theme = ThemeService.shared().theme
+
+    var badgeText: String? {
+        didSet {
+            updateBadgeLabel()
+        }
+    }
+    var badgeBackgroundColor: UIColor {
+        didSet {
+            updateBadgeLabel()
+        }
+    }
+    var badgeTextColor: UIColor {
+        didSet {
+            updateBadgeLabel()
+        }
+    }
+    var badgeFont: UIFont {
+        didSet {
+            updateBadgeLabel()
+        }
+    }
+    var badgePadding: UIOffset {
+        didSet {
+            updateBadgeLabel()
+        }
+    }
+
+    private var shouldHideBadge: Bool {
+        guard let text = badgeText else {
+            return true
+        }
+        return text.isEmpty || text == "0" || text == "nil" || text == "null"
+    }
+
+    init(withBaseButton baseButton: UIButton) {
+        self.baseButton = baseButton
+        badgeBackgroundColor = .gray
+        badgeTextColor = .white
+        badgeFont = .systemFont(ofSize: 12, weight: .semibold)
+        badgePadding = UIOffset(horizontal: 8, vertical: 2)
+        badgeLabel = UILabel(frame: .zero)
+        badgeLabel.textAlignment = .center
+        badgeLabel.clipsToBounds = true
+        baseButton.addSubview(badgeLabel)
+        super.init()
+        customView = baseButton
+        update(theme: theme)
+        updateBadgeLabel()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    private func updateBadgeLabel() {
+        badgeLabel.isHidden = shouldHideBadge
+        badgeLabel.backgroundColor = badgeBackgroundColor
+        badgeLabel.font = badgeFont
+        badgeLabel.textColor = badgeTextColor
+
+        let labelSize = calculateLabelSize()
+        var width = labelSize.width + badgePadding.horizontal
+        let height = labelSize.height + badgePadding.vertical
+        if width < height {
+            //  let width at least be as height
+            width = height
+        }
+        baseButton.sizeToFit()
+        badgeLabel.frame = CGRect(x: baseButton.frame.width - baseButton.contentEdgeInsets.right - width/2,
+                                  y: baseButton.contentEdgeInsets.top - height/2,
+                                  width: width,
+                                  height: height)
+        badgeLabel.text = badgeText
+        badgeLabel.layer.cornerRadius = badgeLabel.frame.height/2
+    }
+
+    private func calculateLabelSize() -> CGSize {
+        let tmpLabel = UILabel(frame: badgeLabel.frame)
+        tmpLabel.font = badgeFont
+        tmpLabel.text = badgeText
+        tmpLabel.sizeToFit()
+        return tmpLabel.frame.size
+    }
+
+}
+
+extension BadgedBarButtonItem: Themable {
+
+    func update(theme: Theme) {
+        self.theme = theme
+
+        tintColor = theme.colors.accent
+        baseButton.tintColor = theme.colors.accent
+    }
+
+}