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

Merge remote-tracking branch 'origin/develop' into reskin

Browse Source 
# Conflicts:
#	Riot/Constants/RiotDesignValues.m
#	Riot/Modules/Authentication/AuthenticationViewController.m
This commit is contained in:
manuroe
2019-01-10 11:50:57 +01:00
parent 43f870209a f4f5bdd906
commit 63ee0e14be
31 changed files with 240 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/TabBar/MasterTabBarController.m
+6 -6
View File
@@ -74,11 +74,11 @@
// Do any additional setup after loading the view, typically from a nib.
// Retrieve the all view controllers
_homeViewController = [self.viewControllers objectAtIndex:TABBAR_HOME_INDEX];
_favouritesViewController = [self.viewControllers objectAtIndex:TABBAR_FAVOURITES_INDEX];
_peopleViewController = [self.viewControllers objectAtIndex:TABBAR_PEOPLE_INDEX];
_roomsViewController = [self.viewControllers objectAtIndex:TABBAR_ROOMS_INDEX];
_groupsViewController = [self.viewControllers objectAtIndex:TABBAR_GROUPS_INDEX];
_homeViewController = self.viewControllers[TABBAR_HOME_INDEX];
_favouritesViewController = self.viewControllers[TABBAR_FAVOURITES_INDEX];
_peopleViewController = self.viewControllers[TABBAR_PEOPLE_INDEX];
_roomsViewController = self.viewControllers[TABBAR_ROOMS_INDEX];
_groupsViewController = self.viewControllers[TABBAR_GROUPS_INDEX];
// Set the accessibility labels for all buttons #1842
[_settingsBarButtonItem setAccessibilityLabel:NSLocalizedStringFromTable(@"settings_title", @"Vector", nil)];
@@ -872,7 +872,7 @@
[currentAlert dismissViewControllerAnimated:NO completion:nil];
NSString *appDisplayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
NSString *appDisplayName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
currentAlert = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:NSLocalizedStringFromTable(@"google_analytics_use_prompt", @"Vector", nil), appDisplayName] message:nil preferredStyle:UIAlertControllerStyleAlert];