Merge branch 'carthage' of https://github.com/pizthewiz/zxcvbn-ios in…

…to pizthewiz-carthage # Conflicts: # Example/Base.lproj/Main_iPad.storyboard # Example/Base.lproj/Main_iPhone.storyboard # Zxcvbn.xcodeproj/project.pbxproj # Zxcvbn/Base.lproj/Main.storyboard # Zxcvbn/Base.lproj/Main_iPhone.storyboard # ZxcvbnTests/ZxcvbnTests.m
dropbox · Apr 27, 2016 · 1bf2b1d · 1bf2b1d
2 parents e77ffd9 + 32d9cb0
commit 1bf2b1d
Show file tree

Hide file tree

Showing 33 changed files with 891 additions and 409 deletions.
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
@@ -5,16 +5,31 @@
       "size" : "29x29",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "40x40",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",

diff --git a/Example/Base.lproj/LaunchScreen.storyboard b/Example/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Zxcvbn/Base.lproj/Main.storyboard → Example/Base.lproj/Main.storyboard b/Zxcvbn/Base.lproj/Main.storyboard → Example/Base.lproj/Main.storyboard
diff --git a/Zxcvbn/DBAppDelegate.h → Example/DBAppDelegate.h b/Zxcvbn/DBAppDelegate.h → Example/DBAppDelegate.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Dropbox. All rights reserved.
 //
 
+#include <UIKit/UIKit.h>
+
 @interface DBAppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;

diff --git a/Zxcvbn/DBAppDelegate.m → Example/DBAppDelegate.m b/Zxcvbn/DBAppDelegate.m → Example/DBAppDelegate.m
@@ -8,7 +8,7 @@
 
 #import "DBAppDelegate.h"
 
-#import "DBZxcvbn.h"
+#import <Zxcvbn/DBZxcvbn.h>
 
 @implementation DBAppDelegate
 

diff --git a/Zxcvbn/DBCreateAccountViewController.h → Example/DBCreateAccountViewController.h b/Zxcvbn/DBCreateAccountViewController.h → Example/DBCreateAccountViewController.h
diff --git a/Zxcvbn/DBCreateAccountViewController.m → Example/DBCreateAccountViewController.m b/Zxcvbn/DBCreateAccountViewController.m → Example/DBCreateAccountViewController.m
@@ -8,7 +8,7 @@
 
 #import "DBCreateAccountViewController.h"
 
-#import "DBPasswordStrengthMeterView.h"
+#import <Zxcvbn/DBPasswordStrengthMeterView.h>
 
 @interface DBCreateAccountViewController () <DBPasswordStrengthMeterViewDelegate>
 

diff --git a/Zxcvbn/Zxcvbn-Info.plist → Example/Info.plist b/Zxcvbn/Zxcvbn-Info.plist → Example/Info.plist
@@ -4,24 +4,22 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/Zxcvbn/main.m → Example/main.m b/Zxcvbn/main.m → Example/main.m
diff --git a/Zxcvbn.xcodeproj/project.pbxproj b/Zxcvbn.xcodeproj/project.pbxproj
diff --git a/Zxcvbn.xcodeproj/project.xcworkspace/xcshareddata/Zxcvbn.xccheckout b/Zxcvbn.xcodeproj/project.xcworkspace/xcshareddata/Zxcvbn.xccheckout
diff --git a/Zxcvbn.xcodeproj/xcshareddata/xcschemes/Zxcvbn.xcscheme b/Zxcvbn.xcodeproj/xcshareddata/xcschemes/Zxcvbn.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0710"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D80ECB671BDEAA420055EF0A"
+               BuildableName = "Zxcvbn.framework"
+               BlueprintName = "Zxcvbn"
+               ReferencedContainer = "container:Zxcvbn.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D80ECB711BDEAA420055EF0A"
+               BuildableName = "ZxcvbnTests.xctest"
+               BlueprintName = "ZxcvbnTests"
+               ReferencedContainer = "container:Zxcvbn.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D80ECB671BDEAA420055EF0A"
+            BuildableName = "Zxcvbn.framework"
+            BlueprintName = "Zxcvbn"
+            ReferencedContainer = "container:Zxcvbn.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D80ECB671BDEAA420055EF0A"
+            BuildableName = "Zxcvbn.framework"
+            BlueprintName = "Zxcvbn"
+            ReferencedContainer = "container:Zxcvbn.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D80ECB671BDEAA420055EF0A"
+            BuildableName = "Zxcvbn.framework"
+            BlueprintName = "Zxcvbn"
+            ReferencedContainer = "container:Zxcvbn.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Zxcvbn/Zxcvbn/DBMatcher.h → Zxcvbn/DBMatcher.h b/Zxcvbn/Zxcvbn/DBMatcher.h → Zxcvbn/DBMatcher.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Dropbox. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 @interface DBMatcher : NSObject
 
 @property (nonatomic, assign) NSUInteger keyboardAverageDegree;

diff --git a/Zxcvbn/Zxcvbn/DBMatcher.m → Zxcvbn/DBMatcher.m b/Zxcvbn/Zxcvbn/DBMatcher.m → Zxcvbn/DBMatcher.m
diff --git a/Zxcvbn/Zxcvbn/DBScorer.h → Zxcvbn/DBScorer.h b/Zxcvbn/Zxcvbn/DBScorer.h → Zxcvbn/DBScorer.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Dropbox. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 @class DBResult;
 
 @interface DBScorer : NSObject

diff --git a/Zxcvbn/Zxcvbn/DBScorer.m → Zxcvbn/DBScorer.m b/Zxcvbn/Zxcvbn/DBScorer.m → Zxcvbn/DBScorer.m
diff --git a/Zxcvbn/Zxcvbn/DBZxcvbn.h → Zxcvbn/DBZxcvbn.h b/Zxcvbn/Zxcvbn/DBZxcvbn.h → Zxcvbn/DBZxcvbn.h
diff --git a/Zxcvbn/Zxcvbn/DBZxcvbn.m → Zxcvbn/DBZxcvbn.m b/Zxcvbn/Zxcvbn/DBZxcvbn.m → Zxcvbn/DBZxcvbn.m
@@ -7,6 +7,7 @@
 //
 
 #import "DBZxcvbn.h"
+#import <QuartzCore/QuartzCore.h>
 
 @interface DBZxcvbn ()
 

diff --git a/Zxcvbn/Images.xcassets/LaunchImage.launchimage/Contents.json b/Zxcvbn/Images.xcassets/LaunchImage.launchimage/Contents.json
diff --git a/Zxcvbn/Info.plist b/Zxcvbn/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/Zxcvbn/LaunchScreen.storyboard b/Zxcvbn/LaunchScreen.storyboard
diff --git a/Zxcvbn/Zxcvbn-Prefix.pch b/Zxcvbn/Zxcvbn-Prefix.pch