felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 09:02:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

[spaces] several fixes for pre release

Browse Source 
- [Space home view inherits title from previously viewed tab](https://github.com/vector-im/element-ios/issues/4851)
- [Home view doesn't refresh when new rooms are created](https://github.com/vector-im/element-ios/issues/4849)
- [Odd error message in Space member list](https://github.com/vector-im/element-ios/issues/4845)
- [Bring leaving space experience in line with Web](https://github.com/vector-im/element-ios/issues/4850)
- [No notification for space invitation](https://github.com/vector-im/element-ios/issues/4840)
- [Remove filter when space is switched](https://github.com/vector-im/element-ios/issues/4852)
- [M10.11 Remove community tab](https://github.com/vector-im/element-ios/issues/4493)
This commit is contained in:
Gil Eluard
2021-09-20 10:10:27 +02:00
parent 2e822f8784
commit d879928a96
15 changed files with 266 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/TabBar/MasterTabBarController.m
+38 -20
View File
@@ -120,6 +120,12 @@
titleView.titleLabel.text = NSLocalizedStringFromTable(@"title_home", @"Vector", nil);
childViewControllers = [NSMutableArray array];
MXWeakify(self);
[[NSNotificationCenter defaultCenter] addObserverForName:@"MXSpaceServiceDidBuildSpaceGraph" object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
MXStrongifyAndReturnIfNil(self);
[self updateSideMenuNotifcationIcon];
}];
}
- (void)userInterfaceThemeDidChange
@@ -291,6 +297,8 @@
tabBarItem.imageInsets = UIEdgeInsetsMake(5, 0, -5, 0);
}
}
titleView.titleLabel.text = self.selectedViewController.accessibilityLabel;
}
#pragma mark -
@@ -777,6 +785,35 @@
titleView.subtitleLabel.text = roomParentId ? [mxSession roomSummaryWithRoomId:roomParentId].displayname : nil;
recentsDataSource.currentSpace = [mxSession.spaceService getSpaceWithId:roomParentId];
[self updateSideMenuNotifcationIcon];
}
- (void)updateSideMenuNotifcationIcon
{
BOOL displayNotification = NO;
for (MXRoomSummary *summary in recentsDataSource.mxSession.spaceService.rootSpaceSummaries) {
if (summary.membership == MXMembershipInvite) {
displayNotification = YES;
break;
}
}
if (!displayNotification) {
MXSpaceNotificationState *notificationState = [recentsDataSource.mxSession.spaceService.notificationCounter notificationStateForAllSpacesExcept: recentsDataSource.currentSpace.spaceId];
if (recentsDataSource.currentSpace)
{
MXSpaceNotificationState *homeNotificationState = recentsDataSource.mxSession.spaceService.notificationCounter.homeNotificationState;
displayNotification = notificationState.groupMissedDiscussionsCount > 0 || notificationState.groupMissedDiscussionsHighlightedCount > 0 || homeNotificationState.allCount > 0 || homeNotificationState.allHighlightCount > 0;
}
else
{
displayNotification = notificationState.groupMissedDiscussionsCount > 0 || notificationState.groupMissedDiscussionsHighlightedCount > 0;
}
}
[self.masterTabBarDelegate masterTabBarController:self needsSideMenuIconWithNotification:displayNotification];
}
#pragma mark -
@@ -1258,26 +1295,7 @@
- (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController
{
if ([viewController isKindOfClass:HomeViewController.class])
{
titleView.titleLabel.text = NSLocalizedStringFromTable(@"title_home", @"Vector", nil);
}
else if ([viewController isKindOfClass:FavouritesViewController.class])
{
titleView.titleLabel.text = NSLocalizedStringFromTable(@"title_favourites", @"Vector", nil);
}
else if ([viewController isKindOfClass:PeopleViewController.class])
{
titleView.titleLabel.text = NSLocalizedStringFromTable(@"title_people", @"Vector", nil);
}
else if ([viewController isKindOfClass:RoomsViewController.class])
{
titleView.titleLabel.text = NSLocalizedStringFromTable(@"title_rooms", @"Vector", nil);
}
else if ([viewController isKindOfClass:GroupsViewController.class])
{
titleView.titleLabel.text = NSLocalizedStringFromTable(@"title_groups", @"Vector", nil);
}
titleView.titleLabel.text = viewController.accessibilityLabel;
}
@end