diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index c9ef5ff..4c0bbc0 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -18,29 +18,31 @@ under the License. --> + package="com.moparisthebest.pointswatcher" android:versionName="0.1" android:versionCode="1" + android:hardwareAccelerated="true"> + + android:largeScreens="true" + android:normalScreens="true" + android:smallScreens="true" + android:xlargeScreens="true" + android:resizeable="true" + android:anyDensity="true" + /> - - + + - + android:hardwareAccelerated="true" + android:debuggable="true"> + - - + + diff --git a/android/android.iml b/android/android.iml new file mode 100644 index 0000000..233cc4e --- /dev/null +++ b/android/android.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/android/assets/values.db b/android/assets/values.db new file mode 100644 index 0000000..9e5adc2 Binary files /dev/null and b/android/assets/values.db differ diff --git a/android/assets/www b/android/assets/www deleted file mode 120000 index 933a599..0000000 --- a/android/assets/www +++ /dev/null @@ -1 +0,0 @@ -../../www \ No newline at end of file diff --git a/android/gen/R.java.d b/android/gen/R.java.d index 31ea172..10e8441 100644 --- a/android/gen/R.java.d +++ b/android/gen/R.java.d @@ -1,10 +1,10 @@ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/gen/com/moparisthebest/pointswatcher/R.java \ - : /home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/drawable-mdpi/icon.png \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/drawable-xhdpi/icon.png \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/layout/main.xml \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/drawable-hdpi/icon.png \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/drawable/icon.png \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/xml/config.xml \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/values/strings.xml \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/res/drawable-ldpi/icon.png \ -/home/mopar/devel/priv/pointsplus/PointsWatcher/android/bin/AndroidManifest.xml \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/gen/com/moparisthebest/pointswatcher/R.java \ + : /home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/drawable-mdpi/icon.png \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/drawable-xhdpi/icon.png \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/layout/main.xml \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/drawable-hdpi/icon.png \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/drawable/icon.png \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/xml/config.xml \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/values/strings.xml \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/res/drawable-ldpi/icon.png \ +/home/mopar/IdeaProjects/pointsplus/PointsWatcher/android/bin/AndroidManifest.xml \ diff --git a/android/gen/com/moparisthebest/pointswatcher/Manifest.java b/android/gen/com/moparisthebest/pointswatcher/Manifest.java new file mode 100644 index 0000000..5f05982 --- /dev/null +++ b/android/gen/com/moparisthebest/pointswatcher/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package com.moparisthebest.pointswatcher; + +/* This stub is for using by IDE only. It is NOT the Manifest class actually packed into APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/android/gen/com/moparisthebest/pointswatcher/R.java b/android/gen/com/moparisthebest/pointswatcher/R.java index 8010672..f219cbe 100644 --- a/android/gen/com/moparisthebest/pointswatcher/R.java +++ b/android/gen/com/moparisthebest/pointswatcher/R.java @@ -1,25 +1,7 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ +/*___Generated_by_IDEA___*/ package com.moparisthebest.pointswatcher; +/* This stub is for using by IDE only. It is NOT the R class actually packed into APK */ public final class R { - public static final class attr { - } - public static final class drawable { - public static final int icon=0x7f020000; - } - public static final class layout { - public static final int main=0x7f030000; - } - public static final class string { - public static final int app_name=0x7f050000; - } - public static final class xml { - public static final int config=0x7f040000; - } -} +} \ No newline at end of file diff --git a/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png deleted file mode 120000 index 2f990e7..0000000 --- a/android/res/drawable-hdpi/icon.png +++ /dev/null @@ -1 +0,0 @@ -../../../www/res/icon/android/icon-72-hdpi.png \ No newline at end of file diff --git a/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi/icon.png deleted file mode 120000 index 97e1d7b..0000000 --- a/android/res/drawable-ldpi/icon.png +++ /dev/null @@ -1 +0,0 @@ -../../../www/res/icon/android/icon-36-ldpi.png \ No newline at end of file diff --git a/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi/icon.png deleted file mode 120000 index a509aac..0000000 --- a/android/res/drawable-mdpi/icon.png +++ /dev/null @@ -1 +0,0 @@ -../../../www/res/icon/android/icon-48-mdpi.png \ No newline at end of file diff --git a/android/res/drawable-xhdpi/icon.png b/android/res/drawable-xhdpi/icon.png deleted file mode 120000 index 621b750..0000000 --- a/android/res/drawable-xhdpi/icon.png +++ /dev/null @@ -1 +0,0 @@ -../../../www/res/icon/android/icon-96-xhdpi.png \ No newline at end of file diff --git a/android/res/drawable/icon.png b/android/res/drawable/icon.png deleted file mode 120000 index 621b750..0000000 --- a/android/res/drawable/icon.png +++ /dev/null @@ -1 +0,0 @@ -../../../www/res/icon/android/icon-96-xhdpi.png \ No newline at end of file diff --git a/android/src/com/phonegap b/android/src/com/phonegap deleted file mode 120000 index d1697c6..0000000 --- a/android/src/com/phonegap +++ /dev/null @@ -1 +0,0 @@ -../../SQLitePlugin/Android/src/com/phonegap \ No newline at end of file diff --git a/blackberry/www b/blackberry/www deleted file mode 120000 index cec6c33..0000000 --- a/blackberry/www +++ /dev/null @@ -1 +0,0 @@ -../www \ No newline at end of file diff --git a/www/SQLitePlugin.js b/www/SQLitePlugin.js deleted file mode 120000 index 133bad3..0000000 --- a/www/SQLitePlugin.js +++ /dev/null @@ -1 +0,0 @@ -../android/SQLitePlugin/Android/assets/www/SQLitePlugin.js \ No newline at end of file diff --git a/www/assets/fonts/sansation/demo.html b/www/assets/fonts/sansation/demo.html deleted file mode 100755 index 04fc689..0000000 --- a/www/assets/fonts/sansation/demo.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - Font Face Demo - - - - - -
-

Font-face Demo for the Sansation Font

- - - -

Sansation Regular - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - - -

Sansation Light - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - - -

Sansation Bold - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - - -

Sansation Light Light Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - - -

Sansation Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - - -

Sansation Bold Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- -
- - diff --git a/www/assets/graphics/backArrow.png b/www/assets/graphics/backArrow.png index 1775054..da386f4 100644 Binary files a/www/assets/graphics/backArrow.png and b/www/assets/graphics/backArrow.png differ diff --git a/www/assets/graphics/bread.png b/www/assets/graphics/bread.png index f736bf6..8ab2d27 100644 Binary files a/www/assets/graphics/bread.png and b/www/assets/graphics/bread.png differ diff --git a/www/assets/graphics/calculator.png b/www/assets/graphics/calculator.png index f604c8b..3a5c42b 100644 Binary files a/www/assets/graphics/calculator.png and b/www/assets/graphics/calculator.png differ diff --git a/www/assets/graphics/info.png b/www/assets/graphics/info.png index 629af6a..830a56b 100644 Binary files a/www/assets/graphics/info.png and b/www/assets/graphics/info.png differ diff --git a/www/assets/graphics/moreDisclosure.png b/www/assets/graphics/moreDisclosure.png index 57c2af1..8d8d4e6 100644 Binary files a/www/assets/graphics/moreDisclosure.png and b/www/assets/graphics/moreDisclosure.png differ diff --git a/www/assets/graphics/notebook.png b/www/assets/graphics/notebook.png index c91bbc3..65fcf28 100644 Binary files a/www/assets/graphics/notebook.png and b/www/assets/graphics/notebook.png differ diff --git a/www/assets/graphics/search.png b/www/assets/graphics/search.png index 88f51ae..2331b2c 100644 Binary files a/www/assets/graphics/search.png and b/www/assets/graphics/search.png differ diff --git a/www/assets/graphics/settings.png b/www/assets/graphics/settings.png index 76abed8..6a9107c 100644 Binary files a/www/assets/graphics/settings.png and b/www/assets/graphics/settings.png differ diff --git a/www/assets/graphics/wheatBg.png b/www/assets/graphics/wheatBg.png index 11e4efa..e1bfa29 100644 Binary files a/www/assets/graphics/wheatBg.png and b/www/assets/graphics/wheatBg.png differ diff --git a/www/assets/graphics/wheatBgNoColor.png b/www/assets/graphics/wheatBgNoColor.png index 2edfbf0..2c04acb 100644 Binary files a/www/assets/graphics/wheatBgNoColor.png and b/www/assets/graphics/wheatBgNoColor.png differ diff --git a/www/config.xml b/www/config.xml index 2eeb8df..6ff9391 100644 --- a/www/config.xml +++ b/www/config.xml @@ -47,7 +47,6 @@ - diff --git a/www/index.html b/www/index.html index 1cc3b4e..f2d63b3 100644 --- a/www/index.html +++ b/www/index.html @@ -15,6 +15,10 @@ + + + + diff --git a/www/js/application.js b/www/js/application.js index 760ad6d..a44bcd8 100644 --- a/www/js/application.js +++ b/www/js/application.js @@ -12,8 +12,10 @@ var maxSearchLength = 50; var weeklyPointsAllowed = 49; -var valuesLoaded = false; -var values = []; +var foodSearchResults = undefined; + +var runningCordova = false; +var foodDb = undefined; var database; var viewAssembler = new ViewAssembler(); var backButtonLabel = " "; @@ -43,7 +45,6 @@ function setupDefaultView() { } function onNearbyListItemClick(event) { - $("li").removeClass("listSelected"); var target = $(event.target) if (target.get(0).nodeName.toUpperCase() != "LI") { @@ -54,19 +55,11 @@ function onNearbyListItemClick(event) { var index = target.attr("index"); index = parseInt(index); - database.setItem("amount", values[index][3]); + database.setItem("amount", foodSearchResults[index].points); showPointsPage(true); } -function scriptSuccess(data, textStatus, jqXHR) { - - //for (var i = 0; i < values.length; i++) { - // values[i].push(i.toString()); - //} - //console.log( "scriptSuccess: " + values.length ); -} - function pushPointsPage() { showPointsPage(true); } @@ -82,52 +75,36 @@ function showPointsPage(push) { window.viewNavigator.pushView(view); } +function prepareSearch() { + if(foodDb == undefined){ + //if(window.sqlitePlugin == undefined) + //if(!runningCordova) + foodDb = new ArrayDatabase(); + //else + // foodDb = new SQLDatabase(); + } +} + function onSearchButtonClick(event) { var $input = $("#search_searchPhrase"); var searchPhrase = $input.val(); if (searchPhrase != undefined && searchPhrase.length > 0) { - var values = filterValuesBySearchCriteria(searchPhrase); + foodSearchResults = foodDb.searchFood(searchPhrase); var view = { title: "Search Results", backLabel: backButtonLabel, - view: viewAssembler.searchResultsView(values, searchPhrase) + view: viewAssembler.searchResultsView(foodSearchResults, searchPhrase) }; window.viewNavigator.pushView(view); } } -function filterValuesBySearchCriteria(searchPhrase) { - var result = []; - //var startTime = new Date().getTime(); - var tokens = searchPhrase.toLowerCase().split(" "); - var regexps = new Array(tokens.length); - for (var x = 0; x < regexps.length; ++x) - regexps[x] = new RegExp(tokens[x]); - var numFound = 0; - for (var y = 0; y < values.length; ++y) { - var found = true; - for (var z = 0; z < regexps.length; ++z) { - if (!regexps[z].test(values[y][0])) { - found = false; - break; - } - } - if (found) { - result.push(y); - if (++numFound == maxSearchLength) - break; - } - } - //console.log( new Date().getTime() - startTime ); - return result; -} - function isNumber(n) { return !isNaN(parseFloat(n)) && isFinite(n); } function isPositiveNumber(n) { - return isNumber(n) && n > 0; + return isNumber(n) && n >= 0; } function roundPoints(points){ @@ -241,20 +218,6 @@ function onResetPointsButtonClick(dailyNotWeekly) { showPointsPage(); } -function arrayToFoodObject(index) { - var result = {}; - - var row = values[index]; - - result.name = row[1]; - result.amount = row[2]; - result.points = row[3]; - - result.index = index; - - return result; -} - function openExternalURL(url) { var result = confirm("You will leave the Points Watcher App. Continue?"); if (result == true) { @@ -262,10 +225,9 @@ function openExternalURL(url) { } } - function dbGetNum(key) { - var ret = dbGet(key, 0); - return ret < 1 ? undefined : ret; + var ret = dbGet(key, -1); + return ret < 0 ? undefined : ret; } function dbGet(key, defaultVal) { @@ -280,6 +242,7 @@ function dbGet(key, defaultVal) { document.addEventListener("deviceready", onDeviceReady, false); function onDeviceReady() { + runningCordova = true; document.addEventListener("backbutton", onBackKey, false); } diff --git a/www/js/fooddatabase/ArrayDatabase.js b/www/js/fooddatabase/ArrayDatabase.js new file mode 100644 index 0000000..6db0011 --- /dev/null +++ b/www/js/fooddatabase/ArrayDatabase.js @@ -0,0 +1,78 @@ +function ArrayDatabase() { + this.type = 'array'; + //$.getScript("values.js", scriptSuccess); + var thisClass = this; + $.ajax({ + url: "values.js", + dataType: "text", + cache: true + }).done(function (data) { + thisClass.values = eval(data); + }); +} + +ArrayDatabase.prototype.searchFood = function (searchPhrase) { + //alert('type: ' + this.type + ' searchPhrase: ' + searchPhrase); + //searchPhrase = 'banana bread'; + var result = []; + //var startTime = new Date().getTime(); + var tokens = searchPhrase.toLowerCase().split(" "); + var num_tokens = tokens.length; + + // partials + var regexps = new Array(num_tokens); + for (var x = 0; x < num_tokens; ++x) + regexps[x] = new RegExp(tokens[x]); + + // whole words + var whole_regexps = new Array(num_tokens); + for (var x = 0; x < num_tokens; ++x) + whole_regexps[x] = new RegExp('\\b'+tokens[x]+'\\b'); + + var right_order = new RegExp(tokens.join('.*')); + var exact_order = new RegExp(tokens.join('\\s*')); + + var numFound = -1; + + valueLoop: + for (var y = 0; y < this.values.length; ++y) { + var relevance = 0; + for (var z = 0; z < num_tokens; ++z) { + if (regexps[z].test(this.values[y][0])) + ++relevance; // add a point for each word found + else + continue valueLoop; // for now, only display a result if all tokens were found + } + + // now add a point for each WHOLE word that was found + for (var z = 0; z < num_tokens; ++z) + if (whole_regexps[z].test(this.values[y][0])) + ++relevance; + + // add a point if it's in the right order + if(right_order.test(this.values[y][0])){ + relevance *= 2; + // and another if it's in the exact right order + if(exact_order.test(this.values[y][0])) + relevance *= 2; + } + + result.push({ + relevance: relevance, + name: this.values[y][1], + amount: this.values[y][2], + points: this.values[y][3], + //points: relevance, + index: ++numFound + }); + } + // sort preferring a higher relevance and a shorter name + result.sort(function(a, b) { + var ret = b.relevance - a.relevance; + if(ret == 0) + ret = a.name.length - b.name.length; + return ret; + }); + //console.log( new Date().getTime() - startTime ); + return result.slice(0,maxSearchLength); +}; diff --git a/www/js/fooddatabase/OldArrayDatabase.js b/www/js/fooddatabase/OldArrayDatabase.js new file mode 100644 index 0000000..3c1cef7 --- /dev/null +++ b/www/js/fooddatabase/OldArrayDatabase.js @@ -0,0 +1,44 @@ +function ArrayDatabase() { + this.type = 'array'; + //$.getScript("values.js", scriptSuccess); + var thisClass = this; + $.ajax({ + url: "values.js", + dataType: "text", + cache: true + }).done(function (data) { + thisClass.values = eval(data); + }); +} + +ArrayDatabase.prototype.searchFood = function (searchPhrase) { + //alert('type: ' + this.type + ' searchPhrase: ' + searchPhrase); + var result = []; + //var startTime = new Date().getTime(); + var tokens = searchPhrase.toLowerCase().split(" "); + var regexps = new Array(tokens.length); + for (var x = 0; x < regexps.length; ++x) + regexps[x] = new RegExp(tokens[x]); + var numFound = 0; + for (var y = 0; y < this.values.length; ++y) { + var found = true; + for (var z = 0; z < regexps.length; ++z) { + if (!regexps[z].test(this.values[y][0])) { + found = false; + break; + } + } + if (found) { + result.push({ + name: this.values[y][1], + amount: this.values[y][2], + points: this.values[y][3], + index: numFound + }); + if (++numFound == maxSearchLength) + break; + } + } + //console.log( new Date().getTime() - startTime ); + return result; +}; diff --git a/www/js/fooddatabase/SQLDatabase.js b/www/js/fooddatabase/SQLDatabase.js new file mode 100644 index 0000000..76e59c1 --- /dev/null +++ b/www/js/fooddatabase/SQLDatabase.js @@ -0,0 +1,11 @@ +function SQLDatabase() { + this.type = 'sql'; + //this.db = open(bla); + //this.db = window.sqlitePlugin.openDatabase("Database", "1.0", "Demo", -1); + this.db = window.sqlitePlugin.openDatabase({name: "values"}); +} + +SQLDatabase.prototype.searchFood = function(searchPhrase) { + alert('type: '+this.type+' searchPhrase: '+searchPhrase); + //return this.color + ' ' + this.type + ' apple'; +}; \ No newline at end of file diff --git a/www/js/viewAssembler.js b/www/js/viewAssembler.js index 6a637d4..634203c 100644 --- a/www/js/viewAssembler.js +++ b/www/js/viewAssembler.js @@ -108,19 +108,6 @@ ViewAssembler.prototype.aboutView = function() { return el; } -ViewAssembler.prototype.searchView = function () { - - if(!valuesLoaded){ - valuesLoaded = true; - $.getScript("values.js", scriptSuccess); - } - - var el = $( templates.searchViewTemplate ); - - el.find( "#searchButton" ).on( this.CLICK_EVENT, onSearchButtonClick ); - return el; -} - ViewAssembler.prototype.calcPointsView = function () { var viewModel = {}; viewModel.amount = dbGetNum("calcPointsAmount"); @@ -155,12 +142,19 @@ ViewAssembler.prototype.calcAllowanceView = function () { return el; } -ViewAssembler.prototype.searchResultsView = function( indices, searchPhrase ) { - var viewModel = {values:[]}; - for (var i=0; i< indices.length; ++i) { - var food = arrayToFoodObject( indices[i] ); - viewModel.values.push( food ); - } +ViewAssembler.prototype.searchView = function () { + + prepareSearch(); + + var el = $( templates.searchViewTemplate ); + + el.find( "#searchButton" ).on( this.CLICK_EVENT, onSearchButtonClick ); + return el; +} + +ViewAssembler.prototype.searchResultsView = function( foodSearchResults, searchPhrase ) { + var viewModel = {}; + viewModel.values = foodSearchResults; /* viewModel.values.sort( function(a, b){ if ( a.foodName < b.foodName ) { return -1; } diff --git a/www/res/screen/android/screen-hdpi-portrait.png b/www/res/screen/android/screen-hdpi-portrait.png index 39a3680..434103a 100644 Binary files a/www/res/screen/android/screen-hdpi-portrait.png and b/www/res/screen/android/screen-hdpi-portrait.png differ diff --git a/www/res/screen/android/screen-ldpi-portrait.png b/www/res/screen/android/screen-ldpi-portrait.png index d58e85f..997250e 100644 Binary files a/www/res/screen/android/screen-ldpi-portrait.png and b/www/res/screen/android/screen-ldpi-portrait.png differ diff --git a/www/res/screen/android/screen-mdpi-portrait.png b/www/res/screen/android/screen-mdpi-portrait.png index f194a7f..a3553ee 100644 Binary files a/www/res/screen/android/screen-mdpi-portrait.png and b/www/res/screen/android/screen-mdpi-portrait.png differ diff --git a/www/res/screen/android/screen-xhdpi-portrait.png b/www/res/screen/android/screen-xhdpi-portrait.png index 939a3a0..0e61c05 100644 Binary files a/www/res/screen/android/screen-xhdpi-portrait.png and b/www/res/screen/android/screen-xhdpi-portrait.png differ diff --git a/www/res/screen/ios/screen-ipad-landscape.png b/www/res/screen/ios/screen-ipad-landscape.png index 72b8639..f59bbf9 100644 Binary files a/www/res/screen/ios/screen-ipad-landscape.png and b/www/res/screen/ios/screen-ipad-landscape.png differ diff --git a/www/res/screen/ios/screen-ipad-portrait.png b/www/res/screen/ios/screen-ipad-portrait.png index 74ba066..84bcf71 100644 Binary files a/www/res/screen/ios/screen-ipad-portrait.png and b/www/res/screen/ios/screen-ipad-portrait.png differ diff --git a/www/res/screen/ios/screen-iphone-portrait-2x.png b/www/res/screen/ios/screen-iphone-portrait-2x.png index 660089b..74aaa0d 100644 Binary files a/www/res/screen/ios/screen-iphone-portrait-2x.png and b/www/res/screen/ios/screen-iphone-portrait-2x.png differ diff --git a/www/res/screen/ios/screen-iphone-portrait.png b/www/res/screen/ios/screen-iphone-portrait.png index 884b4fa..77d5ff5 100644 Binary files a/www/res/screen/ios/screen-iphone-portrait.png and b/www/res/screen/ios/screen-iphone-portrait.png differ diff --git a/www/screen.png b/www/screen.png index 28c2982..edad503 100644 Binary files a/www/screen.png and b/www/screen.png differ diff --git a/www/values.js b/www/values.js index a3677ec..3a20b66 100644 --- a/www/values.js +++ b/www/values.js @@ -1,4 +1,4 @@ -var values = [ +[ ["0881 tea black tea 100 organic","0881 Tea Black Tea, 100% Organic","1 bag","0"], ["0881 tea green jasmine tea","0881 Tea Green Jasmine Tea","1 bag","0"], ["100 grand bars","100 Grand Bars","2 bars","5"], @@ -167703,4 +167703,4 @@ var values = [ ["zwieback","Zwieback","1 oz","3"], ["zwieback","Zwieback","4 item(s)","3"], ["zydeco fruit nut bar","Zydeco Fruit Nut Bar","1 bar","5"], -]; +] diff --git a/www/views/calcAllowanceViewTemplate.html b/www/views/calcAllowanceViewTemplate.html index 8b47df3..e3914b0 100644 --- a/www/views/calcAllowanceViewTemplate.html +++ b/www/views/calcAllowanceViewTemplate.html @@ -8,7 +8,7 @@ (in years)
Weight:
-
+
Height: