|
@@ -233,19 +233,33 @@ const NSInteger TRANSPARENT_NAVBAR_TAG = 78264803;
|
233
|
233
|
{
|
234
|
234
|
viewController.navigationController.navigationBar.tintColor = nil;
|
235
|
235
|
}
|
236
|
|
-
|
237
|
|
- NSString *statusBarTextColorScheme = self.navigatorStyle[@"statusBarTextColorScheme"];
|
238
|
|
- if (statusBarTextColorScheme && [statusBarTextColorScheme isEqualToString:@"light"])
|
|
236
|
+
|
|
237
|
+ NSString *statusBarTextColorSchemeSingleScreen = self.navigatorStyle[@"statusBarTextColorSchemeSingleScreen"];
|
|
238
|
+ if (statusBarTextColorSchemeSingleScreen && [statusBarTextColorSchemeSingleScreen isEqualToString:@"light"])
|
239
|
239
|
{
|
240
|
|
- viewController.navigationController.navigationBar.barStyle = UIBarStyleBlack;
|
241
|
|
- self._statusBarTextColorSchemeLight = YES;
|
|
240
|
+ self._statusBarTextColorSchemeLight = YES;
|
242
|
241
|
}
|
243
|
242
|
else
|
244
|
243
|
{
|
245
|
|
- viewController.navigationController.navigationBar.barStyle = UIBarStyleDefault;
|
246
|
|
- self._statusBarTextColorSchemeLight = NO;
|
|
244
|
+ self._statusBarTextColorSchemeLight = NO;
|
247
|
245
|
}
|
248
|
|
-
|
|
246
|
+
|
|
247
|
+ // incase statusBarTextColorSchemeSingleScreen exists ignore the statusBarTextColorScheme which more globaly
|
|
248
|
+ if (!statusBarTextColorSchemeSingleScreen) {
|
|
249
|
+ NSString *statusBarTextColorScheme = self.navigatorStyle[@"statusBarTextColorScheme"];
|
|
250
|
+ if (statusBarTextColorScheme && [statusBarTextColorScheme isEqualToString:@"light"] && !statusBarTextColorSchemeSingleScreen)
|
|
251
|
+ {
|
|
252
|
+ viewController.navigationController.navigationBar.barStyle = UIBarStyleBlack;
|
|
253
|
+ self._statusBarTextColorSchemeLight = YES;
|
|
254
|
+
|
|
255
|
+ }
|
|
256
|
+ else
|
|
257
|
+ {
|
|
258
|
+ viewController.navigationController.navigationBar.barStyle = UIBarStyleDefault;
|
|
259
|
+ self._statusBarTextColorSchemeLight = NO;
|
|
260
|
+ }
|
|
261
|
+ }
|
|
262
|
+
|
249
|
263
|
NSNumber *navBarHidden = self.navigatorStyle[@"navBarHidden"];
|
250
|
264
|
BOOL navBarHiddenBool = navBarHidden ? [navBarHidden boolValue] : NO;
|
251
|
265
|
if (viewController.navigationController.navigationBarHidden != navBarHiddenBool)
|