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

Replace MXCViewController/MXCTableViewController with MXKViewController/MXKTableViewController (from MatrixKit).

Browse Source
This commit is contained in:
giomfo
2015-04-14 10:55:18 +02:00
parent 2ed0372b10
commit dfe648fa7c
22 changed files with 148 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/ViewController/MasterTabBarController.m
+23 -1
View File
@@ -20,12 +20,16 @@
#import "RecentsViewController.h"
#import "RecentListDataSource.h"
#import "ContactsViewController.h"
#import "SettingsViewController.h"
@interface MasterTabBarController () {
UINavigationController *recentsNavigationController;
RecentsViewController *recentsViewController;
ContactsViewController *contactsViewController;
SettingsViewController *settingsViewController;
UIImagePickerController *mediaPicker;
@@ -62,6 +66,17 @@
}
}
// Retrieve the constacts view controller
UIViewController* contacts = [self.viewControllers objectAtIndex:TABBAR_CONTACTS_INDEX];
if ([contacts isKindOfClass:[UINavigationController class]]) {
UINavigationController *contactsNavigationController = (UINavigationController*)contacts;
for (UIViewController *viewController in contactsNavigationController.viewControllers) {
if ([viewController isKindOfClass:[ContactsViewController class]]) {
contactsViewController = (ContactsViewController*)viewController;
}
}
}
// Retrieve the settings view controller
UIViewController* settings = [self.viewControllers objectAtIndex:TABBAR_SETTINGS_INDEX];
if ([settings isKindOfClass:[UINavigationController class]]) {
@@ -74,7 +89,7 @@
}
// Sanity check
NSAssert(recentsViewController && settingsViewController, @"Something wrong in Main.storyboard");
NSAssert(recentsViewController && contactsViewController && settingsViewController, @"Something wrong in Main.storyboard");
// Register session state observer
sessionStateObserver = [[NSNotificationCenter defaultCenter] addObserverForName:MXSessionStateDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
@@ -87,6 +102,9 @@
MXKRecentListDataSource *listDataSource = [[RecentListDataSource alloc] initWithMatrixSession:mxSession];
[recentsViewController displayList:listDataSource];
// Update contacts tab
contactsViewController.mxSession = mxSession;
// Update settings tab
settingsViewController.mxSession = mxSession;
}
@@ -109,6 +127,7 @@
- (void)dealloc {
recentsNavigationController = nil;
recentsViewController = nil;
contactsViewController = nil;
settingsViewController = nil;
[self dismissMediaPicker];
@@ -136,6 +155,9 @@
- (void)showAuthenticationScreen {
[self restoreInitialDisplay];
// Reset mxSession information in contacts
contactsViewController.mxSession = nil;
// Reset user's information in settings
settingsViewController.mxSession = nil;