diff options
| -rwxr-xr-x | Volta/Resources/InfoGraphic/index.html | 8 | ||||
| -rw-r--r-- | Volta/Views/InfographicViewController.m | 2 | ||||
| -rw-r--r-- | Volta/Volta-Info.plist | 1 | ||||
| -rw-r--r-- | Volta/en.lproj/MainStoryboard.storyboard | 51 |
4 files changed, 6 insertions, 56 deletions
diff --git a/Volta/Resources/InfoGraphic/index.html b/Volta/Resources/InfoGraphic/index.html index 8be97ec..3d21f4b 100755 --- a/Volta/Resources/InfoGraphic/index.html +++ b/Volta/Resources/InfoGraphic/index.html @@ -46,11 +46,11 @@ <h2 class='lineHeight'><span id='totalUsage'>999</span> <span class='medium'>kWh</span></h2> <p>of energy</p> <hr class='yellow'/> - <h2>$<span id='totalCost'>99.99</span></h2> + <h2>$<span id='totalCost'></span></h2> <hr class='yellow'/> <p>This is on average</p> - <h2><span id='averageUsage'>99.9</span> <span class='small'>kWh</span> <span class='small light'>or</span></h2> - <h2 class='floatLeft'>$<span id='averageCost'>99.99</span></h2> + <h2><span id='averageUsage'></span> <span class='small'>kWh</span> <span class='small light'>or</span></h2> + <h2 class='floatLeft'>$<span id='averageCost'></span></h2> <div class='perDay'><h2 class='small'>per</br>day</h2></div> <div class='clearfix'></div> <hr class='yellow'/> @@ -83,7 +83,7 @@ <div class='clearfix'></div> <hr class='red'/> <div class='floatLeft'> - <h2>$<span id='yearlySavings'>408</span></h2><p>a month or</p> + <h2>$<span id='yearlySavings'>408</span></h2><p>a year</p> </div> <div id='yearlyDollar'></div> <div class='clearfix'></div> diff --git a/Volta/Views/InfographicViewController.m b/Volta/Views/InfographicViewController.m index a247597..0eabb92 100644 --- a/Volta/Views/InfographicViewController.m +++ b/Volta/Views/InfographicViewController.m @@ -34,6 +34,7 @@ [self.webView loadHTMLString:markup baseURL:[NSURL URLWithString:[NSString stringWithFormat:@"file:/%@//", resourcePath]]]; }); + self.webView.alpha = 0.0; } @@ -74,6 +75,7 @@ dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC)); dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ [self.webView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"updateData(%.2f, %.2f)", totalkWh, totalCost]]; + [self.webView fadeIn]; }); } diff --git a/Volta/Volta-Info.plist b/Volta/Volta-Info.plist index ade1231..d992a35 100644 --- a/Volta/Volta-Info.plist +++ b/Volta/Volta-Info.plist @@ -47,7 +47,6 @@ </array> <key>UISupportedInterfaceOrientations</key> <array> - <string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeRight</string> </array> diff --git a/Volta/en.lproj/MainStoryboard.storyboard b/Volta/en.lproj/MainStoryboard.storyboard index 0a6b752..18d6acb 100644 --- a/Volta/en.lproj/MainStoryboard.storyboard +++ b/Volta/en.lproj/MainStoryboard.storyboard @@ -437,57 +437,6 @@ <image name="grass@2x.jpg" width="1100" height="846"/> <image name="logo@2x.png" width="234" height="166"/> </resources> - <classes> - <class className="DataTableViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/DataTableViewController.h"/> - </class> - <class className="GraphViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/GraphViewController.h"/> - <relationships> - <relationship kind="outlet" name="webView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="InfographicViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/InfographicViewController.h"/> - <relationships> - <relationship kind="outlet" name="webView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="LoginViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LoginViewController.h"/> - <relationships> - <relationship kind="action" name="backgroundTapped:"/> - <relationship kind="action" name="login:"/> - <relationship kind="outlet" name="contentView" candidateClass="UIView"/> - <relationship kind="outlet" name="email" candidateClass="UITextField"/> - <relationship kind="outlet" name="logo" candidateClass="UIImageView"/> - <relationship kind="outlet" name="password" candidateClass="UITextField"/> - </relationships> - </class> - <class className="StatsTabBarController" superclassName="UITabBarController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/StatsTabBarController.h"/> - </class> - <class className="StatsViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/StatsViewController.h"/> - <relationships> - <relationship kind="action" name="backgroundTapped:"/> - <relationship kind="action" name="statsCurrentMonth:"/> - <relationship kind="action" name="statsCurrentYear:"/> - <relationship kind="action" name="statsLast30days:"/> - <relationship kind="action" name="statsLast60days:"/> - <relationship kind="action" name="statsStartdateEnddate:"/> - <relationship kind="outlet" name="content" candidateClass="UIScrollView"/> - <relationship kind="outlet" name="endDate" candidateClass="UITextField"/> - <relationship kind="outlet" name="startDate" candidateClass="UITextField"/> - </relationships> - </class> - <class className="VoltaButton" superclassName="UIButton"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/VoltaButton.h"/> - </class> - <class className="VoltaReadOnlyTextField" superclassName="UITextField"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/VoltaReadOnlyTextField.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> |