Skip to content

Commit b923315

Browse files
ddaddyddaddy
committed
Fixed latest xCode compiler warnings and updated demo to latest Xcode settings.
1 parent 98f6378 commit b923315

File tree

2 files changed

+40
-24
lines changed

2 files changed

+40
-24
lines changed

‎Demo/LTHPasscodeViewController Demo.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
isa = PBXProject;
172172
attributes = {
173173
CLASSPREFIX = LTH;
174-
LastUpgradeCheck = 0800;
174+
LastUpgradeCheck = 0930;
175175
ORGANIZATIONNAME = "Roland Leth";
176176
TargetAttributes = {
177177
2AE8000517D9503000DBDE63 = {
@@ -272,14 +272,22 @@
272272
CLANG_CXX_LIBRARY = "libc++";
273273
CLANG_ENABLE_MODULES = YES;
274274
CLANG_ENABLE_OBJC_ARC = YES;
275+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
275276
CLANG_WARN_BOOL_CONVERSION = YES;
277+
CLANG_WARN_COMMA = YES;
276278
CLANG_WARN_CONSTANT_CONVERSION = YES;
279+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
277280
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
278281
CLANG_WARN_EMPTY_BODY = YES;
279282
CLANG_WARN_ENUM_CONVERSION = YES;
280283
CLANG_WARN_INFINITE_RECURSION = YES;
281284
CLANG_WARN_INT_CONVERSION = YES;
285+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
286+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
287+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
282288
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
289+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
290+
CLANG_WARN_STRICT_PROTOTYPES = YES;
283291
CLANG_WARN_SUSPICIOUS_MOVE = YES;
284292
CLANG_WARN_UNREACHABLE_CODE = YES;
285293
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -318,14 +326,22 @@
318326
CLANG_CXX_LIBRARY = "libc++";
319327
CLANG_ENABLE_MODULES = YES;
320328
CLANG_ENABLE_OBJC_ARC = YES;
329+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
321330
CLANG_WARN_BOOL_CONVERSION = YES;
331+
CLANG_WARN_COMMA = YES;
322332
CLANG_WARN_CONSTANT_CONVERSION = YES;
333+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
323334
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
324335
CLANG_WARN_EMPTY_BODY = YES;
325336
CLANG_WARN_ENUM_CONVERSION = YES;
326337
CLANG_WARN_INFINITE_RECURSION = YES;
327338
CLANG_WARN_INT_CONVERSION = YES;
339+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
340+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
341+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
328342
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
343+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
344+
CLANG_WARN_STRICT_PROTOTYPES = YES;
329345
CLANG_WARN_SUSPICIOUS_MOVE = YES;
330346
CLANG_WARN_UNREACHABLE_CODE = YES;
331347
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎LTHPasscodeViewController/LTHPasscodeViewController.m‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -328,20 +328,20 @@ - (void)resetPasscode {
328328
- (void)_handleBiometricsFailureAndDisableIt:(BOOL)disableBiometrics {
329329
dispatch_async(dispatch_get_main_queue(), ^{
330330
if (disableBiometrics) {
331-
_isUsingBiometrics = NO;
332-
_allowUnlockWithBiometrics = NO;
331+
self.isUsingBiometrics = NO;
332+
self.allowUnlockWithBiometrics = NO;
333333
}
334334

335-
_useFallbackPasscode = YES;
336-
_animatingView.hidden = NO;
335+
self.useFallbackPasscode = YES;
336+
self.animatingView.hidden = NO;
337337

338-
BOOL usingNavBar = _isUsingNavBar;
339-
NSString *logoutTitle = usingNavBar ? _navBar.items.firstObject.leftBarButtonItem.title : @"";
338+
BOOL usingNavBar = self.isUsingNavBar;
339+
NSString *logoutTitle = usingNavBar ? self.navBar.items.firstObject.leftBarButtonItem.title : @"";
340340

341341
[self _resetUI];
342342

343343
if (usingNavBar) {
344-
_isUsingNavBar = usingNavBar;
344+
self.isUsingNavBar = usingNavBar;
345345
[self _setupNavBarWithLogoutTitle:logoutTitle];
346346
}
347347
});
@@ -569,7 +569,7 @@ - (void)_dismissMe {
569569
[self _resetUI];
570570
[_passcodeTextField resignFirstResponder];
571571
[UIView animateWithDuration: _lockAnimationDuration animations: ^{
572-
if (_displayedAsLockScreen) {
572+
if (self.displayedAsLockScreen) {
573573
if (LTHiOS8) {
574574
self.view.center = CGPointMake(self.view.center.x, self.view.center.y * 2.f);
575575
}
@@ -590,18 +590,18 @@ - (void)_dismissMe {
590590
}
591591
else {
592592
// Delete from Keychain
593-
if (_isUserTurningPasscodeOff) {
593+
if (self.isUserTurningPasscodeOff) {
594594
[self _deletePasscode];
595595
}
596596
// Update the Keychain if adding or changing passcode
597597
else {
598-
[self _savePasscode:_tempPasscode];
598+
[self _savePasscode:self.tempPasscode];
599599
//finalize type switching
600-
if (_isUserSwitchingBetweenPasscodeModes) {
601-
_isUserConfirmingPasscode = NO;
600+
if (self.isUserSwitchingBetweenPasscodeModes) {
601+
self.isUserConfirmingPasscode = NO;
602602
[self setIsSimple:!self.isSimple
603603
inViewController:nil
604-
asModal:_displayedAsModal];
604+
asModal:self.displayedAsModal];
605605
}
606606
}
607607
}
@@ -610,15 +610,15 @@ - (void)_dismissMe {
610610
[self.delegate performSelector: @selector(passcodeViewControllerWillClose)];
611611
}
612612

613-
if (_displayedAsLockScreen) {
613+
if (self.displayedAsLockScreen) {
614614
[self.view removeFromSuperview];
615615
[self removeFromParentViewController];
616616
}
617-
else if (_displayedAsModal) {
617+
else if (self.displayedAsModal) {
618618
[self dismissViewControllerAnimated:YES
619619
completion:nil];
620620
}
621-
else if (!_displayedAsLockScreen) {
621+
else if (!self.displayedAsLockScreen) {
622622
[self.navigationController popViewControllerAnimated:NO];
623623
}
624624
}];
@@ -849,8 +849,8 @@ - (void)updateViewConstraints {
849849

850850
if (self.isSimple) {
851851
[_digitTextFieldsArray enumerateObjectsUsingBlock:^(UITextField * _Nonnull textField, NSUInteger idx, BOOL * _Nonnull stop) {
852-
CGFloat constant = idx == 0 ? 0 : _horizontalGap;
853-
UIView *toItem = idx == 0 ? _simplePasscodeView : _digitTextFieldsArray[idx - 1];
852+
CGFloat constant = idx == 0 ? 0 : self.horizontalGap;
853+
UIView *toItem = idx == 0 ? self.simplePasscodeView : self.digitTextFieldsArray[idx - 1];
854854

855855
NSLayoutConstraint *digitX =
856856
[NSLayoutConstraint constraintWithItem: textField
@@ -865,7 +865,7 @@ - (void)updateViewConstraints {
865865
[NSLayoutConstraint constraintWithItem: textField
866866
attribute: NSLayoutAttributeTop
867867
relatedBy: NSLayoutRelationEqual
868-
toItem: _simplePasscodeView
868+
toItem: self.simplePasscodeView
869869
attribute: NSLayoutAttributeTop
870870
multiplier: 1.0f
871871
constant: 0];
@@ -874,7 +874,7 @@ - (void)updateViewConstraints {
874874
[NSLayoutConstraint constraintWithItem: textField
875875
attribute: NSLayoutAttributeBottom
876876
relatedBy: NSLayoutRelationEqual
877-
toItem: _simplePasscodeView
877+
toItem: self.simplePasscodeView
878878
attribute: NSLayoutAttributeBottom
879879
multiplier: 1.0f
880880
constant: 0];
@@ -883,12 +883,12 @@ - (void)updateViewConstraints {
883883
[self.view addConstraint:top];
884884
[self.view addConstraint:bottom];
885885

886-
if (idx == _digitTextFieldsArray.count - 1) {
886+
if (idx == self.digitTextFieldsArray.count - 1) {
887887
NSLayoutConstraint *trailing =
888888
[NSLayoutConstraint constraintWithItem: textField
889889
attribute: NSLayoutAttributeTrailing
890890
relatedBy: NSLayoutRelationEqual
891-
toItem: _simplePasscodeView
891+
toItem: self.simplePasscodeView
892892
attribute: NSLayoutAttributeTrailing
893893
multiplier: 1.0f
894894
constant: 0];
@@ -1458,7 +1458,7 @@ - (void)_resetTextFields {
14581458
// cancel in the Touch ID prompt. In some cases, the keyboard is present, but invisible
14591459
// after dismissing the alert unless we call becomeFirstResponder with a short delay
14601460
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
1461-
[_passcodeTextField becomeFirstResponder];
1461+
[self.passcodeTextField becomeFirstResponder];
14621462
});
14631463
}
14641464

0 commit comments

Comments
 (0)