oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/registrationViewVsDynamicType'

Browse source
This commit is contained in:
Matthew Chen 2018-06-01 17:38:06 -04:00
parent c1f5d1d555 dc13e32e4e
commit aa2480c9a3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Signal/src/ViewControllers/Registration/RegistrationViewController.m
View file

@ -94,7 +94,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi
UILabel *legalTopMatterLabel = [UILabel new];
legalTopMatterLabel.textColor = UIColor.whiteColor;
legalTopMatterLabel.font = UIFont.ows_dynamicTypeFootnoteFont;
legalTopMatterLabel.font = [UIFont ows_regularFontWithSize:ScaleFromIPhone5To7Plus(13.f, 15.f)];
legalTopMatterLabel.numberOfLines = 0;
legalTopMatterLabel.textAlignment = NSTextAlignmentCenter;
legalTopMatterLabel.attributedText = attributedLegalTopMatter;
@ -247,7 +247,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi
NSString *bottomTermsLinkText = NSLocalizedString(@"REGISTRATION_LEGAL_TERMS_LINK",
@"one line label below submit button on registration screen, which links to an external webpage.");
UIButton *bottomLegalLinkButton = [UIButton new];
bottomLegalLinkButton.titleLabel.font = UIFont.ows_dynamicTypeFootnoteFont;
bottomLegalLinkButton.titleLabel.font = [UIFont ows_regularFontWithSize:ScaleFromIPhone5To7Plus(13.f, 15.f)];
[bottomLegalLinkButton setTitleColor:UIColor.ows_materialBlueColor forState:UIControlStateNormal];
[bottomLegalLinkButton setTitle:bottomTermsLinkText forState:UIControlStateNormal];
[contentView addSubview:bottomLegalLinkButton];