Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Auth/FirebaseAuthUI/FUIAuthTableViewCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@

@implementation FUIAuthTableViewCell

- (void)awakeFromNib {
[super awakeFromNib];

if (@available(iOS 13.0, *)) {
self.textField.textColor = [UIColor labelColor];
self.label.textColor = [UIColor labelColor];
}
}

- (void)setLabel:(UILabel *)label {
_label = label;
[self layoutIfNeeded];
Expand Down
10 changes: 8 additions & 2 deletions Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ - (NSAttributedString *)privacyPolicyAndTOSMessageFromFormat:(NSString *)format
NSString *privacyPolicyString = FUILocalizedString(kStr_PrivacyPolicy);
NSString *privacyPolicyAndTOSString =
[NSString stringWithFormat:format, termsOfServiceString, privacyPolicyString];
NSMutableAttributedString *attributedLinkText =
[[NSMutableAttributedString alloc] initWithString:privacyPolicyAndTOSString];
NSMutableAttributedString *attributedLinkText = nil;

if (@available(iOS 13.0, *)) {
attributedLinkText = [[NSMutableAttributedString alloc] initWithString:privacyPolicyAndTOSString
attributes:@{NSForegroundColorAttributeName: [UIColor labelColor]}];
} else {
attributedLinkText = [[NSMutableAttributedString alloc] initWithString:privacyPolicyAndTOSString];
}

NSRange TOSRange = [privacyPolicyAndTOSString rangeOfString:termsOfServiceString];
if (TOSRange.length) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ - (void)viewDidLoad {
self.navigationItem.rightBarButtonItem = sendButtonItem;

[self enableDynamicCellHeightForTableView:_tableView];

if (@available(iOS 13.0, *)) {
_tableView.backgroundColor = [UIColor systemBackgroundColor];
self.footerTextView.textColor = [UIColor secondaryLabelColor];
}
}

- (void)viewDidLayoutSubviews {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ - (void)viewDidLoad {
[_termsOfServiceView useFooterMessage];

[self enableDynamicCellHeightForTableView:_tableView];

if (@available(iOS 13.0, *)) {
_tableView.backgroundColor = [UIColor systemBackgroundColor];
}
}

- (void)viewWillAppear:(BOOL)animated {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ - (void)viewDidLoad {
self.navigationItem.rightBarButtonItem = saveButtonItem;

[self enableDynamicCellHeightForTableView:_tableView];

if (@available(iOS 13.0, *)) {
_tableView.backgroundColor = [UIColor systemBackgroundColor];
}
}

- (void)viewDidLayoutSubviews {
Expand Down
Loading