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

Merge pull request #6675 from vector-im/gil/6673-Remove_labs_flag_for_New_App_Layout

Browse Source 
Removed labs flag and enabled New App Layout
This commit is contained in:
Stefan Ceriu
2022-09-07 12:27:29 +03:00
committed by GitHub
parent fe5d34a7e1 049c8996d1
commit 2f0ce20e7e
17 changed files with 36 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+4 -4
View File
@@ -84,7 +84,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
_crossSigningBannerDisplay = CrossSigningBannerDisplayNone;
_secureBackupBannerDisplay = SecureBackupBannerDisplayNone;
_areSectionsShrinkable = !BuildSettings.isNewAppLayoutActivated;
_areSectionsShrinkable = !BuildSettings.newAppLayoutEnabled;
shrinkedSectionsBitMask = 0;
roomTagsListenerByUserId = [[NSMutableDictionary alloc] init];
@@ -759,7 +759,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
}
if (count && !(sectionType == RecentsDataSourceSectionTypeInvites) && !BuildSettings.isNewAppLayoutActivated)
if (count && !(sectionType == RecentsDataSourceSectionTypeInvites) && !BuildSettings.newAppLayoutEnabled)
{
NSString *roomCount = [NSString stringWithFormat:@" %tu", count];
@@ -988,7 +988,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
sectionHeader.bottomView = nil;
}
if (!BuildSettings.isNewAppLayoutActivated || !sectionHeader.bottomView)
if (!BuildSettings.newAppLayoutEnabled || !sectionHeader.bottomView)
{
// Add label
frame.size.height = RECENTSDATASOURCE_DEFAULT_SECTION_HEADER_HEIGHT - 10;
@@ -1734,7 +1734,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
- (void)recentsListServiceDidChangeData:(id<RecentsListServiceProtocol>)service
totalCountsChanged:(BOOL)totalCountsChanged
{
if (!BuildSettings.isNewAppLayoutActivated)
if (!BuildSettings.newAppLayoutEnabled)
{
[[AppDelegate theDelegate].masterTabBarController refreshTabBarBadges];
}