diff --git a/assets/backButton.png b/assets/backButton.png new file mode 100644 index 00000000..e27ea8cd Binary files /dev/null and b/assets/backButton.png differ diff --git a/assets/blueButton.png b/assets/blueButton.png new file mode 100644 index 00000000..0f92dfd9 Binary files /dev/null and b/assets/blueButton.png differ diff --git a/assets/cancel.png b/assets/cancel.png new file mode 100644 index 00000000..5f6dcc87 Binary files /dev/null and b/assets/cancel.png differ diff --git a/assets/gap.js b/assets/gap.js new file mode 100644 index 00000000..b81f3dc5 --- /dev/null +++ b/assets/gap.js @@ -0,0 +1,303 @@ +// Utils +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * At times we have to do polling in javascript, that is have function run at a specified interval + * repeated times. However, certain function polling will reduce battery life thus + * each of those features should have its own user defined interval + * that our js reads in and uses with of course conservative value used + * is consumer has not set one or the user of this library has not set one. + * + * Timeout only runs function twice not repeated times and thus we use + * setInterval. This should correct problems with + * both GPS and Accelerometer readings on Android + */ + +try { + $ // Test if it is already used +} catch(e) { + $ = function(id){ + return document.getElementById(id) + }; +} + +// Acceleration Handling + +var accelX = 0; +alert('accelX initially =' + accelX); +var accelY = 0; +alert('accelY initially =' + accelY); +var accelZ = 0; +alert('accelZ initially =' + accelZ); + +function gotAcceleration(x,y,z){ + x = eval(x); + y = eval(y); + z = eval(z); + if ((!isNaN(x)) && (!isNaN(y)) && (!isNaN(z))) { + accelX = x; + accelY = y; + accelZ = z; + } + return x + " " + y + " " + z; +} + +// A little more abstract + +var DEBUG = true; +if (!window.console || !DEBUG) { + console = { + log: function(){ + }, + error: function(){ + } + } +} + +var Device = { + + available: false, + model: "", + version: "", + uuid: "", + isIPhone: null, + isIPod: null, + isAndroid: null, + + whatPlatform: "", + osversion: "", + sdkfwversion: "", + + FNModel: "", + FNVersion: "", + FNOSVersion: "", + FNSDKFWVersion: "", + FNUUID: "", + FNGapVersion: "", + + myLat: "", + myLon: "", + + myGPSInterval: "30000", + myAccelInterval: "30000", + + + + + init: function(model, version) { + + // We check against native appName in window.appName.exists() + // call to determine what platform as native AndroidName is + // DroidGap an diPhone is IPhoneGap and etc + // Than we can set the var for the if statements + // At this time we have no clear way + // to avoid having the library/framework user + // avoid the work of renaming window.AppTitle + // to their AppTitle + // yes the hack sucks..but its working at this point so.. + + alert('window.DroidGap=' + window.DroidGap); + alert('window.IPhoneGap=' + window.IPhoneGap); + alert('window.IPodGap=' + window.IPodGap); + + if (window.DroidGap) + { + Device.whatPlatform = "Android"; + alert('Device.whatPlatform=' + Device.whatPlatform); + Device.model = window.DroidGap.getModel(); + alert('Device.model=' + Device.model); + Device.version = window.DroidGap.getProductName(); + alert('Device.version=' + Device.version); + Device.osversion = window.DroidGap.getOSVersion(); + alert('Device.osversion=' + Device.osversion); + Device.sdkfwversion = window.DroidGap.getSDKVersion(); + alert('Device.sdkfwversion=' + Device.sdkfwversion); + Device.available = true; + alert('Device.available=' + Device.available); + Device.uuid = window.DroidGap.getUuid(); + alert('Device.uuid=' + Device.uuid); + Device.gapVersion = window.DroidGap.getVersion(); + alert('Device.gapVersion=' + Device.gapVersion); + } else if (window.IPhoneGap) + { + Device.whatPlatform = "IPhone"; + + Device.model = window.IPhoneGap.getModel(); + + Device.version = window.IPhoneGap.getProductName(); + + Device.osversion = window.IPhoneGap.getOSVersion(); + + Device.sdkfwversion = window.IPhonedGap.getSDKVersion(); + + Device.available = true; + + Device.uuid = window.IPhoneGap.getUuid(); + + Device.gapVersion = window.IPhoneGap.getVersion(); + + }else if (window.IPodGap) + { + Device.whatPlatform = "IPod"; + + Device.model = window.IPodGap.getModel(); + + Device.version = window.IPodGap.getProductName(); + + Device.osversion = window.IPodGap.getOSVersion(); + + Device.sdkfwversion = window.IPodGap.getSDKVersion(); + + Device.available = true; + + Device.uuid = window.IPodGap.getUuid(); + + Device.gapVersion = window.IPodGap.getVersion(); + + } else + { + Device.available = "__gap"; + Device.model = "__gap_device_model"; + Device.version = "__gap_device_version"; + Device.osversion = "_gap_device_os"; + Device.sdkfwversion = "_gap_device_sdkversion"; + + Device.gapVersion = "__gap_version"; + Device.uuid = "__gap_device_uniqueid"; + alert("GAP is not supported!"); + } + + }, + + exec: function(command) { + // Different platforms have different ways the js browser bridge is called + // to get a native object so we handle each difference + // + + + + if ( Device.whatPlatform == "IPhone") { + try { + + document.location = "gap:" + command; + } catch(e) { + console.log("Command '" + command + "' has not been executed, because of exception: " + e); + alert("Error executing command '" + command + "'.") + } + } else + if ( Device.whatPlatform == "IPod") { + try { + document.location = "gap:" + command; + } catch(e) { + console.log("Command '" + command + "' has not been executed, because of exception: " + e); + alert("Error executing command '" + command + "'.") + } + } else + if (Device.whatPlatform == "Android" || command == "getloc") { + try { + alert('start here'); + + document.location="javascript:window.DroidGap.getLocation()"; + + alert('window.DroidGap.getLocation()=' + window.DroidGap.getLocation()); + } catch(e) { + console.log("Command '" + command + "' has not been executed, because of exception: " + e); + alert("Error executing command '" + command + "'.") + } + } + + }, + + Location: { + // available: true, + + lon: null, + lat: null, + callback: null, + + init: function() { + Device.exec("getloc"); + alert(' getloc was called'); + + }, + + set: function(lat, lon) { + Device.Location.lat = lat; + Device.Location.lon = lon; + alert('Device.Location let is' + lat); + alert('Device.Location lon is' + lon); + if(Device.Location.callback != null) { + Device.Location.callback(lat, lon) + Device.Location.callback = null; + } + }, + + wait: function(func) { + Device.Location.callback = func + Device.exec("getloc"); + } + + }, + + Image: { + + //available: true, + + callback: null, + + getFromPhotoLibrary: function() { + return Device.exec("getphoto" + ":" + Device.Image.callback) + }, + + getFromCamera: function() { + return Device.exec("getphoto" + ":" + Device.Image.callback) + }, + + getFromSavedPhotosAlbum: function() { + return Device.exec("getphoto" + ":" + Device.Image.callback) + } + + }, + + vibrate: function() { + return Device.exec("vibrate") + }, + + playSound: function(clip) { + xsound = "sound:"; + if (Device.whatPlatform == "Android") { + xsound = "playSound"; + return Device.exec(xsound + clip); + } + + return Device.exec(xsound + clip); + } + +} + +function gotLocation(lat, lon) { + alert('gotLocation lat=' + lat + " gotLocation lon=" + lon); + return Device.Location.set(lat, lon) +} + diff --git a/assets/grayButton.png b/assets/grayButton.png new file mode 100644 index 00000000..0ce6a30d Binary files /dev/null and b/assets/grayButton.png differ diff --git a/assets/index.html b/assets/index.html new file mode 100644 index 00000000..de87a53e --- /dev/null +++ b/assets/index.html @@ -0,0 +1,223 @@ + + + + + + +PhoneGap 0.1 + + + + + + + + +
+

Main

+ +
+ + + +
+

PhoneGap

+
+ +
+ + +
+
+ +

Device

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ +

Change Location

+
+
+ + +
+
+ + +
+
+ Update Location +
+ +
+ +
+ +
+ +

Read Location

+
+
+ + +
+
+ + +
+
+ +
+ +
+ +

Change Intervals

+
+
+ + +
+
+ + +
+
+ Set Intervals +
+ +
+ +
+ +
+ +

Accelerometer

+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
\ No newline at end of file diff --git a/assets/iui.css b/assets/iui.css new file mode 100644 index 00000000..b11dc483 --- /dev/null +++ b/assets/iui.css @@ -0,0 +1,372 @@ +/* iui.css (c) 2007 by iUI Project Members, see LICENSE.txt for license */ +body { + margin: 0; + font-family: Helvetica; + background: #FFFFFF; + color: #000000; + overflow-x: hidden; + -webkit-user-select: none; + -webkit-text-size-adjust: none; +} + +body > *:not(.toolbar) { + display: none; + position: absolute; + margin: 0; + padding: 0; + left: 0; + top: 45px; + width: 100%; + min-height: 372px; +} + +body[orient="landscape"] > *:not(.toolbar) { + min-height: 268px; +} + +body > *[selected="true"] { + display: block; +} + +a[selected], a:active { + background-color: #194fdb !important; + background-image: url(file:///android_asset/listArrowSel.png), url(file:///android_asset/selection.png) !important; + background-repeat: no-repeat, repeat-x; + background-position: right center, left top; + color: #FFFFFF !important; +} + +a[selected="progress"] { + background-image: url(file:///android_asset/loading.gif), url(file:///android_asset/selection.png) !important; +} + +/************************************************************************************************/ + +body > .toolbar { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + border-bottom: 1px solid #2d3642; + border-top: 1px solid #6d84a2; + padding: 10px; + height: 45px; + background: url(file:///android_asset/toolbar.png) #6d84a2 repeat-x; +} + +.toolbar > h1 { + position: absolute; + overflow: hidden; + left: 50%; + margin: 1px 0 0 -75px; + height: 45px; + font-size: 20px; + width: 150px; + font-weight: bold; + text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; + text-align: center; + text-overflow: ellipsis; + white-space: nowrap; + color: #FFFFFF; +} + +body[orient="landscape"] > .toolbar > h1 { + margin-left: -125px; + width: 250px; +} + +.button { + position: absolute; + overflow: hidden; + top: 8px; + right: 6px; + margin: 0; + border-width: 0 5px; + padding: 0 3px; + width: auto; + height: 30px; + line-height: 30px; + font-family: inherit; + font-size: 12px; + font-weight: bold; + color: #FFFFFF; + text-shadow: rgba(0, 0, 0, 0.6) 0px -1px 0; + text-overflow: ellipsis; + text-decoration: none; + white-space: nowrap; + background: none; + -webkit-border-image: url(file:///android_asset/toolButton.png) 0 5 0 5; +} + +.blueButton { + -webkit-border-image: url(file:///android_asset/blueButton.png) 0 5 0 5; + border-width: 0 5px; +} + +.leftButton { + left: 6px; + right: auto; +} + +#backButton { + display: none; + left: 6px; + right: auto; + padding: 0; + max-width: 55px; + border-width: 0 8px 0 14px; + -webkit-border-image: url(file:///android_asset/backButton.png) 0 8 0 14; +} + +.whiteButton, +.grayButton { + display: block; + border-width: 0 12px; + padding: 10px; + text-align: center; + font-size: 20px; + font-weight: bold; + text-decoration: inherit; + color: inherit; +} + +.whiteButton { + -webkit-border-image: url(file:///android_asset/whiteButton.png) 0 12 0 12; + text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0; +} + +.grayButton { + -webkit-border-image: url(file:///android_asset/grayButton.png) 0 12 0 12; + color: #FFFFFF; +} + +/************************************************************************************************/ + +body > ul > li { + position: relative; + margin: 0; + border-bottom: 1px solid #E0E0E0; + padding: 8px 0 8px 10px; + font-size: 20px; + font-weight: bold; + list-style: none; +} + +body > ul > li.group { + position: relative; + top: -1px; + margin-bottom: -2px; + border-top: 1px solid #7d7d7d; + border-bottom: 1px solid #999999; + padding: 1px 10px; + background: url(file:///android_asset/listGroup.png) repeat-x; + font-size: 17px; + font-weight: bold; + text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0; + color: #FFFFFF; +} + +body > ul > li.group:first-child { + top: 0; + border-top: none; +} + +body > ul > li > a { + display: block; + margin: -8px 0 -8px -10px; + padding: 8px 32px 8px 10px; + text-decoration: none; + color: inherit; + background: url(file:///android_asset/listArrow.png) no-repeat right center; +} + +a[target="_replace"] { + box-sizing: border-box; + -webkit-box-sizing: border-box; + padding-top: 25px; + padding-bottom: 25px; + font-size: 18px; + color: cornflowerblue; + background-color: #FFFFFF; + background-image: none; +} + +/************************************************************************************************/ + +body > .dialog { + top: 0; + width: 100%; + min-height: 417px; + z-index: 2; + background: rgba(0, 0, 0, 0.8); + padding: 0; + text-align: right; +} + +.dialog > fieldset { + box-sizing: border-box; + -webkit-box-sizing: border-box; + width: 100%; + margin: 0; + border: none; + border-top: 1px solid #6d84a2; + padding: 10px 6px; + background: url(file:///android_asset/toolbar.png) #7388a5 repeat-x; +} + +.dialog > fieldset > h1 { + margin: 0 10px 0 10px; + padding: 0; + font-size: 20px; + font-weight: bold; + color: #FFFFFF; + text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; + text-align: center; +} + +.dialog > fieldset > label { + position: absolute; + margin: 16px 0 0 6px; + font-size: 14px; + color: #999999; +} + +input { + box-sizing: border-box; + -webkit-box-sizing: border-box; + width: 100%; + margin: 8px 0 0 0; + padding: 6px 6px 6px 44px; + font-size: 16px; + font-weight: normal; +} + +/************************************************************************************************/ + +body > .panel { + box-sizing: border-box; + -webkit-box-sizing: border-box; + padding: 10px; + background: #c8c8c8 url(file:///android_asset/pinstripes.png); +} + +.panel > fieldset { + position: relative; + margin: 0 0 20px 0; + padding: 0; + background: #FFFFFF; + -webkit-border-radius: 10px; + border: 1px solid #999999; + text-align: right; + font-size: 16px; +} + +.row { + position: relative; + min-height: 42px; + border-bottom: 1px solid #999999; + -webkit-border-radius: 0; + text-align: right; +} + +fieldset > .row:last-child { + border-bottom: none !important; +} + +.row > input { + box-sizing: border-box; + -webkit-box-sizing: border-box; + margin: 0; + border: none; + padding: 12px 10px 0 110px; + height: 42px; + background: none; +} + +.row > label { + position: absolute; + margin: 0 0 0 14px; + line-height: 42px; + font-weight: bold; +} + +.row > .toggle { + position: absolute; + top: 6px; + right: 6px; + width: 100px; + height: 28px; +} + +.toggle { + border: 1px solid #888888; + -webkit-border-radius: 6px; + background: #FFFFFF url(file:///android_asset/toggle.png) repeat-x; + font-size: 19px; + font-weight: bold; + line-height: 30px; +} + +.toggle[toggled="true"] { + border: 1px solid #143fae; + background: #194fdb url(file:///android_asset/toggleOn.png) repeat-x; +} + +.toggleOn { + display: none; + position: absolute; + width: 60px; + text-align: center; + left: 0; + top: 0; + color: #FFFFFF; + text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; +} + +.toggleOff { + position: absolute; + width: 60px; + text-align: center; + right: 0; + top: 0; + color: #666666; +} + +.toggle[toggled="true"] > .toggleOn { + display: block; +} + +.toggle[toggled="true"] > .toggleOff { + display: none; +} + +.thumb { + position: absolute; + top: -1px; + left: -1px; + width: 40px; + height: 28px; + border: 1px solid #888888; + -webkit-border-radius: 6px; + background: #ffffff url(file:///android_asset/thumb.png) repeat-x; +} + +.toggle[toggled="true"] > .thumb { + left: auto; + right: -1px; +} + +.panel > h2 { + margin: 0 0 8px 14px; + font-size: inherit; + font-weight: bold; + color: #4d4d70; + text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0; +} + +/************************************************************************************************/ + +#preloader { + display: none; + background-image: url(file:///android_asset/loading.gif), url(file:///android_asset/selection.png), + url(file:///android_asset/blueButton.png), url(file:///android_asset/listArrowSel.png), url(file:///android_asset/listGroup.png); +} diff --git a/assets/iui.js b/assets/iui.js new file mode 100644 index 00000000..27de4280 --- /dev/null +++ b/assets/iui.js @@ -0,0 +1,383 @@ +/* + Copyright (c) 2007, iUI Project Members + See LICENSE.txt for licensing terms + */ + + +(function() { + +var slideSpeed = 20; +var slideInterval = 0; + +var currentPage = null; +var currentDialog = null; +var currentWidth = 0; +var currentHash = location.hash; +var hashPrefix = "#_"; +var pageHistory = []; +var newPageCount = 0; +var checkTimer; + +// ************************************************************************************************* + +window.iui = +{ + showPage: function(page, backwards) + { + if (page) + { + if (currentDialog) + { + currentDialog.removeAttribute("selected"); + currentDialog = null; + } + + if (hasClass(page, "dialog")) + showDialog(page); + else + { + var fromPage = currentPage; + currentPage = page; + + if (fromPage) + setTimeout(slidePages, 0, fromPage, page, backwards); + else + updatePage(page, fromPage); + } + } + }, + + showPageById: function(pageId) + { + var page = $(pageId); + if (page) + { + var index = pageHistory.indexOf(pageId); + var backwards = index != -1; + if (backwards) + pageHistory.splice(index, pageHistory.length); + + iui.showPage(page, backwards); + } + }, + + showPageByHref: function(href, args, method, replace, cb) + { + var req = new XMLHttpRequest(); + req.onerror = function() + { + if (cb) + cb(false); + }; + + req.onreadystatechange = function() + { + if (req.readyState == 4) + { + if (replace) + replaceElementWithSource(replace, req.responseText); + else + { + var frag = document.createElement("div"); + frag.innerHTML = req.responseText; + iui.insertPages(frag.childNodes); + } + if (cb) + setTimeout(cb, 1000, true); + } + }; + + if (args) + { + req.open(method || "GET", href, true); + req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); + req.setRequestHeader("Content-Length", args.length); + req.send(args.join("&")); + } + else + { + req.open(method || "GET", href, true); + req.send(null); + } + }, + + insertPages: function(nodes) + { + var targetPage; + for (var i = 0; i < nodes.length; ++i) + { + var child = nodes[i]; + if (child.nodeType == 1) + { + if (!child.id) + child.id = "__" + (++newPageCount) + "__"; + + var clone = $(child.id); + if (clone) + clone.parentNode.replaceChild(child, clone); + else + document.body.appendChild(child); + + if (child.getAttribute("selected") == "true" || !targetPage) + targetPage = child; + + --i; + } + } + + if (targetPage) + iui.showPage(targetPage); + }, + + getSelectedPage: function() + { + for (var child = document.body.firstChild; child; child = child.nextSibling) + { + if (child.nodeType == 1 && child.getAttribute("selected") == "true") + return child; + } + } +}; + +// ************************************************************************************************* + +addEventListener("load", function(event) +{ + var page = iui.getSelectedPage(); + if (page) + iui.showPage(page); + + setTimeout(preloadImages, 0); + setTimeout(checkOrientAndLocation, 0); + checkTimer = setInterval(checkOrientAndLocation, 300); +}, false); + +addEventListener("click", function(event) +{ + var link = findParent(event.target, "a"); + if (link) + { + function unselect() { link.removeAttribute("selected"); } + + if (link.href && link.hash && link.hash != "#") + { + link.setAttribute("selected", "true"); + iui.showPage($(link.hash.substr(1))); + setTimeout(unselect, 500); + } + else if (link == $("backButton")) + history.back(); + else if (link.getAttribute("type") == "submit") + submitForm(findParent(link, "form")); + else if (link.getAttribute("type") == "cancel") + cancelDialog(findParent(link, "form")); + else if (link.target == "_replace") + { + link.setAttribute("selected", "progress"); + iui.showPageByHref(link.href, null, null, link, unselect); + } + else if (!link.target) + { + link.setAttribute("selected", "progress"); + iui.showPageByHref(link.href, null, null, null, unselect); + } + else + return; + + event.preventDefault(); + } +}, true); + +addEventListener("click", function(event) +{ + var div = findParent(event.target, "div"); + if (div && hasClass(div, "toggle")) + { + div.setAttribute("toggled", div.getAttribute("toggled") != "true"); + event.preventDefault(); + } +}, true); + +function checkOrientAndLocation() +{ + if (window.innerWidth != currentWidth) + { + currentWidth = window.innerWidth; + var orient = currentWidth == 320 ? "profile" : "landscape"; + document.body.setAttribute("orient", orient); + setTimeout(scrollTo, 100, 0, 1); + } + + if (location.hash != currentHash) + { + var pageId = location.hash.substr(hashPrefix.length) + iui.showPageById(pageId); + } +} + +function showDialog(page) +{ + currentDialog = page; + page.setAttribute("selected", "true"); + + if (hasClass(page, "dialog") && !page.target) + showForm(page); +} + +function showForm(form) +{ + form.onsubmit = function(event) + { + event.preventDefault(); + submitForm(form); + }; + + form.onclick = function(event) + { + if (event.target == form && hasClass(form, "dialog")) + cancelDialog(form); + }; +} + +function cancelDialog(form) +{ + form.removeAttribute("selected"); +} + +function updatePage(page, fromPage) +{ + if (!page.id) + page.id = "__" + (++newPageCount) + "__"; + + location.href = currentHash = hashPrefix + page.id; + pageHistory.push(page.id); + + var pageTitle = $("pageTitle"); + if (page.title) + pageTitle.innerHTML = page.title; + + if (page.localName.toLowerCase() == "form" && !page.target) + showForm(page); + + var backButton = $("backButton"); + if (backButton) + { + var prevPage = $(pageHistory[pageHistory.length-2]); + if (prevPage && !page.getAttribute("hideBackButton")) + { + backButton.style.display = "inline"; + backButton.innerHTML = prevPage.title ? prevPage.title : "Back"; + } + else + backButton.style.display = "none"; + } +} + +function slidePages(fromPage, toPage, backwards) +{ + var axis = (backwards ? fromPage : toPage).getAttribute("axis"); + if (axis == "y") + (backwards ? fromPage : toPage).style.top = "100%"; + else + toPage.style.left = "100%"; + + toPage.setAttribute("selected", "true"); + scrollTo(0, 1); + clearInterval(checkTimer); + + var percent = 100; + slide(); + var timer = setInterval(slide, slideInterval); + + function slide() + { + percent -= slideSpeed; + if (percent <= 0) + { + percent = 0; + if (!hasClass(toPage, "dialog")) + fromPage.removeAttribute("selected"); + clearInterval(timer); + checkTimer = setInterval(checkOrientAndLocation, 300); + setTimeout(updatePage, 0, toPage, fromPage); + } + + if (axis == "y") + { + backwards + ? fromPage.style.top = (100-percent) + "%" + : toPage.style.top = percent + "%"; + } + else + { + fromPage.style.left = (backwards ? (100-percent) : (percent-100)) + "%"; + toPage.style.left = (backwards ? -percent : percent) + "%"; + } + } +} + +function preloadImages() +{ + var preloader = document.createElement("div"); + preloader.id = "preloader"; + document.body.appendChild(preloader); +} + +function submitForm(form) +{ + iui.showPageByHref(form.action || "POST", encodeForm(form), form.method); +} + +function encodeForm(form) +{ + function encode(inputs) + { + for (var i = 0; i < inputs.length; ++i) + { + if (inputs[i].name) + args.push(inputs[i].name + "=" + escape(inputs[i].value)); + } + } + + var args = []; + encode(form.getElementsByTagName("input")); + encode(form.getElementsByTagName("select")); + return args; +} + +function findParent(node, localName) +{ + while (node && (node.nodeType != 1 || node.localName.toLowerCase() != localName)) + node = node.parentNode; + return node; +} + +function hasClass(self, name) +{ + var re = new RegExp("(^|\\s)"+name+"($|\\s)"); + return re.exec(self.getAttribute("class")) != null; +} + +function replaceElementWithSource(replace, source) +{ + var page = replace.parentNode; + var parent = replace; + while (page.parentNode != document.body) + { + page = page.parentNode; + parent = parent.parentNode; + } + + var frag = document.createElement(parent.localName); + frag.innerHTML = source; + + page.removeChild(parent); + + while (frag.firstChild) + page.appendChild(frag.firstChild); +} + +function $(id) { return document.getElementById(id); } +function ddd() { console.log.apply(console, arguments); } + +})(); diff --git a/assets/listArrow.png b/assets/listArrow.png new file mode 100644 index 00000000..6421a167 Binary files /dev/null and b/assets/listArrow.png differ diff --git a/assets/listArrowSel.png b/assets/listArrowSel.png new file mode 100644 index 00000000..86832ebc Binary files /dev/null and b/assets/listArrowSel.png differ diff --git a/assets/listGroup.png b/assets/listGroup.png new file mode 100644 index 00000000..221553ae Binary files /dev/null and b/assets/listGroup.png differ diff --git a/assets/loading.gif b/assets/loading.gif new file mode 100644 index 00000000..8522ddf1 Binary files /dev/null and b/assets/loading.gif differ diff --git a/assets/pinstripes.png b/assets/pinstripes.png new file mode 100644 index 00000000..c9977751 Binary files /dev/null and b/assets/pinstripes.png differ diff --git a/assets/selection.png b/assets/selection.png new file mode 100644 index 00000000..537e3f0b Binary files /dev/null and b/assets/selection.png differ diff --git a/assets/thumb.png b/assets/thumb.png new file mode 100644 index 00000000..cefa8fc5 Binary files /dev/null and b/assets/thumb.png differ diff --git a/assets/toggle.png b/assets/toggle.png new file mode 100644 index 00000000..3b62ebf2 Binary files /dev/null and b/assets/toggle.png differ diff --git a/assets/toggleOn.png b/assets/toggleOn.png new file mode 100644 index 00000000..b016814d Binary files /dev/null and b/assets/toggleOn.png differ diff --git a/assets/toolButton.png b/assets/toolButton.png new file mode 100644 index 00000000..afe4d7a3 Binary files /dev/null and b/assets/toolButton.png differ diff --git a/assets/toolbar.png b/assets/toolbar.png new file mode 100644 index 00000000..3dde94c0 Binary files /dev/null and b/assets/toolbar.png differ diff --git a/assets/whiteButton.png b/assets/whiteButton.png new file mode 100644 index 00000000..5514b270 Binary files /dev/null and b/assets/whiteButton.png differ diff --git a/res/drawable/icon.png b/res/drawable/icon.png index f6e20e8d..697df7f3 100644 Binary files a/res/drawable/icon.png and b/res/drawable/icon.png differ diff --git a/res/raw/bird.mp3 b/res/raw/bird.mp3 new file mode 100644 index 00000000..9a63a12d Binary files /dev/null and b/res/raw/bird.mp3 differ diff --git a/res/raw/off.mp3 b/res/raw/off.mp3 new file mode 100644 index 00000000..669b8222 Binary files /dev/null and b/res/raw/off.mp3 differ diff --git a/res/raw/on.mp3 b/res/raw/on.mp3 new file mode 100644 index 00000000..ab6759f4 Binary files /dev/null and b/res/raw/on.mp3 differ diff --git a/src/com/nitobi/phonegap/AccelTuple.java b/src/com/nitobi/phonegap/AccelTuple.java index aa78a975..fb1c2dda 100644 --- a/src/com/nitobi/phonegap/AccelTuple.java +++ b/src/com/nitobi/phonegap/AccelTuple.java @@ -1,4 +1,26 @@ package com.nitobi.phonegap; +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ public class AccelTuple { public long accelX; diff --git a/src/com/nitobi/phonegap/CameraHandler.java b/src/com/nitobi/phonegap/CameraHandler.java index 5a065b4f..661f89fa 100644 --- a/src/com/nitobi/phonegap/CameraHandler.java +++ b/src/com/nitobi/phonegap/CameraHandler.java @@ -1,5 +1,26 @@ package com.nitobi.phonegap; - +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ import java.io.OutputStream; import java.text.SimpleDateFormat; diff --git a/src/com/nitobi/phonegap/CameraListener.java b/src/com/nitobi/phonegap/CameraListener.java index 20f425c4..9d50ed7c 100644 --- a/src/com/nitobi/phonegap/CameraListener.java +++ b/src/com/nitobi/phonegap/CameraListener.java @@ -1,5 +1,26 @@ package com.nitobi.phonegap; - +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ import java.io.FileNotFoundException; import java.io.OutputStream; import java.text.SimpleDateFormat; diff --git a/src/com/nitobi/phonegap/DroidGap.java b/src/com/nitobi/phonegap/DroidGap.java index e2fc81c8..056d7312 100644 --- a/src/com/nitobi/phonegap/DroidGap.java +++ b/src/com/nitobi/phonegap/DroidGap.java @@ -1,13 +1,33 @@ package com.nitobi.phonegap; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Field; +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ import android.app.Activity; import android.os.Bundle; import android.os.Handler; import android.util.Log; +import android.view.Window; +import android.view.WindowManager; import android.webkit.JsResult; import android.webkit.WebChromeClient; import android.webkit.WebView; @@ -23,6 +43,9 @@ public class DroidGap extends Activity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + getWindow().requestFeature(Window.FEATURE_NO_TITLE); + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); setContentView(R.layout.main); appView = (WebView) findViewById(R.id.appView); @@ -36,47 +59,13 @@ public class DroidGap extends Activity { /* Bind the appView object to the gap class methods */ bindBrowser(appView); - /* Load a URI from the strings.xml file */ - String uri = null; - Class c = R.string.class; - Field f; - int i = 0; - - try { - f = c.getField("url"); - i = f.getInt(f); - uri = this.getResources().getString(i); - } catch (Exception e) - { - uri = "http://www.phonegap.com"; - } + - appView.loadUrl(uri); + appView.loadUrl("file:///android_asset/index.html"); } - protected void loadFile(WebView appView){ - try { - InputStream is = getAssets().open("index.html"); - - int size = is.available(); - - // Read the entire asset into a local byte buffer. - byte[] buffer = new byte[size]; - is.read(buffer); - is.close(); - - // Convert the buffer into a Java string. - String text = new String(buffer); - - // Load the local file into the webview - appView.loadData(text, "text/html", "UTF-8"); - - } catch (IOException e) { - // Should never happen! - throw new RuntimeException(e); - } - } + private void bindBrowser(WebView appView) { diff --git a/src/com/nitobi/phonegap/GeoTuple.java b/src/com/nitobi/phonegap/GeoTuple.java index 60f618a0..a01f9ba9 100644 --- a/src/com/nitobi/phonegap/GeoTuple.java +++ b/src/com/nitobi/phonegap/GeoTuple.java @@ -1,5 +1,26 @@ package com.nitobi.phonegap; - +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ public class GeoTuple { public double lat; diff --git a/src/com/nitobi/phonegap/GpsListener.java b/src/com/nitobi/phonegap/GpsListener.java index 054100bb..d89f32c8 100644 --- a/src/com/nitobi/phonegap/GpsListener.java +++ b/src/com/nitobi/phonegap/GpsListener.java @@ -1,5 +1,26 @@ package com.nitobi.phonegap; - +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ import android.content.Context; import android.hardware.SensorManager; import android.location.Location; diff --git a/src/com/nitobi/phonegap/NetworkListener.java b/src/com/nitobi/phonegap/NetworkListener.java index d54f4794..42c8a926 100644 --- a/src/com/nitobi/phonegap/NetworkListener.java +++ b/src/com/nitobi/phonegap/NetworkListener.java @@ -1,5 +1,26 @@ package com.nitobi.phonegap; - +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ import android.content.Context; import android.hardware.SensorManager; import android.location.Location; diff --git a/src/com/nitobi/phonegap/Orientation.java b/src/com/nitobi/phonegap/Orientation.java index ae38e44e..05b1828f 100644 --- a/src/com/nitobi/phonegap/Orientation.java +++ b/src/com/nitobi/phonegap/Orientation.java @@ -1,5 +1,26 @@ package com.nitobi.phonegap; - +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ import android.content.Context; import android.hardware.SensorManager; diff --git a/src/com/nitobi/phonegap/PhoneGap.java b/src/com/nitobi/phonegap/PhoneGap.java index fef91410..1d930f54 100644 --- a/src/com/nitobi/phonegap/PhoneGap.java +++ b/src/com/nitobi/phonegap/PhoneGap.java @@ -1,5 +1,26 @@ package com.nitobi.phonegap; - +/* License (MIT) + * Copyright (c) 2008 Nitobi + * website: http://phonegap.com + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * “Software”), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ import java.io.IOException; import android.content.Context; @@ -7,6 +28,7 @@ import android.hardware.SensorManager; import android.location.Location; import android.location.LocationManager; import android.location.LocationListener; +import android.location.LocationProvider; import android.media.MediaPlayer; import android.os.Bundle; import android.os.Handler; @@ -28,6 +50,7 @@ public class PhoneGap{ private WebView mAppView; private GpsListener mGps; private NetworkListener mNetwork; + protected LocationProvider provider; public PhoneGap(Context ctx, Handler handler, WebView appView) { this.mCtx = ctx; @@ -63,11 +86,9 @@ public class PhoneGap{ vibrator.vibrate(pattern); } - /* - * Android requires a provider, since it can fall back on triangulation and other means as well as GPS - */ + - public void getLocation(final String provider){ + public void getLocation( ){ mHandler.post(new Runnable() { public void run() { GeoTuple geoloc = new GeoTuple(); @@ -94,7 +115,53 @@ public class PhoneGap{ MediaPlayer mp = new MediaPlayer(); try { - mp.setDataSource("file:///android_asset/" + filename); + // MediaServer does not allow reading of urls out of app data folder + // thus we grab raw file and submit via file descriptor + // instead + // InputStream is = mCtx.getAssets().open(filename); + // work around cannot play audio streams + // to get around security restriction on MediaPlayer + // until Android sdk 1.1 + // thus these changes and the playSound js + // needs moved to Dev.x so that we can if statement out + // via the sdk number + + if(getSDKVersion() == "1") + { + // The hack way audio stored in R.raw.filename + // and we if statement check our way through + // to match the window.DroidGap.playSound(filename.mp3) + ////call on the html side + + int oursound; + + if (filename == "bird.mp3") { + mp.create(mCtx, R.raw.bird); + + } + if (filename == "on.mp3") { + mp.create(mCtx, R.raw.on); + } + if (filename == "off.mp3"){ + mp.create(mCtx, R.raw.off); + } + } + if(getSDKVersion() == "1.1") + { + //TODO: do right way here when Google fixes it + // as we have a security exception preventing + // playing audio file form file:///android_asset/ location + mp.setDataSource("file:///android_asset/" + filename); + mp.prepare(); + mp.start(); + } + + + + + + //mp.setDataSource("file:///android_asset/" + filename); + //mp.setDataSource("http://ventrix.nsdc.gr/stuff/TERMITES_SKONH.mp3"); mp.prepare(); mp.start(); } catch (IllegalArgumentException e) { @@ -121,16 +188,31 @@ public class PhoneGap{ return uuid; } + public String getModel() + { + String model = android.os.Build.MODEL; + return model; + } + public String getProductName() + { + String productname = android.os.Build.PRODUCT; + return productname; + } + public String getOSVersion() + { + String osversion = android.os.Build.VERSION.RELEASE; + return osversion; + } + public String getSDKVersion() + { + String sdkversion = android.os.Build.VERSION.SDK; + return sdkversion; + } + public String getVersion() { return version; } - public boolean exists() - { - return true; - } - - } diff --git a/src/com/nitobi/phonegap/R.java b/src/com/nitobi/phonegap/R.java index 4bc4cd22..a4fe9f1e 100644 --- a/src/com/nitobi/phonegap/R.java +++ b/src/com/nitobi/phonegap/R.java @@ -14,14 +14,19 @@ public final class R { public static final int icon=0x7f020000; } public static final class id { - public static final int appView=0x7f050000; + public static final int appView=0x7f060000; } public static final class layout { public static final int main=0x7f030000; } + public static final class raw { + public static final int bird=0x7f040000; + public static final int off=0x7f040001; + public static final int on=0x7f040002; + } public static final class string { - public static final int app_name=0x7f040001; - public static final int hello=0x7f040000; - public static final int url=0x7f040002; + public static final int app_name=0x7f050001; + public static final int hello=0x7f050000; + public static final int url=0x7f050002; } }