felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 08:03:50 +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/Common/SegmentedViewController/SegmentedViewController.m
+7 -7
View File
@@ -249,7 +249,7 @@
// create programmatically each label
UILabel *label = [[UILabel alloc] init];
label.text = [sectionTitles objectAtIndex:index];
label.text = sectionTitles[index];
label.font = [UIFont systemFontOfSize:17];
label.textAlignment = NSTextAlignmentCenter;
label.textColor = _sectionHeaderTintColor;
@@ -269,7 +269,7 @@
leftConstraint = [NSLayoutConstraint constraintWithItem:label
attribute:NSLayoutAttributeLeading
relatedBy:NSLayoutRelationEqual
toItem:[labels objectAtIndex:(index-1)]
toItem:labels[index - 1]
attribute:NSLayoutAttributeTrailing
multiplier:1.0
constant:0];
@@ -345,7 +345,7 @@
leftMarkerViewConstraint = [NSLayoutConstraint constraintWithItem:selectedMarkerView
attribute:NSLayoutAttributeLeading
relatedBy:NSLayoutRelationEqual
toItem:[sectionLabels objectAtIndex:_selectedIndex]
toItem:sectionLabels[_selectedIndex]
attribute:NSLayoutAttributeLeading
multiplier:1.0
constant:0];
@@ -392,7 +392,7 @@
if (index != NSNotFound)
{
UILabel* label = [sectionLabels objectAtIndex:index];
UILabel* label = sectionLabels[index];
label.font = [UIFont systemFontOfSize:17];
}
@@ -404,7 +404,7 @@
[NSLayoutConstraint deactivateConstraints:@[displayedVCTopConstraint, displayedVCLeftConstraint, displayedVCWidthConstraint, displayedVCHeightConstraint]];
}
UILabel* label = [sectionLabels objectAtIndex:_selectedIndex];
UILabel* label = sectionLabels[_selectedIndex];
label.font = [UIFont boldSystemFontOfSize:17];
// update the marker view position
@@ -413,7 +413,7 @@
leftMarkerViewConstraint = [NSLayoutConstraint constraintWithItem:selectedMarkerView
attribute:NSLayoutAttributeLeading
relatedBy:NSLayoutRelationEqual
toItem:[sectionLabels objectAtIndex:_selectedIndex]
toItem:sectionLabels[_selectedIndex]
attribute:NSLayoutAttributeLeading
multiplier:1.0
constant:0];
@@ -421,7 +421,7 @@
[NSLayoutConstraint activateConstraints:@[leftMarkerViewConstraint]];
// Set the new selected view controller
_selectedViewController = [viewControllers objectAtIndex:_selectedIndex];
_selectedViewController = viewControllers[_selectedIndex];
// Make iOS invoke selectedViewController viewWillAppear when the segmented view is already visible
if (isViewAppeared)