From bf0ab7d685cfc72212f39f6b08cc37fae73da3a5 Mon Sep 17 00:00:00 2001 From: Daniel DeCovnick Date: Tue, 6 Feb 2018 12:24:42 -0500 Subject: [PATCH] Fix missing tint color and double thank you bugs --- Source/Buglife.m | 10 +++++----- Source/Controllers/Alert View/LIFEAlertActionView.m | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Buglife.m b/Source/Buglife.m index 158944b..fee1b6e 100644 --- a/Source/Buglife.m +++ b/Source/Buglife.m @@ -458,15 +458,15 @@ - (void)_dismissReporterAnimated:(BOOL)animated }]; } -- (void)_dismissReporterWithWindowBlindsAnimation:(BOOL)animated andShowThankYouDialog:(BOOL)shoudShowThankYouDialog +- (void)_dismissReporterWithWindowBlindsAnimation:(BOOL)animated andShowThankYouDialog:(BOOL)shouldShowThankYouDialog { - if (shoudShowThankYouDialog && [self.delegate respondsToSelector:@selector(buglifeWillPresentReportCompletedDialog:)]) { - shoudShowThankYouDialog = [self.delegate buglifeWillPresentReportCompletedDialog:self]; + if (shouldShowThankYouDialog && [self.delegate respondsToSelector:@selector(buglifeWillPresentReportCompletedDialog:)]) { + shouldShowThankYouDialog = [self.delegate buglifeWillPresentReportCompletedDialog:self]; } __weak typeof(self) weakSelf = self; - LIFEToastController *toast = [[LIFEToastController alloc] init]; + LIFEToastController *toast = shouldShowThankYouDialog ? [[LIFEToastController alloc] init] : nil; [self.containerWindow.containerViewController dismissWithWindowBlindsAnimation:animated showToast:toast completion:^{ __strong Buglife *strongSelf = weakSelf; if (strongSelf) { @@ -477,7 +477,7 @@ - (void)_dismissReporterWithWindowBlindsAnimation:(BOOL)animated andShowThankYou [self.reportWindow dismissAnimated:animated completion:^{ __strong Buglife *strongSelf = weakSelf; if (strongSelf) { - if (shoudShowThankYouDialog) { + if (shouldShowThankYouDialog) { [strongSelf _showThankYouDialogWithCancelActionHandler:^{ __strong Buglife *strongSelf2 = weakSelf; if (strongSelf2) { diff --git a/Source/Controllers/Alert View/LIFEAlertActionView.m b/Source/Controllers/Alert View/LIFEAlertActionView.m index e0553f1..a8d623d 100644 --- a/Source/Controllers/Alert View/LIFEAlertActionView.m +++ b/Source/Controllers/Alert View/LIFEAlertActionView.m @@ -19,6 +19,7 @@ #import "LIFEAlertActionView.h" #import "UIImage+LIFEAdditions.h" #import "LIFEMacros.h" +#import "LIFEAppearanceImpl.h" let kIntrinsicHeight = 44.0f; let kFontSize = 17.0f; @@ -48,7 +49,7 @@ - (nonnull instancetype)initWithTitle:(nonnull NSString *)title style:(LIFEAlert if (style == UIAlertActionStyleDestructive) { _titleLabel.textColor = [UIColor redColor]; } else { - _titleLabel.textColor = [UIColor blueColor]; + _titleLabel.textColor = [LIFEAppearanceImpl sharedAppearance].tintColor; } [self addSubview:_titleLabel];