Added provisions for Face ID

Author: TimOliver

TOPasscodeViewController/Supporting/TOPasscodeViewControllerConstants.h

@@ -49,10 +49,23 @@ typedef NS_ENUM(NSInteger, TOPasscodeType) {
     TOPasscodeTypeCustomAlphanumeric    // Any length of characters
 };
 
+/* The type of biometrics this controller can handle */
+typedef NS_ENUM(NSInteger, TOPasscodeBiometryType) {
+    TOPasscodeBiometryTypeTouchID,
+    TOPasscodeBiometryTypeFaceID
+};
+
 static inline BOOL TOPasscodeViewStyleIsTranslucent(TOPasscodeViewStyle style) {
     return style <= TOPasscodeViewStyleTranslucentLight;
 }
 
 static inline BOOL TOPasscodeViewStyleIsDark(TOPasscodeViewStyle style) {
     return style < TOPasscodeViewStyleTranslucentLight || style == TOPasscodeViewStyleOpaqueDark;
 }
+
+static inline NSString *TOPasscodeBiometryTitleForType(TOPasscodeBiometryType type) {
+    switch (type) {
+        case TOPasscodeBiometryTypeFaceID: return @"Face ID";
+        default: return @"Touch ID";
+    }
+}

TOPasscodeViewController/TOPasscodeViewController.h

@@ -79,10 +79,13 @@ NS_ASSUME_NONNULL_BEGIN
 /** The type of passcode that is expected to be entered. */
 @property (nonatomic, readonly) TOPasscodeType passcodeType;
 
-/** Will show a 'Touch ID' button for that the user can tap to initiate Touch ID verification. (Default is NO) */
+/** Will show a 'Touch ID' or 'Face ID' (depending on `biometricType`) button if the user is allowed to log in that way. (Default is NO) */
 @property (nonatomic, assign) BOOL allowBiometricValidation;
 
-/** If Touch ID is available, automatically ask for it upon presentation (Default is NO) */
+/** Set the type of biometrics for this device to update the title of the biometrics button properly. */
+@property (nonatomic, assign) TOPasscodeBiometryType biometryType;
+
+/** If biometrics are available, automatically ask for it upon presentation (Default is NO) */
 @property (nonatomic, assign) BOOL automaticallyPromptForBiometricValidation;
 
 /** Optionally change the color of the title text label. */

TOPasscodeViewController/TOPasscodeViewController.m

@@ -155,7 +155,7 @@ - (void)setUpAccessoryButtons
 
     if (!self.leftAccessoryButton && self.allowBiometricValidation && !self.biometricButton) {
         self.biometricButton = [UIButton buttonWithType:UIButtonTypeSystem];
-        [self.biometricButton setTitle:@"Touch ID" forState:UIControlStateNormal];
+        [self.biometricButton setTitle:TOPasscodeBiometryTitleForType(self.biometryType) forState:UIControlStateNormal];
         [self.biometricButton addTarget:self action:@selector(accessoryButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
 
         if (isPad) {
@@ -617,6 +617,17 @@ - (void)setAccessoryButtonTintColor:(UIColor *)accessoryButtonTintColor
     [self applyThemeForStyle:self.style];
 }
 
+- (void)setBiometryType:(TOPasscodeBiometryType)biometryType
+{
+    if (_biometryType == biometryType) { return; }
+    
+    _biometryType = biometryType;
+    
+    if (self.biometricButton) {
+        [self.biometricButton setTitle:TOPasscodeBiometryTitleForType(_biometryType) forState:UIControlStateNormal];
+    }
+}
+
 - (void)setContentHidden:(BOOL)contentHidden
 {
     [self setContentHidden:contentHidden animated:NO];

TOPasscodeViewController/Views/Settings/TOPasscodeSettingsKeypadView.m

@@ -26,7 +26,7 @@
 #import "TOSettingsKeypadImage.h"
 const CGFloat kTOPasscodeSettingsKeypadButtonInnerSpacing = 7.0f;
 const CGFloat kTOPasscodeSettingsKeypadButtonOuterSpacing = 7.0f;
-const CGFloat kTOPasscodeSettingsKeypadCornderRadius = 10.0f;
+const CGFloat kTOPasscodeSettingsKeypadCornderRadius = 12.0f;
 
 @interface TOPasscodeSettingsKeypadView ()
 
@@ -208,6 +208,11 @@ - (void)layoutSubviews
 
     viewSize.width -= (outerSpacing * 2.0f);
     viewSize.height -= (outerSpacing * 2.0f);
+    
+    // Pull the buttons up to avoid overlapping the home indicator on iPhone X
+    if (@available(iOS 11.0, *)) {
+        viewSize.height -= self.safeAreaInsets.bottom;
+    }
 
     // Four rows of three buttons
     buttonSize.width = floorf((viewSize.width - (innerSpacing * 2.0f)) / 3.0f);
@@ -233,6 +238,12 @@ - (void)layoutSubviews
 
     //Layout delete button
     CGSize boundsSize = self.bounds.size;
+    
+    // Adjust for home indicator on iPhone X
+    if (@available(iOS 11.0, *)) {
+        boundsSize.height -= self.safeAreaInsets.bottom;
+    }
+    
     CGRect frame = self.deleteButton.frame;
     frame.size = buttonSize;
     frame.origin.x = boundsSize.width - (outerSpacing + buttonSize.width * 0.5f);

TOPasscodeViewControllerExample.xcodeproj/project.pbxproj

@@ -33,7 +33,6 @@
 		22D361391EDCC1D7002E5D35 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D361301EDCC1D7002E5D35 /* main.m */; };
 		22D3613A1EDCC1D7002E5D35 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D361321EDCC1D7002E5D35 /* ViewController.m */; };
 		22D3613B1EDCC1D7002E5D35 /* wallpaper.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 22D361331EDCC1D7002E5D35 /* wallpaper.jpg */; };
-		22D3613F1EDCC1EA002E5D35 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22D3613D1EDCC1EA002E5D35 /* Info.plist */; };
 		22D361401EDCC1EA002E5D35 /* TOPasscodeViewControllerExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D3613E1EDCC1EA002E5D35 /* TOPasscodeViewControllerExampleTests.m */; };
 		22D5C81A1EE9F99600745F9A /* TOPasscodeSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D5C8191EE9F99600745F9A /* TOPasscodeSettingsViewController.m */; };
 		22EAD9DA1EFA4CEF00D0C408 /* TOSettingsKeypadImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 22EAD9D91EFA4CEF00D0C408 /* TOSettingsKeypadImage.m */; };
@@ -321,7 +320,7 @@
 		22F8069B1ECABB3D0053C94E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Timothy Oliver";
 				TargetAttributes = {
 					22F806A21ECABB3D0053C94E = {
@@ -372,7 +371,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				22D3613F1EDCC1EA002E5D35 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -473,15 +471,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -522,15 +526,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

TOPasscodeViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOPasscodeViewControllerExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

TOPasscodeViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOPasscodeViewControllerExampleTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

TOPasscodeViewControllerExample/Info.plist

@@ -45,5 +45,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Use Face ID to unlock this demo app of TOPasscodeViewController</string>
 </dict>
 </plist>

TOPasscodeViewControllerExample/ViewController.m

@@ -22,6 +22,7 @@ @interface ViewController () <TOPasscodeViewControllerDelegate>
 
 @property (nonatomic, strong) LAContext *authContext;
 @property (nonatomic, assign) BOOL biometricsAvailable;
+@property (nonatomic, assign) BOOL faceIDAvailable;
 
 @end
 
@@ -38,13 +39,18 @@ - (void)viewDidLoad {
     // Show 'Touch ID' button if it's available
     self.authContext = [[LAContext alloc] init];
     self.biometricsAvailable = [self.authContext canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:nil];
+    
+    if (@available(iOS 11.0, *)) {
+        self.faceIDAvailable = (self.authContext.biometryType == LABiometryTypeFaceID);
+    }
 }
 
 - (IBAction)showButtonTapped:(id)sender
 {
     TOPasscodeViewController *passcodeViewController = [[TOPasscodeViewController alloc] initWithStyle:self.style passcodeType:self.type];
     passcodeViewController.delegate = self;
     passcodeViewController.allowBiometricValidation = self.biometricsAvailable;
+    passcodeViewController.biometryType = self.faceIDAvailable ? TOPasscodeBiometryTypeFaceID : TOPasscodeBiometryTypeTouchID;
     [self presentViewController:passcodeViewController animated:YES completion:nil];
 }