From 24e675ff07769cb7dc03e5d53b1f2bdee8ced9e2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 5 Jul 2018 17:36:52 -0600 Subject: [PATCH 1/2] Use dismissable text views where cramped on shorter devices // FREEBIE --- Signal/src/ViewControllers/ProfileViewController.m | 7 ++++++- .../Registration/CodeVerificationViewController.m | 7 ++++++- Signal/src/views/PinEntryView.m | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 56d96d18f..235bd2eea 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -117,7 +117,12 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat [nameLabel autoPinLeadingToSuperviewMargin]; [nameLabel autoPinHeightToSuperviewWithMargin:5.f]; - UITextField *nameTextField = [UITextField new]; + UITextField *nameTextField; + if (UIDevice.currentDevice.isShorterThanIPhone5) { + nameTextField = [DismissableTextField new]; + } else { + nameTextField = [UITextField new]; + } _nameTextField = nameTextField; nameTextField.font = [UIFont ows_mediumFontWithSize:18.f]; nameTextField.textColor = [UIColor ows_materialBlueColor]; diff --git a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m b/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m index 0cc01b497..014f6efcf 100644 --- a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m +++ b/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m @@ -147,7 +147,12 @@ NS_ASSUME_NONNULL_BEGIN const CGFloat kHMargin = 36; - _challengeTextField = [UITextField new]; + if (UIDevice.currentDevice.isShorterThanIPhone5) { + _challengeTextField = [DismissableTextField new]; + } else { + _challengeTextField = [UITextField new]; + } + _challengeTextField.textColor = [UIColor blackColor]; _challengeTextField.placeholder = NSLocalizedString(@"VERIFICATION_CHALLENGE_DEFAULT_TEXT", @"Text field placeholder for SMS verification code during registration"); diff --git a/Signal/src/views/PinEntryView.m b/Signal/src/views/PinEntryView.m index 1e8cb6d97..cf69c398f 100644 --- a/Signal/src/views/PinEntryView.m +++ b/Signal/src/views/PinEntryView.m @@ -59,7 +59,12 @@ NS_ASSUME_NONNULL_BEGIN - (void)createPinTextfield { - self.pinTextfield = [UITextField new]; + if (UIDevice.currentDevice.isShorterThanIPhone5) { + self.pinTextfield = [DismissableTextField new]; + } else { + self.pinTextfield = [UITextField new]; + } + self.pinTextfield.textColor = [UIColor blackColor]; self.pinTextfield.font = [UIFont ows_mediumFontWithSize:ScaleFromIPhone5To7Plus(30.f, 36.f)]; self.pinTextfield.textAlignment = NSTextAlignmentCenter; From 394990685be7708a42d009df62712d081e9fd302 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 5 Jul 2018 17:46:28 -0600 Subject: [PATCH 2/2] "Bump build to 2.27.1.3." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index a7f77e754..33fc34f67 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.27.1.2 + 2.27.1.3 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 997f8c2e4..d863dedda 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.27.1 CFBundleVersion - 2.27.1.2 + 2.27.1.3 ITSAppUsesNonExemptEncryption NSAppTransportSecurity