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

Merge branch 'develop' into convert_to_coordinators

Browse Source 
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
This commit is contained in:
SBiOSoftWhare
2020-09-24 11:37:24 +02:00
parent eb64fd3703 5ee5ecf32f
commit 65f4237ae0
149 changed files with 6123 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/TabBar/MasterTabBarController.h
+10 -1
View File
@@ -1,5 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
Copyright 2020 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -38,6 +39,7 @@
@protocol MasterTabBarControllerDelegate;
@interface MasterTabBarController : UITabBarController
// UITabBarController already have a `delegate` property
@@ -169,8 +171,15 @@
@property (nonatomic, readonly) MXGroup *selectedGroup;
@property (nonatomic, readonly) MXSession *selectedGroupSession;
// YES while the authentication screen is displayed
@property (nonatomic, readonly) BOOL authenticationInProgress;
@end
@protocol MasterTabBarControllerDelegate <NSObject>
- (void)masterTabBarController:(MasterTabBarController*)masterTabBarController wantsToPresentDetailViewController:(UIViewController*)detailViewController;
- (void)masterTabBarControllerDidCompleteAuthentication:(MasterTabBarController *)masterTabBarController;
- (void)masterTabBarController:(MasterTabBarController*)masterTabBarController wantsToPresentDetailViewController:(UIViewController*)detailViewController;
@end