Merge pull request #6660 from vector-im/gil/6513-Glitchy_room_list_he…

…ader_when_scrolling Glitchy room list header when scrolling
element-hq · Sep 5, 2022 · d5e54af · d5e54af
2 parents b0dd477 + 356824b
commit d5e54af
Show file tree

Hide file tree

Showing 24 changed files with 1,576 additions and 336 deletions.
diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h
@@ -28,6 +28,7 @@
 
 @protocol Configurable;
 @protocol LegacyAppDelegateDelegate;
+@protocol SplitViewMasterViewControllerProtocol;
 @class CallBar;
 @class CallPresenter;
 @class RoomNavigationParameters;
@@ -69,7 +70,7 @@ UINavigationControllerDelegate
 /**
  Application main view controller
  */
-@property (nonatomic, readonly) MasterTabBarController *masterTabBarController;
+@property (nonatomic, readonly) UIViewController<SplitViewMasterViewControllerProtocol>* masterTabBarController;
 
 @property (strong, nonatomic) UIWindow *window;
 

diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
@@ -1714,7 +1714,10 @@ - (void)crossSigningSetupBannerCellDidTapCloseAction:(CrossSigningSetupBannerCel
 - (void)recentsListServiceDidChangeData:(id<RecentsListServiceProtocol>)service
                      totalCountsChanged:(BOOL)totalCountsChanged
 {
-    [[AppDelegate theDelegate].masterTabBarController refreshTabBarBadges];
+    if (!BuildSettings.isNewAppLayoutActivated)
+    {
+        [[AppDelegate theDelegate].masterTabBarController refreshTabBarBadges];
+    }
 }
 
 - (void)recentsListServiceDidChangeData:(id<RecentsListServiceProtocol>)service

diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -373,8 +373,6 @@ - (void)viewDidLayoutSubviews
 
 - (void)refreshRecentsTable
 {
-    MXLogDebug(@"[RecentsViewController]: Refreshing recents table view")
-
     if (!self.recentsUpdateEnabled)
     {
         isRefreshNeeded = YES;
@@ -384,7 +382,11 @@ - (void)refreshRecentsTable
     isRefreshNeeded = NO;
 
     // Refresh the tabBar icon badges
-    [[AppDelegate theDelegate].masterTabBarController refreshTabBarBadges];
+    if (!BuildSettings.isNewAppLayoutActivated)
+    {
+        // Refresh the tabBar icon badges
+        [[AppDelegate theDelegate].masterTabBarController refreshTabBarBadges];
+    }
 
     // do not refresh if there is a pending recent drag and drop
     if (movingCellPath)
@@ -1103,9 +1105,12 @@ - (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
         [self refreshRecentsTable];
     }
 
-    // Since we've enabled room list pagination, `refreshRecentsTable` not called in this case.
-    // Refresh tab bar badges separately.
-    [[AppDelegate theDelegate].masterTabBarController refreshTabBarBadges];
+    if (!BuildSettings.isNewAppLayoutActivated)
+    {
+        // Since we've enabled room list pagination, `refreshRecentsTable` not called in this case.
+        // Refresh tab bar badges separately.
+        [[AppDelegate theDelegate].masterTabBarController refreshTabBarBadges];
+    }
 
     [self showEmptyViewIfNeeded];
 
@@ -1513,6 +1518,12 @@ - (NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButto
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
+    if (!self.recentsSearchBar)
+    {
+        [super scrollViewDidScroll:scrollView];
+        return;
+    }
+
     dispatch_async(dispatch_get_main_queue(), ^{
 
         [self refreshStickyHeadersContainersHeight];

diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@@ -88,25 +88,25 @@ - (void)render:(MXKCellData *)cellData
         {
             self.lastEventDescription.text = roomCellData.lastEventTextMessage;
         }
-        
+
         self.unsentImageView.hidden = roomCellData.roomSummary.sentStatus == MXRoomSummarySentStatusOk;
         self.lastEventDecriptionLabelTrailingConstraint.constant = self.unsentImageView.hidden ? 10 : 30;
 
         // Notify unreads and bing
         if (roomCellData.hasUnread)
         {
             self.missedNotifAndUnreadIndicator.hidden = NO;
-            
+
             if (0 < roomCellData.notificationCount)
             {
                 self.missedNotifAndUnreadIndicator.backgroundColor = roomCellData.highlightCount ? ThemeService.shared.theme.noticeColor : ThemeService.shared.theme.noticeSecondaryColor;
-                
+
                 self.missedNotifAndUnreadBadgeBgView.hidden = NO;
                 self.missedNotifAndUnreadBadgeBgView.backgroundColor = self.missedNotifAndUnreadIndicator.backgroundColor;
-                
+
                 self.missedNotifAndUnreadBadgeLabel.text = roomCellData.notificationCountStringValue;
                 [self.missedNotifAndUnreadBadgeLabel sizeToFit];
-                
+
                 self.missedNotifAndUnreadBadgeBgViewWidthConstraint.constant = self.missedNotifAndUnreadBadgeLabel.frame.size.width + 18;
             }
             else
@@ -120,8 +120,8 @@ - (void)render:(MXKCellData *)cellData
         else
         {
             self.lastEventDate.textColor = ThemeService.shared.theme.textSecondaryColor;
-            
-            // The room title is not bold anymore            
+
+            // The room title is not bold anymore
             self.roomTitle.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium];
         }