diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 80fedfa..a743303 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -68,7 +68,7 @@ 66A27898E989A3FA5C15AA671C4536F0 /* EXPMatchers+beIdenticalTo.m in Sources */ = {isa = PBXBuildFile; fileRef = 760BA7B5F09D477F128F7CD8D3AB7FF2 /* EXPMatchers+beIdenticalTo.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 67459AD239EF669A365519E06B45DCFE /* EXPExpect.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F63B0FF272D1EB750D82F3EADA2D2CA /* EXPExpect.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6846FE121C4A950100FD46A7 /* StrongestPasswordValidator.h in Headers */ = {isa = PBXBuildFile; fileRef = 6846FE101C4A950100FD46A7 /* StrongestPasswordValidator.h */; }; - 6846FE131C4A950100FD46A7 /* StrongestPasswordValidator.h in Headers */ = {isa = PBXBuildFile; fileRef = 6846FE101C4A950100FD46A7 /* StrongestPasswordValidator.h */; }; + 6846FE131C4A950100FD46A7 /* StrongestPasswordValidator.h in Headers */ = {isa = PBXBuildFile; fileRef = 6846FE101C4A950100FD46A7 /* StrongestPasswordValidator.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6846FE141C4A950100FD46A7 /* StrongestPasswordValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 6846FE111C4A950100FD46A7 /* StrongestPasswordValidator.m */; }; 6846FE151C4A950100FD46A7 /* StrongestPasswordValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 6846FE111C4A950100FD46A7 /* StrongestPasswordValidator.m */; }; 6846FE161C4A950100FD46A7 /* StrongestPasswordValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 6846FE111C4A950100FD46A7 /* StrongestPasswordValidator.m */; }; diff --git a/Example/StrongestPasswordValidator.xcodeproj/project.pbxproj b/Example/StrongestPasswordValidator.xcodeproj/project.pbxproj index ec5d78c..250dc0e 100644 --- a/Example/StrongestPasswordValidator.xcodeproj/project.pbxproj +++ b/Example/StrongestPasswordValidator.xcodeproj/project.pbxproj @@ -467,7 +467,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -500,7 +500,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; diff --git a/Example/StrongestPasswordValidator/Main.storyboard b/Example/StrongestPasswordValidator/Main.storyboard index 272479a..e363804 100644 --- a/Example/StrongestPasswordValidator/Main.storyboard +++ b/Example/StrongestPasswordValidator/Main.storyboard @@ -1,11 +1,11 @@ - + - + - + @@ -16,8 +16,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/StrongestPasswordValidator/StrongestPasswordValidatorAppDelegate.m b/Example/StrongestPasswordValidator/StrongestPasswordValidatorAppDelegate.m index 6ae84e7..11c3846 100644 --- a/Example/StrongestPasswordValidator/StrongestPasswordValidatorAppDelegate.m +++ b/Example/StrongestPasswordValidator/StrongestPasswordValidatorAppDelegate.m @@ -13,6 +13,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. + return YES; } diff --git a/Example/StrongestPasswordValidator/StrongestPasswordValidatorViewController.m b/Example/StrongestPasswordValidator/StrongestPasswordValidatorViewController.m index ba284de..a7d84aa 100644 --- a/Example/StrongestPasswordValidator/StrongestPasswordValidatorViewController.m +++ b/Example/StrongestPasswordValidator/StrongestPasswordValidatorViewController.m @@ -7,8 +7,15 @@ // #import "StrongestPasswordValidatorViewController.h" +#import "StrongestPasswordValidator.h" + +@interface StrongestPasswordValidatorViewController () + +@property (nonatomic, strong) StrongestPasswordValidator *validator; +@property (weak, nonatomic) IBOutlet UILabel *strenghtLabel; +@property (weak, nonatomic) IBOutlet UIProgressView *strenghtProgress; +@property (weak, nonatomic) IBOutlet UITextField *passwordTextfield; -@interface StrongestPasswordValidatorViewController () @end @@ -17,7 +24,8 @@ - (void)viewDidLoad { [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. + // Do any additional setup after loading the view, typically from a nib. + _validator = [StrongestPasswordValidator sharedInstance]; } - (void)didReceiveMemoryWarning @@ -26,4 +34,28 @@ // Dispose of any resources that can be recreated. } +- (IBAction)change:(id)sender { + + [_validator checkPasswordStrength:[_passwordTextfield text] withBlock:^(UIColor * _Nonnull color, PasswordStrengthType strenghtType) { + switch (strenghtType) { + case PasswordStrengthTypeWeak: { + [_strenghtProgress setProgress:0.33]; + [_strenghtLabel setText:@"Weak"]; + break; + } + case PasswordStrengthTypeModerate: { + [_strenghtProgress setProgress:0.66]; + [_strenghtLabel setText:@"Moderate"]; + break; + } + case PasswordStrengthTypeStrong: { + [_strenghtProgress setProgress:1]; + [_strenghtLabel setText:@"Strongsd"]; + break; + } + } + [_strenghtProgress setTintColor:color]; + }]; +} + @end diff --git a/Pod/Classes/StrongestPasswordValidator.h b/Pod/Classes/StrongestPasswordValidator.h index 404c5ab..7a7cc5b 100755 --- a/Pod/Classes/StrongestPasswordValidator.h +++ b/Pod/Classes/StrongestPasswordValidator.h @@ -20,7 +20,7 @@ typedef NS_ENUM(NSInteger, PasswordStrengthType) { - (void) setColor:(UIColor * _Nonnull) color forPasswordStrenghtType:(PasswordStrengthType) strenghtType; -- (void)checkPasswordStrength:(NSString * _Nonnull )password withBlock:(id _Nonnull) object inBackGroundWithBlock:(nullable void (^)(UIColor * _Nonnull color, PasswordStrengthType strenghtType)) responseBlock; +- (void)checkPasswordStrength:(NSString * _Nonnull )password withBlock:(nullable void (^)(UIColor * _Nonnull color, PasswordStrengthType strenghtType)) responseBlock; - (PasswordStrengthType)checkPasswordStrength:(NSString * _Nonnull)password; diff --git a/Pod/Classes/StrongestPasswordValidator.m b/Pod/Classes/StrongestPasswordValidator.m index 8da7a84..8632ab7 100755 --- a/Pod/Classes/StrongestPasswordValidator.m +++ b/Pod/Classes/StrongestPasswordValidator.m @@ -93,7 +93,7 @@ static bool isFirstAccess = YES; return self; } -- (void)checkPasswordStrength:(NSString * _Nonnull )password withBlock:(id _Nonnull) object inBackGroundWithBlock:(nullable void (^)(UIColor * _Nonnull color, PasswordStrengthType strenghtType)) responseBlock; { +- (void)checkPasswordStrength:(NSString * _Nonnull )password withBlock:(nullable void (^)(UIColor * _Nonnull color, PasswordStrengthType strenghtType)) responseBlock; { if (responseBlock) { diff --git a/StrongestPasswordValidator.podspec b/StrongestPasswordValidator.podspec index c26f714..e1770ea 100644 --- a/StrongestPasswordValidator.podspec +++ b/StrongestPasswordValidator.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "StrongestPasswordValidator" -s.version = "0.1.0" +s.version = "0.1.1" s.summary = "StrongestPasswordValidator." # This description is used to generate tags and improve search results.