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

Remove any logic from directory section from RoomsViewController.

Browse Source 
Includes removal of segue to DirectoryServerPickerViewController in Main.storyboard.
This commit is contained in:
Doug
2021-07-07 12:58:11 +01:00
parent 542533aa1b
commit e51b62244e
2 changed files with 2 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Rooms/RoomsViewController.m
-206
View File
@@ -18,16 +18,11 @@
#import "RecentsDataSource.h"
#import "DirectoryServerPickerViewController.h"
#import "Riot-Swift.h"
@interface RoomsViewController ()
{
RecentsDataSource *recentsDataSource;
// The animated view displayed at the table view bottom when paginating the room directory
UIView* footerSpinnerView;
}
@end
@@ -74,24 +69,12 @@
[AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_rooms", @"Vector", nil);
[AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
// TODO: Notify RiotSettings.shared.showNSFWPublicRooms change for iPad as viewWillAppear may not be called
recentsDataSource.publicRoomsDirectoryDataSource.showNSFWRooms = RiotSettings.shared.showNSFWPublicRooms;
if ([self.dataSource isKindOfClass:RecentsDataSource.class])
{
BOOL isFirstTime = (recentsDataSource != self.dataSource);
// Take the lead on the shared data source.
recentsDataSource = (RecentsDataSource*)self.dataSource;
recentsDataSource.areSectionsShrinkable = NO;
[recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeRooms];
if (isFirstTime)
{
// The first time the screen is displayed, make publicRoomsDirectoryDataSource
// start loading data
[recentsDataSource.publicRoomsDirectoryDataSource paginate:nil failure:nil];
}
}
}
@@ -121,19 +104,6 @@
return [recentsDataSource viewForHeaderInSection:section withFrame:frame];
}
- (void)dataSource:(MXKDataSource *)dataSource didRecognizeAction:(NSString *)actionIdentifier inCell:(id<MXKCellRendering>)cell userInfo:(NSDictionary *)userInfo
{
if ([actionIdentifier isEqualToString:kRecentsDataSourceTapOnDirectoryServerChange])
{
// Show the directory server picker
[self performSegueWithIdentifier:@"presentDirectoryServerPicker" sender:self];
}
else
{
[super dataSource:dataSource didRecognizeAction:actionIdentifier inCell:cell userInfo:userInfo];
}
}
- (void)onPlusButtonPressed
{
[self showRoomDirectory];
@@ -150,181 +120,6 @@
}
}
#pragma mark - Navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
{
[super prepareForSegue:segue sender:sender];
UIViewController *pushedViewController = [segue destinationViewController];
if ([[segue identifier] isEqualToString:@"presentDirectoryServerPicker"])
{
UINavigationController *pushedNavigationViewController = (UINavigationController*)pushedViewController;
DirectoryServerPickerViewController* directoryServerPickerViewController = (DirectoryServerPickerViewController*)pushedNavigationViewController.viewControllers.firstObject;
MXKDirectoryServersDataSource *directoryServersDataSource = [[MXKDirectoryServersDataSource alloc] initWithMatrixSession:recentsDataSource.publicRoomsDirectoryDataSource.mxSession];
[directoryServersDataSource finalizeInitialization];
// Add directory servers from the app settings
directoryServersDataSource.roomDirectoryServers = BuildSettings.publicRoomsDirectoryServers;
__weak typeof(self) weakSelf = self;
[directoryServerPickerViewController displayWithDataSource:directoryServersDataSource onComplete:^(id<MXKDirectoryServerCellDataStoring> cellData) {
if (weakSelf && cellData)
{
typeof(self) self = weakSelf;
// Use the selected directory server
if (cellData.thirdPartyProtocolInstance)
{
self->recentsDataSource.publicRoomsDirectoryDataSource.thirdpartyProtocolInstance = cellData.thirdPartyProtocolInstance;
}
else if (cellData.homeserver)
{
self->recentsDataSource.publicRoomsDirectoryDataSource.includeAllNetworks = cellData.includeAllNetworks;
self->recentsDataSource.publicRoomsDirectoryDataSource.homeserver = cellData.homeserver;
}
// Refresh data
[self addSpinnerFooterView];
[self->recentsDataSource.publicRoomsDirectoryDataSource paginate:^(NSUInteger roomsAdded) {
if (weakSelf)
{
typeof(self) self = weakSelf;
// The table view is automatically filled
[self removeSpinnerFooterView];
// Make the directory section appear full-page
[self.recentsTableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:self->recentsDataSource.directorySection] atScrollPosition:UITableViewScrollPositionTop animated:YES];
}
} failure:^(NSError *error) {
if (weakSelf)
{
typeof(self) self = weakSelf;
[self removeSpinnerFooterView];
}
}];
}
}];
// Hide back button title
pushedViewController.navigationController.navigationItem.backBarButtonItem =[[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
}
}
#pragma mark - UITableView delegate
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
if (section == recentsDataSource.directorySection)
{
// Let the recents dataSource provide the height of this section header
return [recentsDataSource heightForHeaderInSection:section];
}
return [super tableView:tableView heightForHeaderInSection:section];
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.section == recentsDataSource.directorySection)
{
// Sanity check
MXPublicRoom *publicRoom = [recentsDataSource.publicRoomsDirectoryDataSource roomAtIndexPath:indexPath];
if (publicRoom)
{
[self openPublicRoomAtIndexPath:indexPath];
}
}
else
{
[super tableView:tableView didSelectRowAtIndexPath:indexPath];
}
}
- (void)scrollViewDidScroll:(UIScrollView *)scrollView
{
// Trigger inconspicuous pagination on directy when user scrolls down
if ((scrollView.contentSize.height - scrollView.contentOffset.y - scrollView.frame.size.height) < 300)
{
[self triggerDirectoryPagination];
}
[super scrollViewDidScroll:scrollView];
}
#pragma mark - Private methods
- (void)openPublicRoomAtIndexPath:(NSIndexPath *)indexPath
{
MXPublicRoom *publicRoom = [recentsDataSource.publicRoomsDirectoryDataSource roomAtIndexPath:indexPath];
[self openPublicRoom:publicRoom];
}
- (void)triggerDirectoryPagination
{
if (!recentsDataSource
|| recentsDataSource.state == MXKDataSourceStateUnknown
|| recentsDataSource.publicRoomsDirectoryDataSource.hasReachedPaginationEnd
|| footerSpinnerView)
{
// We are not yet ready or being killed or we got all public rooms or we are already paginating
// Do nothing
return;
}
[self addSpinnerFooterView];
[recentsDataSource.publicRoomsDirectoryDataSource paginate:^(NSUInteger roomsAdded) {
// The table view is automatically filled
[self removeSpinnerFooterView];
} failure:^(NSError *error) {
[self removeSpinnerFooterView];
}];
}
- (void)addSpinnerFooterView
{
if (!footerSpinnerView)
{
UIActivityIndicatorView* spinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
spinner.transform = CGAffineTransformMakeScale(0.75f, 0.75f);
CGRect frame = spinner.frame;
frame.size.height = 80; // 80 * 0.75 = 60
spinner.bounds = frame;
spinner.color = [UIColor darkGrayColor];
spinner.hidesWhenStopped = NO;
spinner.backgroundColor = [UIColor clearColor];
[spinner startAnimating];
// No need to manage constraints here, iOS defines them
self.recentsTableView.tableFooterView = footerSpinnerView = spinner;
}
}
- (void)removeSpinnerFooterView
{
if (footerSpinnerView)
{
footerSpinnerView = nil;
// Hide line separators of empty cells
self.recentsTableView.tableFooterView = [[UIView alloc] init];;
}
}
#pragma mark - Empty view management
- (void)updateEmptyView
@@ -362,7 +157,6 @@
- (NSUInteger)totalItemCounts
{
return recentsDataSource.conversationCellDataArray.count
+ recentsDataSource.publicRoomsDirectoryDataSource.roomsCount
+ recentsDataSource.invitesCellDataArray.count;
}