Skip to content

Commit

Permalink
Fix missing tint color and double thank you bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
danhd123 committed Feb 6, 2018
1 parent 29ef9bc commit bf0ab7d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Source/Buglife.m
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion Source/Controllers/Alert View/LIFEAlertActionView.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit bf0ab7d

Please sign in to comment.