Fix iOS 8 bug causing site search field to be auto-capitalized.

Project configuration update.
Remove generated resources from repository.
2014-10-01 07:35:57 -04:00 · 2014-09-30 08:33:46 -04:00 · 2014-09-30 08:25:47 -04:00 · 2014-09-30 08:24:29 -04:00 · 2014-09-30 08:20:35 -04:00 · 2014-09-30 00:09:40 -04:00
51 changed files with 213 additions and 79 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@
 xcuserdata/
 /DerivedData/

+# Generated
+MasterPassword/Resources/Media/Images.xcassets/
+
 # Media
 Press/Background.png
 Press/Front-Page.png
--- a/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
+++ b/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
@@ -50,7 +50,7 @@
 		<key>3E67FB08419C920516AAC3B00DAAF23073B8CF77</key>
 		<string>../External/RHStatusItemView</string>
 		<key>3ED8592497DB6A564366943C9AAD5A46341B5076</key>
-		<string>../External/AttributedMarkdown/</string>
+		<string>../External/AttributedMarkdown</string>
 		<key>4DDCFFD91B41F00326AD14553BD66CFD366ABD91</key>
 		<string>../External/Pearl</string>
 		<key>8A15A8EA0B3D0B497C4883425BC74DF995224BB3</key>
--- a/MasterPassword/ObjC/MPAppDelegate_InApp.m
+++ b/MasterPassword/ObjC/MPAppDelegate_InApp.m
@@ -139,9 +139,9 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
            case SKPaymentTransactionStatePurchased: {
                inf( @"purchased: %@", transaction.payment.productIdentifier );
                if ([transaction.payment.productIdentifier isEqualToString:MPProductFuel]) {
-                    float currentFuel = [[MPiOSConfig get].developmentFuel floatValue];
+                    float currentFuel = [[MPiOSConfig get].developmentFuelRemaining floatValue];
                    float purchasedFuel = transaction.payment.quantity / MP_FUEL_HOURLY_RATE;
-                    [MPiOSConfig get].developmentFuel = @(currentFuel + purchasedFuel);
+                    [MPiOSConfig get].developmentFuelRemaining = @(currentFuel + purchasedFuel);
                    if (![MPiOSConfig get].developmentFuelChecked || !currentFuel)
                        [MPiOSConfig get].developmentFuelChecked = [NSDate date];
                }
--- a/MasterPassword/ObjC/iOS/MPPasswordsViewController.m
+++ b/MasterPassword/ObjC/iOS/MPPasswordsViewController.m
@@ -63,10 +63,14 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {

    self.view.backgroundColor = [UIColor clearColor];
    [self.passwordCollectionView automaticallyAdjustInsetsForKeyboard];
-    [self.passwordsSearchBar enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
-        if ([subview isKindOfClass:[UITextField class]])
-            ((UITextField *)subview).keyboardAppearance = UIKeyboardAppearanceDark;
-    }                               recurse:YES];
+    self.passwordsSearchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
+    if ([self.passwordsSearchBar respondsToSelector:@selector(keyboardAppearance)])
+        self.passwordsSearchBar.keyboardAppearance = UIKeyboardAppearanceDark;
+    else
+        [self.passwordsSearchBar enumerateViews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
+            if ([subview isKindOfClass:[UITextField class]])
+                ((UITextField *)subview).keyboardAppearance = UIKeyboardAppearanceDark;
+        }                               recurse:YES];
 }

 - (void)viewWillAppear:(BOOL)animated {
--- a/MasterPassword/ObjC/iOS/MPStoreViewController.h
+++ b/MasterPassword/ObjC/iOS/MPStoreViewController.h
@@ -20,6 +20,7 @@
@property(weak, nonatomic) IBOutlet UITableViewCell *loadingCell;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *fuelMeterConstraint;
@property(weak, nonatomic) IBOutlet UIButton *fuelSpeedButton;
+@property(weak, nonatomic) IBOutlet UILabel *fuelStatusLabel;

 + (NSString *)latestStoreFeatures;

--- a/MasterPassword/ObjC/iOS/MPStoreViewController.m
+++ b/MasterPassword/ObjC/iOS/MPStoreViewController.m
@@ -82,7 +82,7 @@ PearlEnum( MPDevelopmentFuelConsumption,
    PearlRemoveNotificationObservers();
 }

-#pragma mark - UITableViewDelegate
+#pragma mark - UITableViewDataSource

 - (MPStoreProductCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

@@ -106,6 +106,13 @@ PearlEnum( MPDevelopmentFuelConsumption,
    return cell;
 }

+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+
+    return NO;
+}
+
+#pragma mark - UITableViewDelegate
+
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

    UITableViewCell *cell = [self tableView:tableView cellForRowAtIndexPath:indexPath];
@@ -252,18 +259,24 @@ PearlEnum( MPDevelopmentFuelConsumption,
 - (void)updateFuel {

    CGFloat weeklyFuelConsumption = [self weeklyFuelConsumption]; /* consume x fuel / week */
-    CGFloat fuel = [[MPiOSConfig get].developmentFuel floatValue]; /* x fuel left */
+    CGFloat fuelRemaining = [[MPiOSConfig get].developmentFuelRemaining floatValue]; /* x fuel left */
+    CGFloat fuelInvested = [[MPiOSConfig get].developmentFuelInvested floatValue]; /* x fuel left */
    NSDate *now = [NSDate date];
    NSTimeInterval fuelSecondsElapsed = -[[MPiOSConfig get].developmentFuelChecked timeIntervalSinceDate:now];
    if (fuelSecondsElapsed > 3600 || ![MPiOSConfig get].developmentFuelChecked) {
        NSTimeInterval weeksElapsed = fuelSecondsElapsed / (3600 * 24 * 7 /* 1 week */); /* x weeks elapsed */
-        fuel -= weeklyFuelConsumption * weeksElapsed;
+        NSTimeInterval fuelConsumed = weeklyFuelConsumption * weeksElapsed;
+        fuelRemaining -= fuelConsumed;
+        fuelInvested += fuelConsumed;
        [MPiOSConfig get].developmentFuelChecked = now;
-        [MPiOSConfig get].developmentFuel = @(fuel);
+        [MPiOSConfig get].developmentFuelRemaining = @(fuelRemaining);
+        [MPiOSConfig get].developmentFuelInvested = @(fuelInvested);
    }

-    CGFloat fuelRatio = weeklyFuelConsumption == 0? 0: fuel / weeklyFuelConsumption; /* x weeks worth of fuel left */
+    CGFloat fuelRatio = weeklyFuelConsumption == 0? 0: fuelRemaining / weeklyFuelConsumption; /* x weeks worth of fuel left */
    [self.fuelMeterConstraint updateConstant:MIN( 0.5f, fuelRatio - 0.5f ) * 160]; /* -80pt = 0 weeks left, 80pt = >=1 week left */
+    self.fuelStatusLabel.text = strf( @"fuel left: %0.1f work hours\ninvested: %0.1f work hours", fuelRemaining, fuelInvested );
+    self.fuelStatusLabel.hidden = (fuelRemaining + fuelInvested) == 0;
 }

 - (CGFloat)weeklyFuelConsumption {
@@ -302,7 +315,7 @@ PearlEnum( MPDevelopmentFuelConsumption,
 - (NSInteger)quantityForProductIdentifier:(NSString *)productIdentifier {

    if ([productIdentifier isEqualToString:MPProductFuel])
-        return (NSInteger)(MP_FUEL_HOURLY_RATE * [self weeklyFuelConsumption]);
+        return (NSInteger)(MP_FUEL_HOURLY_RATE * [self weeklyFuelConsumption] + .5f);

    return 1;
 }
--- a/MasterPassword/ObjC/iOS/MPiOSConfig.h
+++ b/MasterPassword/ObjC/iOS/MPiOSConfig.h
@@ -18,7 +18,8 @@
@property(nonatomic, retain) NSNumber *loginNameTipShown;
@property(nonatomic, retain) NSNumber *traceMode;
@property(nonatomic, retain) NSNumber *dictationSearch;
-@property(nonatomic, retain) NSNumber *developmentFuel;
+@property(nonatomic, retain) NSNumber *developmentFuelRemaining;
+@property(nonatomic, retain) NSNumber *developmentFuelInvested;
@property(nonatomic, retain) NSNumber *developmentFuelConsumption;
@property(nonatomic, retain) NSDate *developmentFuelChecked;

--- a/MasterPassword/ObjC/iOS/MPiOSConfig.m
+++ b/MasterPassword/ObjC/iOS/MPiOSConfig.m
@@ -9,7 +9,7 @@
@implementation MPiOSConfig

@dynamic helpHidden, siteInfoHidden, showSetup, actionsTipShown, typeTipShown, loginNameTipShown, traceMode, dictationSearch;
-@dynamic developmentFuel, developmentFuelConsumption, developmentFuelChecked;
+@dynamic developmentFuelRemaining, developmentFuelInvested, developmentFuelConsumption, developmentFuelChecked;

 - (id)init {

--- a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist
+++ b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist
@@ -14,7 +14,9 @@
 				<string>mpsites</string>
 			</array>
 			<key>CFBundleTypeIconFiles</key>
-			<array/>
+			<array>
+				<string>Icon-Small</string>
+			</array>
 			<key>CFBundleTypeName</key>
 			<string>Master Password sites</string>
 			<key>LSHandlerRank</key>
@@ -44,7 +46,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2011-2013, Lyndir</string>
+	<string>© 2011-2014, Lyndir</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Exo2.0-Bold.otf</string>
@@ -105,9 +107,9 @@
 			<key>UTTypeIdentifier</key>
 			<string>com.lyndir.masterpassword.sites</string>
 			<key>UTTypeSize320IconFile</key>
-			<string></string>
+			<string>Icon-320.png</string>
 			<key>UTTypeSize64IconFile</key>
-			<string></string>
+			<string>Icon-64.png</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -58,6 +58,13 @@
 		DA071BF3190187FE00179766 /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF1190187FE00179766 /* empty@2x.png */; };
 		DA071BF4190187FE00179766 /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF2190187FE00179766 /* empty.png */; };
 		DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */; };
+		DA24EBAE19DAD08900FF010B /* tip_basic_black_top.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD38941711E29700CF925C /* tip_basic_black_top.png */; };
+		DA24EBAF19DAD08C00FF010B /* tip_basic_black_top@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD38951711E29700CF925C /* tip_basic_black_top@2x.png */; };
+		DA24EBE819DAD6DE00FF010B /* Icon-320.png in Resources */ = {isa = PBXBuildFile; fileRef = DA24EBE619DAD6DE00FF010B /* Icon-320.png */; };
+		DA24EBE919DAD6DE00FF010B /* Icon-64.png in Resources */ = {isa = PBXBuildFile; fileRef = DA24EBE719DAD6DE00FF010B /* Icon-64.png */; };
+		DA24EBEA19DAD6EE00FF010B /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = DA24EBBA19DAD4D000FF010B /* Icon-Small.png */; };
+		DA24EBEB19DAD6EE00FF010B /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA24EBBB19DAD4D000FF010B /* Icon-Small@2x.png */; };
+		DA24EBEC19DAD6EE00FF010B /* Icon-Small@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA24EBBC19DAD4D000FF010B /* Icon-Small@3x.png */; };
 		DA250A17195665A100AC23F1 /* UITableView+PearlReloadFromArray.m in Sources */ = {isa = PBXBuildFile; fileRef = DA250A13195665A100AC23F1 /* UITableView+PearlReloadFromArray.m */; };
 		DA250A18195665A100AC23F1 /* UITableView+PearlReloadFromArray.h in Headers */ = {isa = PBXBuildFile; fileRef = DA250A14195665A100AC23F1 /* UITableView+PearlReloadFromArray.h */; };
 		DA250A19195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.m in Sources */ = {isa = PBXBuildFile; fileRef = DA250A15195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.m */; };
@@ -172,8 +179,6 @@
 		DAA175F519D86C620044227B /* markdown_lib.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA175B719D86C620044227B /* markdown_lib.m */; };
 		DAA175F619D86C620044227B /* markdown_output.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA175B819D86C620044227B /* markdown_output.m */; };
 		DAA175F719D86C620044227B /* markdown_parser.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA175BA19D86C620044227B /* markdown_parser.m */; };
-		DAA1760F19D86C620044227B /* README.markdown in Sources */ = {isa = PBXBuildFile; fileRef = DAA175ED19D86C620044227B /* README.markdown */; };
-		DAA1761019D86C620044227B /* README_PEG-MARKDWON.markdown in Sources */ = {isa = PBXBuildFile; fileRef = DAA175EE19D86C620044227B /* README_PEG-MARKDWON.markdown */; };
 		DAA1761B19D86D0D0044227B /* libAttributedMarkdown.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAA1757D19D86BE70044227B /* libAttributedMarkdown.a */; };
 		DAA1762319D89B600044227B /* thumb_touch_id@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA1761D19D89B600044227B /* thumb_touch_id@3x.png */; };
 		DAA1762419D89B610044227B /* thumb_touch_id@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA1761E19D89B600044227B /* thumb_touch_id@2x.png */; };
@@ -521,6 +526,32 @@
 		DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		DA071BF1190187FE00179766 /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty@2x.png"; sourceTree = "<group>"; };
 		DA071BF2190187FE00179766 /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree = "<group>"; };
+		DA24EBB219DAD4D000FF010B /* Icon-60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60.png"; sourceTree = "<group>"; };
+		DA24EBB319DAD4D000FF010B /* Icon-60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60@2x.png"; sourceTree = "<group>"; };
+		DA24EBB419DAD4D000FF010B /* Icon-60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60@3x.png"; sourceTree = "<group>"; };
+		DA24EBB519DAD4D000FF010B /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
+		DA24EBB619DAD4D000FF010B /* Icon-76@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76@2x.png"; sourceTree = "<group>"; };
+		DA24EBB719DAD4D000FF010B /* Icon-Small-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-40.png"; sourceTree = "<group>"; };
+		DA24EBB819DAD4D000FF010B /* Icon-Small-40@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-40@2x.png"; sourceTree = "<group>"; };
+		DA24EBB919DAD4D000FF010B /* Icon-Small-40@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-40@3x.png"; sourceTree = "<group>"; };
+		DA24EBBA19DAD4D000FF010B /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small.png"; sourceTree = "<group>"; };
+		DA24EBBB19DAD4D000FF010B /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small@2x.png"; sourceTree = "<group>"; };
+		DA24EBBC19DAD4D000FF010B /* Icon-Small@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small@3x.png"; sourceTree = "<group>"; };
+		DA24EBBD19DAD4D000FF010B /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iTunesArtwork.png; sourceTree = "<group>"; };
+		DA24EBBE19DAD4D000FF010B /* iTunesArtwork@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork@2x.png"; sourceTree = "<group>"; };
+		DA24EBBF19DAD4D000FF010B /* icon.sketch */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = icon.sketch; sourceTree = "<group>"; };
+		DA24EBC119DAD4D000FF010B /* 32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 32.png; sourceTree = "<group>"; };
+		DA24EBC219DAD4D000FF010B /* 320-480.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "320-480.png"; sourceTree = "<group>"; };
+		DA24EBC319DAD4D000FF010B /* 320-480@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "320-480@2x.png"; sourceTree = "<group>"; };
+		DA24EBC419DAD4D000FF010B /* 320-568@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "320-568@2x.png"; sourceTree = "<group>"; };
+		DA24EBC519DAD4D000FF010B /* 375-667@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "375-667@2x.png"; sourceTree = "<group>"; };
+		DA24EBC619DAD4D000FF010B /* 414-736@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "414-736@3x.png"; sourceTree = "<group>"; };
+		DA24EBC719DAD4D000FF010B /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = "<group>"; };
+		DA24EBC819DAD4D000FF010B /* background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "background@2x.png"; sourceTree = "<group>"; };
+		DA24EBC919DAD4D000FF010B /* background@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "background@3x.png"; sourceTree = "<group>"; };
+		DA24EBCA19DAD4D000FF010B /* launch.sketch */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = launch.sketch; sourceTree = "<group>"; };
+		DA24EBE619DAD6DE00FF010B /* Icon-320.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-320.png"; sourceTree = "<group>"; };
+		DA24EBE719DAD6DE00FF010B /* Icon-64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-64.png"; sourceTree = "<group>"; };
 		DA250A13195665A100AC23F1 /* UITableView+PearlReloadFromArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITableView+PearlReloadFromArray.m"; sourceTree = "<group>"; };
 		DA250A14195665A100AC23F1 /* UITableView+PearlReloadFromArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITableView+PearlReloadFromArray.h"; sourceTree = "<group>"; };
 		DA250A15195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UICollectionReusableView+PearlDequeue.m"; sourceTree = "<group>"; };
@@ -1547,6 +1578,55 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		DA24EBB019DAD4D000FF010B /* ios */ = {
+			isa = PBXGroup;
+			children = (
+				DA24EBB119DAD4D000FF010B /* icon */,
+				DA24EBBF19DAD4D000FF010B /* icon.sketch */,
+				DA24EBC019DAD4D000FF010B /* launch */,
+				DA24EBCA19DAD4D000FF010B /* launch.sketch */,
+			);
+			path = ios;
+			sourceTree = "<group>";
+		};
+		DA24EBB119DAD4D000FF010B /* icon */ = {
+			isa = PBXGroup;
+			children = (
+				DA24EBE619DAD6DE00FF010B /* Icon-320.png */,
+				DA24EBE719DAD6DE00FF010B /* Icon-64.png */,
+				DA24EBB219DAD4D000FF010B /* Icon-60.png */,
+				DA24EBB319DAD4D000FF010B /* Icon-60@2x.png */,
+				DA24EBB419DAD4D000FF010B /* Icon-60@3x.png */,
+				DA24EBB519DAD4D000FF010B /* Icon-76.png */,
+				DA24EBB619DAD4D000FF010B /* Icon-76@2x.png */,
+				DA24EBB719DAD4D000FF010B /* Icon-Small-40.png */,
+				DA24EBB819DAD4D000FF010B /* Icon-Small-40@2x.png */,
+				DA24EBB919DAD4D000FF010B /* Icon-Small-40@3x.png */,
+				DA24EBBA19DAD4D000FF010B /* Icon-Small.png */,
+				DA24EBBB19DAD4D000FF010B /* Icon-Small@2x.png */,
+				DA24EBBC19DAD4D000FF010B /* Icon-Small@3x.png */,
+				DA24EBBD19DAD4D000FF010B /* iTunesArtwork.png */,
+				DA24EBBE19DAD4D000FF010B /* iTunesArtwork@2x.png */,
+			);
+			path = icon;
+			sourceTree = "<group>";
+		};
+		DA24EBC019DAD4D000FF010B /* launch */ = {
+			isa = PBXGroup;
+			children = (
+				DA24EBC119DAD4D000FF010B /* 32.png */,
+				DA24EBC219DAD4D000FF010B /* 320-480.png */,
+				DA24EBC319DAD4D000FF010B /* 320-480@2x.png */,
+				DA24EBC419DAD4D000FF010B /* 320-568@2x.png */,
+				DA24EBC519DAD4D000FF010B /* 375-667@2x.png */,
+				DA24EBC619DAD4D000FF010B /* 414-736@3x.png */,
+				DA24EBC719DAD4D000FF010B /* background.png */,
+				DA24EBC819DAD4D000FF010B /* background@2x.png */,
+				DA24EBC919DAD4D000FF010B /* background@3x.png */,
+			);
+			path = launch;
+			sourceTree = "<group>";
+		};
 		DA2509B619563E1E00AC23F1 /* Guide */ = {
 			isa = PBXGroup;
 			children = (
@@ -1703,6 +1783,7 @@
 		DABD360D1711E29400CF925C /* Media */ = {
 			isa = PBXGroup;
 			children = (
+				DA24EBB019DAD4D000FF010B /* ios */,
 				DAA1761D19D89B600044227B /* thumb_touch_id@3x.png */,
 				DAA1761E19D89B600044227B /* thumb_touch_id@2x.png */,
 				DAA1761F19D89B600044227B /* thumb_touch_id.png */,
@@ -2961,6 +3042,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */;
 			buildPhases = (
+				DA8D88E019DA412A00B189D0 /* Run Script: genassets */,
 				DA5BFA40147E415C00F98B1E /* Sources */,
 				DA5BFA41147E415C00F98B1E /* Frameworks */,
 				DA5BFA42147E415C00F98B1E /* Resources */,
@@ -3230,6 +3312,7 @@
 				DA7304E5194E025900E72520 /* tip_basic_black.png in Resources */,
 				DABD393A1711E29700CF925C /* avatar-10.png in Resources */,
 				DABD393B1711E29700CF925C /* avatar-10@2x.png in Resources */,
+				DA24EBAE19DAD08900FF010B /* tip_basic_black_top.png in Resources */,
 				DABD393C1711E29700CF925C /* avatar-11.png in Resources */,
 				DABD393D1711E29700CF925C /* avatar-11@2x.png in Resources */,
 				DA73049D194E022700E72520 /* ui_spinner.png in Resources */,
@@ -3238,9 +3321,11 @@
 				DA67461018DE7F0C00DFE240 /* Exo2.0-Bold.otf in Resources */,
 				DABD39401711E29700CF925C /* avatar-13.png in Resources */,
 				DA32D07C19D7D784004F3F0E /* background.png in Resources */,
+				DA24EBE919DAD6DE00FF010B /* Icon-64.png in Resources */,
 				DABD39411711E29700CF925C /* avatar-13@2x.png in Resources */,
 				DABD39421711E29700CF925C /* avatar-14.png in Resources */,
 				DABD39431711E29700CF925C /* avatar-14@2x.png in Resources */,
+				DA24EBE819DAD6DE00FF010B /* Icon-320.png in Resources */,
 				DAA1764419D8B82B0044227B /* personal_pw.png in Resources */,
 				DABD39441711E29700CF925C /* avatar-15.png in Resources */,
 				DABD39451711E29700CF925C /* avatar-15@2x.png in Resources */,
@@ -3320,6 +3405,7 @@
 				DABD39F31711E29700CF925C /* icon_cancel@2x.png in Resources */,
 				DABD3A261711E29700CF925C /* icon_edit.png in Resources */,
 				DABD3A271711E29700CF925C /* icon_edit@2x.png in Resources */,
+				DA24EBAF19DAD08C00FF010B /* tip_basic_black_top@2x.png in Resources */,
 				DABD3A3A1711E29700CF925C /* icon_find.png in Resources */,
 				DABD3A3B1711E29700CF925C /* icon_find@2x.png in Resources */,
 				DAA1765319D8B82B0044227B /* choose_type@2x.png in Resources */,
@@ -3348,6 +3434,7 @@
 				DABD3B951711E29800CF925C /* pull-down.png in Resources */,
 				DABD3B961711E29800CF925C /* pull-down@2x.png in Resources */,
 				DABD3B971711E29800CF925C /* pull-up.png in Resources */,
+				DA24EBEA19DAD6EE00FF010B /* Icon-Small.png in Resources */,
 				DABD3B981711E29800CF925C /* pull-up@2x.png in Resources */,
 				DA7304A0194E022B00E72520 /* ui_textfield@2x.png in Resources */,
 				DAA1765119D8B82B0044227B /* copy_pw@2x.png in Resources */,
@@ -3356,6 +3443,7 @@
 				DAA1764519D8B82B0044227B /* name_new@2x.png in Resources */,
 				DA45224819062899008F650A /* icon_settings@2x.png in Resources */,
 				DA854C8418D4CFBF00106317 /* avatar-add.png in Resources */,
+				DA24EBEB19DAD6EE00FF010B /* Icon-Small@2x.png in Resources */,
 				DAA1764B19D8B82B0044227B /* login_name@2x.png in Resources */,
 				DABD3C241711E2DC00CF925C /* MasterPassword.entitlements in Resources */,
 				DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */,
@@ -3374,6 +3462,7 @@
 				DAE1EF2217E942DE00BC0086 /* Localizable.strings in Resources */,
 				DA38D6A318CCB5BF009AEB3E /* Storyboard.storyboard in Resources */,
 				DA5A09DF171A70E4005284AB /* play.png in Resources */,
+				DA24EBEC19DAD6EE00FF010B /* Icon-Small@3x.png in Resources */,
 				DA5A09E0171A70E4005284AB /* play@2x.png in Resources */,
 				DA5A09EA171BB0F7005284AB /* unlocked.png in Resources */,
 				DAA1762819D89B610044227B /* thumb_ios_integration.png in Resources */,
@@ -3399,6 +3488,21 @@
 			shellPath = "/bin/bash -e";
 			shellScript = "PATH+=:/usr/libexec\n\naddPlistWithKey() {\n    local key=$1 type=$2 value=$3 plist=${4:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Delete :'$key'\" \"$plist\" 2>/dev/null || true\n    PlistBuddy -c \"Add :'$key' '$type' '$value'\" \"$plist\"\n}\nsetPlistWithKey() {\n    local key=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Set :'$key' '$value'\" \"$plist\"\n}\ngetPlistWithKey() {\n    local key=$1 plist=${2:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Print :'$key'\" \"$plist\"\n}\nsetSettingWithTitle() {\n    local i title=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Settings.bundle/Root.plist\"}\n    \n    for (( i=0; 1; ++i )); do\n        PlistBuddy -c \"Print :PreferenceSpecifiers:$i\" \"$plist\" &>/dev/null || break\n        echo \"Checking preference specifier $i\"\n    \n        [[ $(PlistBuddy -c \"Print :PreferenceSpecifiers:$i:Title\" \"$plist\" 2>/dev/null) = $title ]] || continue\n    \n        echo \"Correct title, setting value.\"\n        PlistBuddy -c \"Set :PreferenceSpecifiers:$i:DefaultValue $value\" \"$plist\"\n        break\n    done\n}\n\ndescription=$(git describe --always --dirty --long)\nversion=${description%-g*}\nIFS=- read major minor <<< \"$version\"\nprintf -v version '%s.%02d' \"$major\" \"$minor\"\nprintf -v commit '%09d' \"$((16#${description##*-g}))\"\n\naddPlistWithKey GITDescription string \"$description\"\nsetPlistWithKey CFBundleVersion \"${version//.}$commit\" # No separator between version and commit because I had already submitted a CFBundleVersion with a really high major.  Cry.\nsetPlistWithKey CFBundleShortVersionString \"$version\"\n\nsetSettingWithTitle \"Build\" \"$commit\"\nsetSettingWithTitle \"Version\" \"$version\"\nsetSettingWithTitle \"Copyright\" \"$(getPlistWithKey NSHumanReadableCopyright)\"\n\nif [[ $DEPLOYMENT_LOCATION = YES ]]; then\n    # This build is a release.  Do some release checks.\n    passed=1\n    [[ $description != *-dirty ]] || \\\n        { passed=0; echo >&2 \"ERROR: Cannot release a dirty version, first commit any changes.\"; }\n    [[ $(PlistBuddy -c \"Print :'API Key'\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Crashlytics.plist\") ]] || \\\n        { passed=0; echo >&2 \"ERROR: Cannot release: Crashlytics API key is missing.\"; }\n    (( passed )) || \\\n        { echo >&2 \"Failed to pass release checks.  Fix the above errors and re-try.  Aborting.\"; exit 1; }\nfi";
 		};
+		DA8D88E019DA412A00B189D0 /* Run Script: genassets */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script: genassets";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = "/bin/sh -e";
+			shellScript = "exec env PATH=\"/usr/local/bin:$PATH\" ../../../Scripts/genassets";
+			showEnvVarsInLog = 0;
+		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -3481,8 +3585,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				DAA175F519D86C620044227B /* markdown_lib.m in Sources */,
-				DAA1761019D86C620044227B /* README_PEG-MARKDWON.markdown in Sources */,
-				DAA1760F19D86C620044227B /* README.markdown in Sources */,
 				DAA175F719D86C620044227B /* markdown_parser.m in Sources */,
 				DAA175F619D86C620044227B /* markdown_output.m in Sources */,
 			);
@@ -3856,7 +3958,7 @@
 					"$(inherited)",
 				);
 				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "7142c408-252a-43c0-94c6-1ae1f43173f4";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "d02e889e-2701-47eb-b843-4f16c431b284";
 				SKIP_INSTALL = NO;
 				STRIP_INSTALLED_PRODUCT = YES;
 				TARGETED_DEVICE_FAMILY = 1;
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword
@@ -26,18 +26,8 @@
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "AppStore-iOS">
+      buildConfiguration = "Debug-iOS">
      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DADEF42E1810D5530052CA3E"
-               BuildableName = "LoveLyndirTests.xctest"
-               BlueprintName = "LoveLyndirTests"
-               ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
      </Testables>
      <MacroExpansion>
         <BuildableReference
@@ -54,7 +44,7 @@
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "AppStore-iOS"
+      buildConfiguration = "Debug-iOS"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      allowLocationSimulation = "YES">
@@ -74,7 +64,7 @@
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "AppStore-iOS"
+      buildConfiguration = "Debug-iOS"
      debugDocumentVersioning = "YES">
      <BuildableProductRunnable>
         <BuildableReference
--- a/MasterPassword/ObjC/iOS/Settings.bundle/Root.plist
+++ b/MasterPassword/ObjC/iOS/Settings.bundle/Root.plist
@@ -56,7 +56,7 @@
 			<key>FooterText</key>
 			<string>When enabled, you will not be logged out when switching out of the application. This will help you get to your passwords faster, but when someone finds your device unlocked, they can too.</string>
 			<key>Title</key>
-			<string>Master Password</string>
+			<string>Security</string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
@@ -70,24 +70,6 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>Enabling support for dictation in the site search box will enable the dictation button next to the space bar at the bottom of the keyboard.  Press this button and speak the name of your site to look it up.  Enabling dictation will change your keyboard which might make it slightly more difficult to enter a site name manually.</string>
-			<key>Title</key>
-			<string></string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>dictationSearch</string>
-			<key>Title</key>
-			<string>Dictation Search</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>This will keep your site&apos;s passwords hidden from view.  Enable this if you&apos;re worried about people watching your screen while you use the app.
@@ -110,7 +92,7 @@ To see a site&apos;s password anyway, tap and hold your finger down for a while
 		</dict>
 		<dict>
 			<key>FooterText</key>
-			<string>The password strength indicator estimates the time necessary to break the password from a stolen database of SHA-1 hashes.  Use this setting to choose the budget the attacker is willing to devote to breaking your site password.</string>
+			<string>The password strength indicator estimates the time necessary to break the password from a stolen database of SHA-1 hashes.  Use this setting to choose the budget the attacker is willing to devote exclusively to breaking your site password.</string>
 			<key>Title</key>
 			<string></string>
 			<key>Type</key>
@@ -144,15 +126,34 @@ To see a site&apos;s password anyway, tap and hold your finger down for a while
 				<integer>0</integer>
 				<integer>1</integer>
 				<integer>2</integer>
+				<string>3</string>
 			</array>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Enabling support for dictation in the site search box will enable the dictation button next to the space bar at the bottom of the keyboard.  Press this button and speak the name of your site to look it up.  Enabling dictation will change your keyboard which might make it slightly more difficult to enter a site name manually.</string>
+			<key>Title</key>
+			<string>Miscellaneous</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>dictationSearch</string>
+			<key>Title</key>
+			<string>Dictation Search</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 			<key>Title</key>
 			<string></string>
 			<key>FooterText</key>
-			<string>If the app tends to crash on login, enable this to check if there are any inconsistencies in your site data.  It may slow down login a bit, so keep it off when no issues are reported on login.</string>
+			<string>Enable this if the app crashes when you log in.  Master Password will scan for and repair any inconsistencies in your sites history.</string>
 		</dict>
 		<dict>
 			<key>Type</key>
--- a/MasterPassword/ObjC/iOS/Storyboard.storyboard
+++ b/MasterPassword/ObjC/iOS/Storyboard.storyboard
@@ -5,7 +5,6 @@
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
        <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
        <capability name="Unknown constraint types" minToolsVersion="5.1"/>
    </dependencies>
@@ -97,6 +96,7 @@
            <string>Exo2.0-Thin</string>
            <string>Exo2.0-Thin</string>
            <string>Exo2.0-Thin</string>
+            <string>Exo2.0-Thin</string>
        </mutableArray>
        <mutableArray key="SourceCodePro-Black.otf">
            <string>SourceCodePro-Black</string>
@@ -2294,7 +2294,7 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                                        <rect key="frame" x="20" y="20" width="335" height="80"/>
                                    </imageView>
                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Stay Logged In?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5X1-J4-TbH">
-                                        <rect key="frame" x="20" y="108" width="335" height="20"/>
+                                        <rect key="frame" x="20" y="108" width="335" height="20.5"/>
                                        <fontDescription key="fontDescription" name="Exo2.0-Bold" family="Exo 2.0" pointSize="17"/>
                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                        <nil key="highlightedColor"/>
@@ -2303,8 +2303,8 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien.
                                        <rect key="frame" x="163" y="532" width="51" height="31"/>
                                        <color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
                                    </switch>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e80-98-V6D">
-                                        <rect key="frame" x="20" y="136.5" width="335" height="147"/>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e80-98-V6D">
+                                        <rect key="frame" x="20" y="137" width="335" height="151.5"/>
                                        <string key="text">The right balance between security and convenience is often very personal.

 To make getting to your passwords faster, you can remain logged in after you close Master Password.  This allows you to skip having to log in the next time.
@@ -2824,7 +2824,7 @@ See </string>
                                                </label>
                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fz2-AO-aGW">
                                                    <rect key="frame" x="20" y="254" width="335" height="119.5"/>
-                                                    <string key="text">You really love Master Password and how it's solving your password problems.  You're eager to encourage the maintenance, technical support and development of new features.  I am a one-man shop, more fuel means I can allocate more hours to Master Password.
+                                                    <string key="text">You really love Master Password and how it's solving your password problems.  You're eager to encourage the maintenance, technical support and development of new features.  I am a one-man shop, fuel enables me to allocate more work hours to Master Password.

 UPCOMING:
 – Safari integration
@@ -2862,6 +2862,14 @@ UPCOMING:
                                                        <action selector="toggleFuelConsumption:" destination="pdl-xv-zjX" eventType="touchUpInside" id="NkB-Dy-IeY"/>
                                                    </connections>
                                                </button>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kYb-j4-32C">
+                                                    <rect key="frame" x="20" y="64" width="117.5" height="26.5"/>
+                                                    <string key="text">fuel left: 0.3 work hours
+invested: 3.7 work hours</string>
+                                                    <fontDescription key="fontDescription" name="Exo2.0-Thin" family="Exo 2.0" pointSize="11"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                            </subviews>
                                            <constraints>
                                                <constraint firstItem="aGb-QC-A92" firstAttribute="bottom" secondItem="PnG-hP-syh" secondAttribute="bottom" id="0Jx-M5-xlh"/>
@@ -2875,7 +2883,9 @@ UPCOMING:
                                                <constraint firstItem="dsR-fr-dY4" firstAttribute="top" secondItem="SzQ-Y5-XIF" secondAttribute="top" constant="20" id="VH2-O8-CGj"/>
                                                <constraint firstAttribute="bottom" secondItem="fz2-AO-aGW" secondAttribute="bottom" constant="20" symbolic="YES" id="Wqo-Le-AcG"/>
                                                <constraint firstItem="eS4-59-Xny" firstAttribute="centerX" secondItem="PnG-hP-syh" secondAttribute="centerX" id="ZbQ-LX-kmS"/>
+                                                <constraint firstItem="kYb-j4-32C" firstAttribute="leading" secondItem="dsR-fr-dY4" secondAttribute="leading" id="bih-Ha-Tz7"/>
                                                <constraint firstItem="EbU-DV-fKF" firstAttribute="leading" secondItem="Jnv-uN-xeg" secondAttribute="trailing" constant="8" symbolic="YES" id="cku-JX-4bK"/>
+                                                <constraint firstItem="kYb-j4-32C" firstAttribute="top" secondItem="dsR-fr-dY4" secondAttribute="bottom" id="eJU-g8-KuU"/>
                                                <constraint firstItem="aGb-QC-A92" firstAttribute="centerX" secondItem="PnG-hP-syh" secondAttribute="centerX" constant="80" id="eMa-Gj-BUc"/>
                                                <constraint firstItem="dsR-fr-dY4" firstAttribute="leading" secondItem="SzQ-Y5-XIF" secondAttribute="leading" constant="20" id="eX0-7y-eHi"/>
                                                <constraint firstAttribute="centerX" secondItem="PnG-hP-syh" secondAttribute="centerX" id="gO5-ME-YVO"/>
@@ -2912,7 +2922,7 @@ UPCOMING:
                                                </label>
                                            </subviews>
                                            <constraints>
-                                                <constraint firstAttribute="bottomMargin" secondItem="ARC-xH-0U0" secondAttribute="bottom" constant="40" id="4ux-Ao-e12"/>
+                                                <constraint firstAttribute="bottom" secondItem="ARC-xH-0U0" secondAttribute="bottom" constant="48" id="5L9-Ag-d1G"/>
                                                <constraint firstAttribute="centerX" secondItem="ARC-xH-0U0" secondAttribute="centerX" id="asI-QK-u6O"/>
                                                <constraint firstItem="ARC-xH-0U0" firstAttribute="top" secondItem="Vjt-7c-BJ4" secondAttribute="bottom" constant="40" id="g1T-rA-vOW"/>
                                                <constraint firstAttribute="centerX" secondItem="Vjt-7c-BJ4" secondAttribute="centerX" id="j2l-mA-Duf"/>
@@ -2939,7 +2949,7 @@ UPCOMING:
                                                    </connections>
                                                </button>
                                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bCe-a3-cDC">
-                                                    <rect key="frame" x="16" y="24" width="343" height="26"/>
+                                                    <rect key="frame" x="8" y="24" width="359" height="26"/>
                                                    <fontDescription key="fontDescription" name="Exo2.0-Regular" family="Exo 2.0" pointSize="11"/>
                                                    <state key="normal" title="Send Thanks">
                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -2957,13 +2967,13 @@ UPCOMING:
                                            </subviews>
                                            <constraints>
                                                <constraint firstAttribute="trailing" secondItem="IOk-WZ-HJ8" secondAttribute="trailing" constant="20" symbolic="YES" id="CuJ-h7-aGJ"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="bCe-a3-cDC" secondAttribute="trailing" constant="8" id="Lfp-Hx-vLN"/>
+                                                <constraint firstAttribute="trailing" secondItem="bCe-a3-cDC" secondAttribute="trailing" constant="8" id="Lfp-Hx-vLN"/>
                                                <constraint firstAttribute="trailing" secondItem="DxV-2L-bxL" secondAttribute="trailing" constant="20" symbolic="YES" id="QHU-Jw-LPy"/>
                                                <constraint firstItem="IOk-WZ-HJ8" firstAttribute="top" secondItem="bCe-a3-cDC" secondAttribute="bottom" constant="8" symbolic="YES" id="bfe-bp-fGn"/>
                                                <constraint firstItem="DxV-2L-bxL" firstAttribute="leading" secondItem="4Zu-Ig-Ws4" secondAttribute="leading" constant="20" symbolic="YES" id="fAD-At-gqS"/>
                                                <constraint firstItem="DxV-2L-bxL" firstAttribute="top" secondItem="4Zu-Ig-Ws4" secondAttribute="top" constant="4" id="hTN-Cx-hOS"/>
                                                <constraint firstItem="bCe-a3-cDC" firstAttribute="top" secondItem="DxV-2L-bxL" secondAttribute="bottom" constant="8" symbolic="YES" id="hfr-MK-Me2"/>
-                                                <constraint firstItem="bCe-a3-cDC" firstAttribute="leading" secondItem="4Zu-Ig-Ws4" secondAttribute="leadingMargin" constant="8" id="l4A-fH-9fA"/>
+                                                <constraint firstItem="bCe-a3-cDC" firstAttribute="leading" secondItem="4Zu-Ig-Ws4" secondAttribute="leading" constant="8" id="l4A-fH-9fA"/>
                                                <constraint firstItem="IOk-WZ-HJ8" firstAttribute="leading" secondItem="4Zu-Ig-Ws4" secondAttribute="leading" constant="20" symbolic="YES" id="mx2-Jk-5jo"/>
                                                <constraint firstAttribute="bottom" secondItem="IOk-WZ-HJ8" secondAttribute="bottom" id="xEZ-X4-5oi"/>
                                            </constraints>
@@ -2985,6 +2995,7 @@ UPCOMING:
                        <outlet property="fuelCell" destination="le3-Q5-MSO" id="oAk-6g-cFj"/>
                        <outlet property="fuelMeterConstraint" destination="eMa-Gj-BUc" id="9iF-EO-UU6"/>
                        <outlet property="fuelSpeedButton" destination="dsR-fr-dY4" id="XGI-PE-9mh"/>
+                        <outlet property="fuelStatusLabel" destination="kYb-j4-32C" id="o5R-0u-kGL"/>
                        <outlet property="generateAnswersCell" destination="l1g-Ul-Vg8" id="GlG-iZ-7FP"/>
                        <outlet property="generateLoginCell" destination="JVW-tG-xxe" id="PXM-WX-8Qe"/>
                        <outlet property="iOSIntegrationCell" destination="9Na-CL-jBq" id="LSO-OV-9KA"/>
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1 +0,0 @@
-{"images":[{"size":"60x60","filename":"Icon-60@3x.png","scale":"3x","idiom":"iphone","minimum-system-version":"8.0"},{"size":"40x40","filename":"Icon-Small-40@3x.png","scale":"3x","idiom":"iphone","minimum-system-version":"8.0"},{"size":"60x60","filename":"Icon-60@2x.png","scale":"2x","idiom":"iphone","minimum-system-version":"7.0"},{"size":"40x40","filename":"Icon-Small-40@2x.png","scale":"2x","idiom":"iphone","minimum-system-version":"7.0"},{"size":"29x29","filename":"Icon-Small@3x.png","scale":"3x","idiom":"iphone"},{"size":"29x29","filename":"Icon-Small@2x.png","scale":"2x","idiom":"iphone"},{"size":"76x76","filename":"Icon-76.png","scale":"1x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"76x76","filename":"Icon-76@2x.png","scale":"2x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"40x40","filename":"Icon-Small-40.png","scale":"1x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"40x40","filename":"Icon-Small-40@2x.png","scale":"2x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"29x29","filename":"Icon-Small.png","scale":"1x","idiom":"ipad"},{"size":"29x29","filename":"Icon-Small@2x.png","scale":"2x","idiom":"ipad"}],"info":{"version":1,"author":"genassets"},"properties":{"pre-rendered":true}}
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
--- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -1 +0,0 @@
-{"images":[{"extent":"full-screen","filename":"Default-8.0-736h@3x~iphone.png","orientation":"portrait","scale":"3x","idiom":"iphone","minimum-system-version":"8.0","subtype":"736h"},{"extent":"full-screen","filename":"Default-8.0-667h@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","minimum-system-version":"8.0","subtype":"667h"},{"extent":"full-screen","filename":"Default-7.0-retina4@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","minimum-system-version":"7.0","subtype":"retina4"},{"extent":"full-screen","filename":"Default-retina4@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","subtype":"retina4"},{"extent":"full-screen","filename":"Default-7.0@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","minimum-system-version":"7.0"},{"extent":"full-screen","filename":"Default@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone"},{"extent":"full-screen","filename":"Default~iphone.png","orientation":"portrait","scale":"1x","idiom":"iphone"}],"info":{"version":1,"author":"genassets"}}
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-7.0-retina4@2x~iphone.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-7.0-retina4@2x~iphone.png
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-7.0@2x~iphone.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-7.0@2x~iphone.png
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-8.0-667h@2x~iphone.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-8.0-667h@2x~iphone.png
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-8.0-736h@3x~iphone.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-8.0-736h@3x~iphone.png
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-retina4@2x~iphone.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-retina4@2x~iphone.png
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default@2x~iphone.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default@2x~iphone.png
--- a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default~iphone.png
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default~iphone.png
--- a/MasterPassword/Resources/Media/ios/icon.sketch/Data
+++ b/MasterPassword/Resources/Media/ios/icon.sketch/Data
--- a/MasterPassword/Resources/Media/ios/icon.sketch/metadata
+++ b/MasterPassword/Resources/Media/ios/icon.sketch/metadata
@@ -15,7 +15,7 @@
 		<string>HelveticaNeue-Medium</string>
 	</array>
 	<key>length</key>
-	<integer>371142</integer>
+	<integer>918726</integer>
 	<key>version</key>
 	<integer>37</integer>
 </dict>
--- a/MasterPassword/Resources/Media/ios/icon/Icon-320.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-320.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-60.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-60.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-60@2x.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-60@2x.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-60@3x.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-60@3x.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-64.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-64.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-76.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-76.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-76@2x.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-76@2x.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-Small-40.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-Small-40.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-Small-40@2x.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-Small-40@2x.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-Small-40@3x.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-Small-40@3x.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-Small.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-Small.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-Small@2x.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-Small@2x.png
--- a/MasterPassword/Resources/Media/ios/icon/Icon-Small@3x.png
+++ b/MasterPassword/Resources/Media/ios/icon/Icon-Small@3x.png
--- a/MasterPassword/Resources/Media/ios/icon/iTunesArtwork.png
+++ b/MasterPassword/Resources/Media/ios/icon/iTunesArtwork.png
--- a/MasterPassword/Resources/Media/ios/icon/iTunesArtwork@2x.png
+++ b/MasterPassword/Resources/Media/ios/icon/iTunesArtwork@2x.png
--- a/Scripts/bashlib
+++ b/Scripts/bashlib
@@ -715,15 +715,15 @@ log() {
        && printf >> "$_logFile" '%s' "$logMsg"

    # Start the spinner.
-    if [[ $type = startProgress && ! $_logSpinner ]]; then
+    if [[ $type = startProgress && ! $_logSpinner && $TERM != dumb ]]; then
        {
            set +m
-            trap 'printf %s "$show"' EXIT
-            printf %s "$hide"
-            while printf "$eel$blue$bold[$reset%s$reset$blue$bold]$reset\b\b\b" "${spinner[s++ % ${#spinner[@]}]}" && sleep .1
+            trap 'printf >&2 %s "$show"' EXIT
+            printf >&2 %s "$hide"
+            while printf >&2 "$eel$blue$bold[$reset%s$reset$blue$bold]$reset\b\b\b" "${spinner[s++ % ${#spinner[@]}]}" && sleep .1
            do :; done
        } & _logSpinner=$!
-    fi 2>/dev/null
+    fi

    return $exitcode
 }
--- a/Scripts/genassets
+++ b/Scripts/genassets
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # See https://developer.apple.com/library/ios/qa/qa1686/_index.html
+cd "${BASH_SOURCE%/*}"
 source bashlib
+cd ..

 # icons format: [pixel size]@[scale]@[idiom]@[os]:[filename] -- if os is "anything lower", omit it
 icons=(
@@ -63,7 +65,7 @@ launchimage="$xcassets/LaunchImage.launchimage"
 ios_icon=MasterPassword/Resources/Media/ios/icon
 ios_launch=MasterPassword/Resources/Media/ios/launch

-[[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]] && {
+if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]]; then
    rm -rf "$appiconset"; mkdir -p "$appiconset"
    {
        comma=
@@ -82,14 +84,17 @@ ios_launch=MasterPassword/Resources/Media/ios/launch
                printf '}'

                comma=,
+            else
+                rm "$appiconset/Contents.json"
+                exit
            fi

        done
        printf '],"info":{"version":1,"author":"genassets"},"properties":{"pre-rendered":true}}\n'
    } > "$appiconset/Contents.json"
-}
+fi

-[[ "$(latest "$ios_launch"/*)" -nt "$launchimage/Contents.json" ]] && {
+if [[ "$(latest "$ios_launch"/*)" -nt "$launchimage/Contents.json" ]]; then
    rm -rf "$launchimage"; mkdir -p "$launchimage"
    {
        comma=
@@ -114,11 +119,14 @@ ios_launch=MasterPassword/Resources/Media/ios/launch
                printf '}'

                comma=,
+            else
+                rm "$launchimage/Contents.json"
+                exit
            fi
        done
        printf '],"info":{"version":1,"author":"genassets"}}\n'
    } > "$launchimage/Contents.json"
-}
+fi

 #for file in resources/images/mdpi/*.png; do
 #    name=${file##*/} name=${name%.*} name=${name/.9/}
Author	SHA1	Message	Date
Maarten Billemont	9b24efa65c	Fix iOS 8 bug causing site search field to be auto-capitalized.	2014-10-01 07:35:57 -04:00
Maarten Billemont	3e217d5a69	Project configuration update.	2014-09-30 08:33:46 -04:00
Maarten Billemont	c8ca1c80e6	Remove generated resources from repository.	2014-09-30 08:25:47 -04:00
Maarten Billemont	88c18db010	Optimize icons.	2014-09-30 08:24:29 -04:00
Maarten Billemont	f909cdbae4	More icon fixes + don't delete store rows...	2014-09-30 08:20:35 -04:00
Maarten Billemont	8b8d5d325e	Fix some warnings.	2014-09-30 00:09:40 -04:00
Maarten Billemont	c7670f47db	Record the amount of fuel consumed and show status + icon update & genassets run script.	2014-09-30 00:01:33 -04:00
				`@@ -1 +0,0 @@`
				{"images":[{"size":"60x60","filename":"Icon-60@3x.png","scale":"3x","idiom":"iphone","minimum-system-version":"8.0"},{"size":"40x40","filename":"Icon-Small-40@3x.png","scale":"3x","idiom":"iphone","minimum-system-version":"8.0"},{"size":"60x60","filename":"Icon-60@2x.png","scale":"2x","idiom":"iphone","minimum-system-version":"7.0"},{"size":"40x40","filename":"Icon-Small-40@2x.png","scale":"2x","idiom":"iphone","minimum-system-version":"7.0"},{"size":"29x29","filename":"Icon-Small@3x.png","scale":"3x","idiom":"iphone"},{"size":"29x29","filename":"Icon-Small@2x.png","scale":"2x","idiom":"iphone"},{"size":"76x76","filename":"Icon-76.png","scale":"1x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"76x76","filename":"Icon-76@2x.png","scale":"2x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"40x40","filename":"Icon-Small-40.png","scale":"1x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"40x40","filename":"Icon-Small-40@2x.png","scale":"2x","idiom":"ipad","minimum-system-version":"7.0"},{"size":"29x29","filename":"Icon-Small.png","scale":"1x","idiom":"ipad"},{"size":"29x29","filename":"Icon-Small@2x.png","scale":"2x","idiom":"ipad"}],"info":{"version":1,"author":"genassets"},"properties":{"pre-rendered":true}}
				`@@ -1 +0,0 @@`
				{"images":[{"extent":"full-screen","filename":"Default-8.0-736h@3x~iphone.png","orientation":"portrait","scale":"3x","idiom":"iphone","minimum-system-version":"8.0","subtype":"736h"},{"extent":"full-screen","filename":"Default-8.0-667h@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","minimum-system-version":"8.0","subtype":"667h"},{"extent":"full-screen","filename":"Default-7.0-retina4@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","minimum-system-version":"7.0","subtype":"retina4"},{"extent":"full-screen","filename":"Default-retina4@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","subtype":"retina4"},{"extent":"full-screen","filename":"Default-7.0@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone","minimum-system-version":"7.0"},{"extent":"full-screen","filename":"Default@2x~iphone.png","orientation":"portrait","scale":"2x","idiom":"iphone"},{"extent":"full-screen","filename":"Default~iphone.png","orientation":"portrait","scale":"1x","idiom":"iphone"}],"info":{"version":1,"author":"genassets"}}