Add mark as unread option for rooms

Riot/Assets/en.lproj/Vector.strings

@@ -1993,6 +1993,7 @@ Tap the + to start adding people.";
 "home_context_menu_normal_priority" = "Normal priority";
 "home_context_menu_leave" = "Leave";
 "home_context_menu_mark_as_read" = "Mark as read";
+"home_context_menu_mark_as_unread" = "Mark as unread";
 "home_syncing" = "Syncing";
 
 // MARK: - Favourites

Riot/Generated/Strings.swift

@@ -2543,6 +2543,10 @@ public class VectorL10n: NSObject {
   public static var homeContextMenuMarkAsRead: String { 
     return VectorL10n.tr("Vector", "home_context_menu_mark_as_read") 
   }
+  /// Mark as unread
+  public static var homeContextMenuMarkAsUnread: String { 
+    return VectorL10n.tr("Vector", "home_context_menu_mark_as_unread") 
+  }
   /// Mute
   public static var homeContextMenuMute: String { 
     return VectorL10n.tr("Vector", "home_context_menu_mute") 

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -2471,6 +2471,11 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
     editedRoomId = nil;
 }
 
+-(void)roomContextActionServiceDidMarkedRoom:(id<RoomContextActionServiceProtocol>)service
+{
+    [self refreshRecentsTable];
+}
+
 #pragma mark - RecentCellContextMenuProviderDelegate
 
 - (void)recentCellContextMenuProviderDidStartShowingPreview:(RecentCellContextMenuProvider *)menuProvider

Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift

@@ -34,7 +34,7 @@ class RoomActionProvider: RoomActionProviderProtocol {
     
     var menu: UIMenu {
         if service.isRoomJoined {
-            var children = service.hasUnread ? [self.markAsReadAction] : []
+            var children = service.hasUnread ? [self.markAsReadAction] : [self.markAsUnreadAction]
             children.append(contentsOf: [
                 self.directChatAction,
                 self.notificationsAction,
@@ -113,6 +113,14 @@ class RoomActionProvider: RoomActionProviderProtocol {
                 self.service.markAsRead()
         }
     }
+    private var markAsUnreadAction: UIAction {
+        return UIAction(
+            title: VectorL10n.homeContextMenuMarkAsUnread,
+            image: UIImage(systemName: "envelope")) { [weak self] action in
+                guard let self = self else { return }
+                self.service.markAsUnread()
+        }
+    }
     
     private var leaveAction: UIAction {
         let image = UIImage(systemName: "rectangle.righthalf.inset.fill.arrow.right")

Riot/Modules/ContextMenu/Services/RoomContextActionService.swift

@@ -38,7 +38,7 @@ class RoomContextActionService: NSObject, RoomContextActionServiceProtocol {
         self.room = room
         self.delegate = delegate
         self.isRoomJoined = room.summary?.isJoined ?? false
-        self.hasUnread = room.summary?.hasAnyUnread ?? false
+        self.hasUnread = (room.summary?.hasAnyUnread ?? false) || room.isMarkedAsUnread
         self.roomMembership = room.summary?.membership ?? .unknown
         self.session = room.mxSession
         self.unownedRoomService = UnownedRoomContextActionService(roomId: room.roomId, canonicalAlias: room.summary?.aliases?.first, session: self.session, delegate: delegate)
@@ -108,6 +108,11 @@ class RoomContextActionService: NSObject, RoomContextActionServiceProtocol {
     
     func markAsRead() {
         room.markAllAsRead()
+        self.delegate?.roomContextActionServiceDidMarkedRoom(self)
+    }
+    func markAsUnread() {
+        room.markAsUnread()
+        self.delegate?.roomContextActionServiceDidMarkedRoom(self)
     }
     
     // MARK: - Private

Riot/Modules/ContextMenu/Services/RoomContextActionServiceProtocol.swift

@@ -22,6 +22,7 @@ import Foundation
     func roomContextActionService(_ service: RoomContextActionServiceProtocol, showRoomNotificationSettingsForRoomWithId roomId: String)
     func roomContextActionServiceDidJoinRoom(_ service: RoomContextActionServiceProtocol)
     func roomContextActionServiceDidLeaveRoom(_ service: RoomContextActionServiceProtocol)
+    func roomContextActionServiceDidMarkedRoom(_ service: RoomContextActionServiceProtocol)
 }
 
 /// `RoomContextActionServiceProtocol` classes are meant to be called by a `RoomActionProviderProtocol` instance so it provides the implementation of the menu actions.

Riot/Modules/MatrixKit/Models/RoomList/MXKRecentCellData.m

@@ -63,7 +63,8 @@
 
 - (BOOL)hasUnread
 {
-    return (roomSummary.localUnreadEventCount != 0);
+    bool isRoomUnread = [[self mxSession] isRoomMarkedAsUnread:roomSummary.roomId];
+    return (roomSummary.localUnreadEventCount != 0 || isRoomUnread);
 }
 
 - (NSString *)roomIdentifier

Riot/Modules/Room/MXKRoomViewController.m

@@ -370,6 +370,11 @@
     [self.roomDataSource.room.summary markAllAsReadLocally];
     
     [self updateCurrentEventIdAtTableBottom:YES];
+    
+    if (!self.isContextPreview)
+    {
+        [self.roomDataSource.room unmarkAsUnread];
+    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated

changelog.d/7253.feature

@@ -0,0 +1 @@
+Add mark as unread option for rooms