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

Room Participants: Retrieve the potential segmented view controller from the parent view controller.

Browse Source
This commit is contained in:
giomfo
2016-06-23 18:43:01 +02:00
parent 767cc8830f
commit b5a8124c24
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/RoomParticipantsViewController.m
+7 -10
View File
@@ -231,9 +231,9 @@
- (void)withdrawViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion
{
// Check whether the current view controller is displayed inside a segmented view controller in order to withdraw the right item
if (_segmentedViewController)
if (self.parentViewController && [self.parentViewController isKindOfClass:SegmentedViewController.class])
{
[_segmentedViewController withdrawViewControllerAnimated:animated completion:completion];
[((SegmentedViewController*)self.parentViewController) withdrawViewControllerAnimated:animated completion:completion];
}
else
{
@@ -381,11 +381,8 @@
- (void)setNavBarButtons
{
// this viewController can be displayed
// 1- with a "standard" push mode
// 2- within a segmentedViewController i.e. inside another viewcontroller
// so, we need to use the parent controller when it is required.
UIViewController* topViewController = (self.parentViewController) ? self.parentViewController : self;
// Check whether the view controller is currently displayed inside a segmented view controller or not.
UIViewController* topViewController = ((self.parentViewController) ? self.parentViewController : self);
topViewController.navigationItem.rightBarButtonItem = nil;
topViewController.navigationItem.leftBarButtonItem = nil;
}
@@ -680,12 +677,12 @@
- (void)pushViewController:(UIViewController*)viewController
{
// Check whether the view controller is displayed inside a segmented one.
if (self.segmentedViewController)
if (self.parentViewController)
{
// Hide back button title
self.segmentedViewController.navigationItem.backBarButtonItem =[[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
self.parentViewController.navigationItem.backBarButtonItem =[[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
[self.segmentedViewController.navigationController pushViewController:viewController animated:YES];
[self.parentViewController.navigationController pushViewController:viewController animated:YES];
}
else
{