X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/866f8763175ff60e4fa455b92b5eb660a12fe6c7..7e6b461318c8a779d91381531435a68ee4e8b6ed:/SharedWebCredentialViewService/SWCViewController.m diff --git a/SharedWebCredentialViewService/SWCViewController.m b/SharedWebCredentialViewService/SWCViewController.m index f48c2a73..25e643ca 100755 --- a/SharedWebCredentialViewService/SWCViewController.m +++ b/SharedWebCredentialViewService/SWCViewController.m @@ -9,7 +9,7 @@ #import "SWCViewController.h" #import #import - +#import #import #import @@ -88,9 +88,9 @@ const NSString* SWC_SERVER_KEY = @"srvr"; self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor colorWithWhite:0.1 alpha:0.005]; + self.backgroundColor = [UIColor systemBackgroundColor]; - self.textLabel.textColor = [UIColor blackColor]; + self.textLabel.textColor = [UIColor labelColor]; self.textLabel.textAlignment = NSTextAlignmentLeft; self.textLabel.adjustsFontSizeToFitWidth = YES; self.textLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters; @@ -98,7 +98,7 @@ const NSString* SWC_SERVER_KEY = @"srvr"; NSString *title = [dict objectForKey:SWC_ACCOUNT_KEY]; self.textLabel.text = title ? title : NSLocalizedString(@"--", nil); - self.detailTextLabel.textColor = [UIColor darkGrayColor]; + self.detailTextLabel.textColor = [UIColor secondaryLabelColor]; self.detailTextLabel.textAlignment = NSTextAlignmentLeft; self.detailTextLabel.adjustsFontSizeToFitWidth = YES; self.detailTextLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters; @@ -107,11 +107,10 @@ const NSString* SWC_SERVER_KEY = @"srvr"; self.detailTextLabel.text = subtitle ? subtitle : NSLocalizedString(@"--", nil); self.backgroundView = [[UIView alloc] init]; - self.backgroundView.backgroundColor = self.backgroundColor; - - self.imageView.image = [self _checkmarkImage: NO]; + self.backgroundView.backgroundColor = [UIColor systemBackgroundColor]; + + self.imageView.image = [UIImage symbolImageNamed:@"checkmark"]; self.imageView.hidden = YES; - } return self; @@ -164,13 +163,13 @@ const NSString* SWC_SERVER_KEY = @"srvr"; if (!_bottomLine) { CGRect rectZero = CGRectMake(0, 0, 0, 0); _bottomLine = [[UIView alloc] initWithFrame:rectZero]; - _bottomLine.backgroundColor = [UIColor colorWithWhite:.5 alpha:.5]; + _bottomLine.backgroundColor = [UIColor separatorColor]; [self.backgroundView addSubview:_bottomLine]; } if (!_bottomLineSelected) { CGRect rectZero = CGRectMake(0, 0, 0, 0); _bottomLineSelected = [[UIView alloc] initWithFrame:rectZero]; - _bottomLineSelected.backgroundColor = [UIColor colorWithWhite:.5 alpha:.5]; + _bottomLineSelected.backgroundColor = [UIColor separatorColor]; [self.selectedBackgroundView addSubview: _bottomLineSelected]; } @@ -195,13 +194,13 @@ const NSString* SWC_SERVER_KEY = @"srvr"; if (!_topLine) { CGRect rectZero = CGRectMake(0, 0, 0, 0); _topLine = [[UIView alloc] initWithFrame:rectZero]; - _topLine.backgroundColor = [UIColor colorWithWhite:.5 alpha:.5]; + _topLine.backgroundColor = [UIColor separatorColor]; [self.backgroundView addSubview:_topLine]; } if (!_topLineSelected) { CGRect rectZero = CGRectMake(0, 0, 0, 0); _topLineSelected = [[UIView alloc] initWithFrame:rectZero]; - _topLineSelected.backgroundColor = [UIColor colorWithWhite:.5 alpha:.5]; + _topLineSelected.backgroundColor = [UIColor separatorColor]; [self.selectedBackgroundView addSubview: _topLineSelected]; } @@ -264,7 +263,7 @@ const NSString* SWC_SERVER_KEY = @"srvr"; _table = [[UITableView alloc] init]; [_table setTranslatesAutoresizingMaskIntoConstraints:NO]; [_table setAutoresizingMask:UIViewAutoresizingNone]; - [_table setBackgroundColor:[UIColor clearColor]]; + [_table setBackgroundColor:[UIColor systemBackgroundColor]]; [_table setSeparatorStyle:UITableViewCellSeparatorStyleNone]; } [_table sizeToFit]; @@ -313,8 +312,8 @@ const NSString* SWC_SERVER_KEY = @"srvr"; CGFloat scale = [[UIScreen mainScreen] scale]; table.layer.borderWidth = 1.0 / scale; - table.layer.borderColor = [UIColor colorWithWhite:.5 alpha:.5].CGColor; - + table.layer.borderColor = [UIColor opaqueSeparatorColor].CGColor; + [self setPreferredContentSize:CGSizeMake(0, manyCredentialsHeight + 20.0)]; } else if ([_credentials count] == 2) {