Record the amount of fuel consumed and show status + icon update & genassets run script.

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>

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];
                 }

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;
 

MasterPassword/ObjC/iOS/MPStoreViewController.m

@@ -252,18 +252,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 +308,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;
 }

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;
 

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 {
 

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -2961,6 +2961,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */;
 			buildPhases = (
+				DA8D88E019DA412A00B189D0 /* Run Script: genassets */,
 				DA5BFA40147E415C00F98B1E /* Sources */,
 				DA5BFA41147E415C00F98B1E /* Frameworks */,
 				DA5BFA42147E415C00F98B1E /* Resources */,
@@ -3399,6 +3400,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;

MasterPassword/ObjC/iOS/Storyboard.storyboard

@@ -97,6 +97,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>
@@ -2824,7 +2825,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 +2863,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" misplaced="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kYb-j4-32C">
+                                                    <rect key="frame" x="20" y="64" width="121" 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 +2884,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"/>
@@ -2985,6 +2996,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"/>

MasterPassword/Resources/Media/ios/icon.sketch/metadata

@@ -15,7 +15,7 @@
 		<string>HelveticaNeue-Medium</string>
 	</array>
 	<key>length</key>
-	<integer>371142</integer>
+	<integer>782300</integer>
 	<key>version</key>
 	<integer>37</integer>
 </dict>

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
 }

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/}