Merge pull request ResearchKit#1167 from srinathtm-apple/FixForIssue1136

navigationFooterView should adopt app tint color
mab5vot9us9a · Aug 29, 2018 · 0598cbd · 0598cbd
2 parents c4968de + c1e6dc0
commit 0598cbd
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/ResearchKit/Common/ORKNavigationContainerView.m b/ResearchKit/Common/ORKNavigationContainerView.m
@@ -48,6 +48,7 @@ @implementation ORKNavigationContainerView {
     NSMutableArray *_cancelButtonConstraints;
 
     UIVisualEffectView *effectView;
+    UIColor *_appTintColor;
 
     BOOL _continueButtonJustTapped;
 }
@@ -60,6 +61,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
         [self setupViews];
         [self setupFootnoteLabel];
         self.preservesSuperviewLayoutMargins = NO;
+        _appTintColor = nil;
         self.skipButtonStyle = ORKNavigationContainerButtonStyleTextBold;
         self.cancelButtonStyle = ORKNavigationContainerButtonStyleTextBold;
         [self setUpConstraints];
@@ -92,6 +94,9 @@ - (void)setupContinueButton {
     _continueButton.exclusiveTouch = YES;
     _continueButton.translatesAutoresizingMaskIntoConstraints = NO;
     [_continueButton addTarget:self action:@selector(continueButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+    if (_appTintColor) {
+        _continueButton.normalTintColor = _appTintColor;
+    }
 
 }
 
@@ -106,6 +111,9 @@ - (void)setupCancelButton {
     _cancelButtonView.translatesAutoresizingMaskIntoConstraints = NO;
 
     [_cancelButtonView addSubview:_cancelButton];
+    if (_appTintColor) {
+        _cancelButton.normalTintColor = _appTintColor;
+    }
     [self setCancelButtonConstraints];
 }
 
@@ -175,7 +183,9 @@ - (void)setupSkipButton {
     _skipButton.translatesAutoresizingMaskIntoConstraints = NO;
     _skipButtonView.translatesAutoresizingMaskIntoConstraints = NO;
     [_skipButtonView addSubview:_skipButton];
-
+    if (_appTintColor) {
+        _skipButton.normalTintColor = _appTintColor;
+    }
     [self setSkipButtonConstraints];
 }
 
@@ -313,6 +323,7 @@ - (void)setupSubStackViews {
             [_parentStackView addArrangedSubview:subStack];
         }
     }
+    _appTintColor = [[UIApplication sharedApplication].delegate window].tintColor;
     [self setupContinueButton];
     [self setupCancelButton];
     [self setupSkipButton];