Browse Source

remove old setStatusBarStyle

Marino Faggiana 7 years ago
parent
commit
439c4ab796
3 changed files with 23 additions and 13 deletions
  1. 5 4
      iOSClient/Brand/Intro/CCIntro.m
  2. 4 4
      iOSClient/Login/CCLogin.storyboard
  3. 14 5
      iOSClient/Main/CCMain.m

+ 5 - 4
iOSClient/Brand/Intro/CCIntro.m

@@ -45,10 +45,13 @@
     return self;
 }
 
+- (UIStatusBarStyle)preferredStatusBarStyle
+{
+    return UIStatusBarStyleLightContent;
+}
+
 - (void)introWillFinish:(EAIntroView *)introView wasSkipped:(BOOL)wasSkipped
 {
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
-    
     if (self.delegate && [self.delegate respondsToSelector:@selector(introWillFinish:wasSkipped:)])
         [self.delegate introWillFinish:introView wasSkipped:wasSkipped];
 }
@@ -167,8 +170,6 @@
     [intro setDelegate:self];
     [intro setPages:@[page1,page11,page2,page3]];
     [intro showInView:self.rootView animateDuration:duration];
-    
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
 }
 
 @end

+ 4 - 4
iOSClient/Login/CCLogin.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -116,7 +116,7 @@
                                 </connections>
                             </button>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="BpI-xK-1SU">
-                                <rect key="frame" x="72" y="20" width="229" height="120"/>
+                                <rect key="frame" x="72" y="30" width="229" height="120"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="120" id="E9d-5O-bto"/>
                                     <constraint firstAttribute="width" constant="229" id="xwH-mh-yDU"/>
@@ -139,7 +139,7 @@
                             <constraint firstItem="fhk-o9-J0l" firstAttribute="top" secondItem="7q8-rl-x2M" secondAttribute="top" id="1oU-Kw-Rqv"/>
                             <constraint firstItem="1Gf-Bw-Nim" firstAttribute="leading" secondItem="Bv6-g3-l0M" secondAttribute="leadingMargin" constant="34" id="6Be-V2-eJc"/>
                             <constraint firstItem="szn-G7-5sK" firstAttribute="centerY" secondItem="s9o-RX-XeS" secondAttribute="centerY" constant="-0.5" id="BR2-Vt-TiK"/>
-                            <constraint firstItem="BpI-xK-1SU" firstAttribute="top" secondItem="Bv6-g3-l0M" secondAttribute="top" constant="20" id="CRD-sA-WM7"/>
+                            <constraint firstItem="BpI-xK-1SU" firstAttribute="top" secondItem="Bv6-g3-l0M" secondAttribute="top" constant="30" id="CRD-sA-WM7"/>
                             <constraint firstItem="1Gf-Bw-Nim" firstAttribute="top" secondItem="szn-G7-5sK" secondAttribute="bottom" id="GgI-rV-AyE"/>
                             <constraint firstItem="HQd-pF-3cE" firstAttribute="top" secondItem="jU7-Iw-XfU" secondAttribute="bottom" constant="14" id="GtN-Nl-Foz"/>
                             <constraint firstAttribute="centerX" secondItem="BpI-xK-1SU" secondAttribute="centerX" constant="1" id="IxG-UI-0vq"/>

+ 14 - 5
iOSClient/Main/CCMain.m

@@ -603,6 +603,18 @@
     }
 }
 
+/*
+- (UIStatusBarStyle)preferredStatusBarStyle
+{
+    UIBarStyle barStyle = self.navigationController.navigationBar.barStyle;
+    
+    if (barStyle == UIStatusBarStyleLightContent)
+        return UIStatusBarStyleDefault;
+    else
+        return UIStatusBarStyleLightContent;
+}
+*/
+
 - (void)setUINavigationBarDefault
 {
     [app aspectNavigationControllerBar:self.navigationController.navigationBar online:[app.reachability isReachable] hidden:NO];
@@ -1906,10 +1918,7 @@
 
 -(void)updateSearchResultsForSearchController:(UISearchController *)searchController
 {
-    //UIView *statusBar=[[UIApplication sharedApplication] valueForKey:@"statusBar"];
-    //statusBar.backgroundColor = [UIColor whiteColor];
-    
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
+    //[self setNeedsStatusBarAppearanceUpdate];
 
     _isSearchMode = YES;
     [self deleteRefreshControl];
@@ -1992,7 +2001,7 @@
         [self reloadDatasource];
     }
     
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
+    //[self setNeedsStatusBarAppearanceUpdate];
 }
 
 #pragma mark -