From dc13e32e4e9eaefc55da111efb78e11a0af40b1e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Jun 2018 12:30:54 -0400 Subject: [PATCH] Don't use dynamic type in registration view... yet. --- .../ViewControllers/Registration/RegistrationViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m index fd23f59fd..d8d549222 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m +++ b/Signal/src/ViewControllers/Registration/RegistrationViewController.m @@ -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];