Browse Source

Fix topBar.noBorder option

yogevbd 5 years ago
parent
commit
5b7ddec1da
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      lib/ios/RNNStackPresenter.m

+ 5
- 5
lib/ios/RNNStackPresenter.m View File

29
 	self.interactivePopGestureDelegate.originalDelegate = stack.interactivePopGestureRecognizer.delegate;
29
 	self.interactivePopGestureDelegate.originalDelegate = stack.interactivePopGestureRecognizer.delegate;
30
 	stack.interactivePopGestureRecognizer.delegate = self.interactivePopGestureDelegate;
30
 	stack.interactivePopGestureRecognizer.delegate = self.interactivePopGestureDelegate;
31
 
31
 
32
+    [stack setTopBarBackgroundColor:[withDefault.topBar.background.color getWithDefaultValue:nil]];
32
 	[stack setInteractivePopGestureEnabled:[withDefault.popGesture getWithDefaultValue:YES]];
33
 	[stack setInteractivePopGestureEnabled:[withDefault.popGesture getWithDefaultValue:YES]];
33
 	[stack setRootBackgroundImage:[withDefault.rootBackgroundImage getWithDefaultValue:nil]];
34
 	[stack setRootBackgroundImage:[withDefault.rootBackgroundImage getWithDefaultValue:nil]];
34
 	[stack setNavigationBarTestId:[withDefault.topBar.testID getWithDefaultValue:nil]];
35
 	[stack setNavigationBarTestId:[withDefault.topBar.testID getWithDefaultValue:nil]];
39
 	[stack setNavigationBarTranslucent:[withDefault.topBar.background.translucent getWithDefaultValue:NO]];
40
 	[stack setNavigationBarTranslucent:[withDefault.topBar.background.translucent getWithDefaultValue:NO]];
40
 	[stack setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
41
 	[stack setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
41
 	[stack setNavigationBarBlur:[withDefault.topBar.background.blur getWithDefaultValue:NO]];
42
 	[stack setNavigationBarBlur:[withDefault.topBar.background.blur getWithDefaultValue:NO]];
42
-	[stack setTopBarBackgroundColor:[withDefault.topBar.background.color getWithDefaultValue:nil]];
43
 	[stack setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
43
 	[stack setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
44
 	[stack setNavigationBarLargeTitleFontFamily:[withDefault.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.largeTitle.fontSize getWithDefaultValue:nil] fontWeight:[withDefault.topBar.largeTitle.fontWeight getWithDefaultValue:nil] color:[withDefault.topBar.largeTitle.color getWithDefaultValue:nil]];
44
 	[stack setNavigationBarLargeTitleFontFamily:[withDefault.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.largeTitle.fontSize getWithDefaultValue:nil] fontWeight:[withDefault.topBar.largeTitle.fontWeight getWithDefaultValue:nil] color:[withDefault.topBar.largeTitle.color getWithDefaultValue:nil]];
45
 	[stack setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil] fontWeight:[withDefault.topBar.title.fontWeight getWithDefaultValue:nil] color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
45
 	[stack setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil] fontWeight:[withDefault.topBar.title.fontWeight getWithDefaultValue:nil] color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
67
     [super mergeOptions:options resolvedOptions:resolvedOptions];
67
     [super mergeOptions:options resolvedOptions:resolvedOptions];
68
 	RNNStackController* stack = self.boundViewController;
68
 	RNNStackController* stack = self.boundViewController;
69
 
69
 
70
+    if (options.topBar.background.color.hasValue) {
71
+        [stack setTopBarBackgroundColor:options.topBar.background.color.get];
72
+    }
73
+    
70
 	if (options.popGesture.hasValue) {
74
 	if (options.popGesture.hasValue) {
71
 		[stack setInteractivePopGestureEnabled:options.popGesture.get];
75
 		[stack setInteractivePopGestureEnabled:options.popGesture.get];
72
 	}
76
 	}
107
 		[stack setNavigationBarBlur:[options.topBar.background.blur get]];
111
 		[stack setNavigationBarBlur:[options.topBar.background.blur get]];
108
 	}
112
 	}
109
 	
113
 	
110
-	if (options.topBar.background.color.hasValue) {
111
-		[stack setTopBarBackgroundColor:options.topBar.background.color.get];
112
-	}
113
-	
114
 	if (options.topBar.largeTitle.visible.hasValue) {
114
 	if (options.topBar.largeTitle.visible.hasValue) {
115
 		[stack setNavigationBarLargeTitleVisible:options.topBar.largeTitle.visible.get];
115
 		[stack setNavigationBarLargeTitleVisible:options.topBar.largeTitle.visible.get];
116
 	}
116
 	}