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

Merge develop into 4734_room_stack

Browse Source
This commit is contained in:
SBiOSoftWhare
2021-10-20 11:14:52 +02:00
parent 3959b40d12 52f96e37be
commit c49fe6cd7c
109 changed files with 3881 additions and 2763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/TabBar/MasterTabBarController.m
+12 -10
View File
@@ -339,7 +339,9 @@
MXLogDebug(@"[MasterTabBarController] initializeDataSources");
// Init the recents data source
recentsDataSource = [[RecentsDataSource alloc] initWithMatrixSession:mainSession];
RecentsListService *recentsListService = [[RecentsListService alloc] initWithSession:mainSession];
recentsDataSource = [[RecentsDataSource alloc] initWithMatrixSession:mainSession
recentsListService:recentsListService];
[self.homeViewController displayList:recentsDataSource];
[self.favouritesViewController displayList:recentsDataSource];
@@ -783,15 +785,15 @@
// Use a middle dot to signal missed notif in favourites
if (RiotSettings.shared.homeScreenShowFavouritesTab)
{
[self setMissedDiscussionsMark:(recentsDataSource.missedFavouriteDiscussionsCount? @"\u00B7": nil)
[self setMissedDiscussionsMark:(recentsDataSource.favoriteMissedDiscussionsCount.numberOfNotified ? @"\u00B7": nil)
onTabBarItem:TABBAR_FAVOURITES_INDEX
withBadgeColor:(recentsDataSource.missedHighlightFavouriteDiscussionsCount ? ThemeService.shared.theme.noticeColor : ThemeService.shared.theme.noticeSecondaryColor)];
withBadgeColor:(recentsDataSource.favoriteMissedDiscussionsCount.hasHighlight ? ThemeService.shared.theme.noticeColor : ThemeService.shared.theme.noticeSecondaryColor)];
}
// Update the badge on People and Rooms tabs
if (RiotSettings.shared.homeScreenShowPeopleTab)
{
if (recentsDataSource.unsentMessagesDirectDiscussionsCount)
if (recentsDataSource.directMissedDiscussionsCount.hasUnsent)
{
[self setBadgeValue:@"!"
onTabBarItem:TABBAR_PEOPLE_INDEX
@@ -799,25 +801,25 @@
}
else
{
[self setMissedDiscussionsCount:recentsDataSource.missedDirectDiscussionsCount
[self setMissedDiscussionsCount:recentsDataSource.directMissedDiscussionsCount.numberOfNotified
onTabBarItem:TABBAR_PEOPLE_INDEX
withBadgeColor:(recentsDataSource.missedHighlightDirectDiscussionsCount ? ThemeService.shared.theme.noticeColor : ThemeService.shared.theme.noticeSecondaryColor)];
withBadgeColor:(recentsDataSource.directMissedDiscussionsCount.hasHighlight ? ThemeService.shared.theme.noticeColor : ThemeService.shared.theme.noticeSecondaryColor)];
}
}
if (RiotSettings.shared.homeScreenShowRoomsTab)
{
if (recentsDataSource.unsentMessagesGroupDiscussionsCount)
if (recentsDataSource.groupMissedDiscussionsCount.hasUnsent)
{
[self setMissedDiscussionsCount:recentsDataSource.unsentMessagesGroupDiscussionsCount
[self setMissedDiscussionsCount:recentsDataSource.groupMissedDiscussionsCount.numberOfUnsent
onTabBarItem:TABBAR_ROOMS_INDEX
withBadgeColor:ThemeService.shared.theme.noticeColor];
}
else
{
[self setMissedDiscussionsCount:recentsDataSource.missedGroupDiscussionsCount
[self setMissedDiscussionsCount:recentsDataSource.groupMissedDiscussionsCount.numberOfNotified
onTabBarItem:TABBAR_ROOMS_INDEX
withBadgeColor:(recentsDataSource.missedHighlightGroupDiscussionsCount ? ThemeService.shared.theme.noticeColor : ThemeService.shared.theme.noticeSecondaryColor)];
withBadgeColor:(recentsDataSource.groupMissedDiscussionsCount.hasHighlight ? ThemeService.shared.theme.noticeColor : ThemeService.shared.theme.noticeSecondaryColor)];
}
}
}