diff --git a/.classpath b/.classpath index f0b94296..ff33dbc2 100644 --- a/.classpath +++ b/.classpath @@ -3,5 +3,6 @@ + diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 49712247..da6d3907 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,6 +23,11 @@ + + + diff --git a/assets/www/index.html b/assets/www/index.html index d1ac7d5d..c97d6120 100644 --- a/assets/www/index.html +++ b/assets/www/index.html @@ -8,7 +8,7 @@ +

Welcome to PhoneGap!

@@ -85,6 +111,10 @@ Get Location Call 411 Beep - Vibrate + Vibrate + Get a Picture +
+ +
diff --git a/assets/www/master.css b/assets/www/master.css index 1d1bea20..6a9b7218 100644 --- a/assets/www/master.css +++ b/assets/www/master.css @@ -93,3 +93,7 @@ width:308px; padding:1.2em 0; } + + #viewport { + display: none; + } diff --git a/assets/www/phonegap.js b/assets/www/phonegap.js index 75ac2872..8f246d3f 100644 --- a/assets/www/phonegap.js +++ b/assets/www/phonegap.js @@ -308,6 +308,13 @@ function Device() { this.gap = null; this.uuid = null; try { +<<<<<<< HEAD:android/assets/www/phonegap.js + if (window['DroidGap'] != undefined && window.DroidGap.exists()) { + this.available = true; + this.isAndroid = true; + this.uuid = window.DroidGap.getUuid(); + this.gapVersion = window.DroidGap.getVersion(); +======= if (window.DroidGap) { this.available = true; this.uuid = window.DroidGap.getUuid(); @@ -315,6 +322,7 @@ function Device() { this.gapVersion = window.DroidGap.getVersion(); this.platform = window.DroidGap.getPlatform(); this.name = window.DroidGap.getProductName(); +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js } else { this.platform = DeviceInfo.platform; this.version = DeviceInfo.version; @@ -510,6 +518,12 @@ function Media(src) { this.src = src; } +<<<<<<< HEAD:android/assets/www/phonegap.js +Media.prototype.record = function() { +} + +======= +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js Media.prototype.play = function() { } @@ -676,12 +690,8 @@ PhoneGap.addConstructor(function() { * @param {Object} vel * @constructor */ -function Position(coords, timestamp) { - this.coords = coords; - this.timestamp = new Date().getTime(); -} - -function Coordinates(lat, lng, alt, acc, head, vel) { +<<<<<<< HEAD:android/assets/www/phonegap.js +function Position(lat, lng, acc, alt, altacc, head, vel) { /** * The latitude of the position. */ @@ -698,6 +708,10 @@ function Coordinates(lat, lng, alt, acc, head, vel) { * The altitude of the position. */ this.altitude = alt; + /** + * The altitude accuracy of the position. + */ + this.altitudeAccuracy = altacc; /** * The direction the device is moving at the position. */ @@ -705,7 +719,11 @@ function Coordinates(lat, lng, alt, acc, head, vel) { /** * The velocity with which the device is moving at the position. */ - this.speed = vel; + this.velocity = vel; + /** + * The time that the position was obtained. + */ + this.timestamp = new Date().getTime(); } /** @@ -880,6 +898,238 @@ UIControls.prototype.createToolBar = function() {}; */ UIControls.prototype.setToolBarTitle = function(title) {}; +PhoneGap.addConstructor(function() { + window.uicontrols = new UIControls(); +}); +/* + * This is because strings are not exposed + * + */ +var Device = { + + platform: "", + version: "", + uuid: "", + + init: function() { + Device.platform = DroidGap.getPlatform(); + Device.version = Droidap.getVersion(); + Device.uuid = DroidGap.getUuid(); + }, + vibrate: function(mills) + { + DroidGap.vibrate(mills); + }, + beep: function() + { + DroidGap.beep(); + } +======= +function Position(coords, timestamp) { + this.coords = coords; + this.timestamp = new Date().getTime(); +} + +function Coordinates(lat, lng, alt, acc, head, vel) { + /** + * The latitude of the position. + */ + this.latitude = lat; + /** + * The longitude of the position, + */ + this.longitude = lng; + /** + * The accuracy of the position. + */ + this.accuracy = acc; + /** + * The altitude of the position. + */ + this.altitude = alt; + /** + * The direction the device is moving at the position. + */ + this.heading = head; + /** + * The velocity with which the device is moving at the position. + */ + this.speed = vel; +} + +/** + * This class specifies the options for requesting position data. + * @constructor + */ +function PositionOptions() { + /** + * Specifies the desired position accuracy. + */ + this.enableHighAccuracy = true; + /** + * The timeout after which if position data cannot be obtained the errorCallback + * is called. + */ + this.timeout = 10000; +} + +/** + * This class contains information about any GSP errors. + * @constructor + */ +function PositionError() { + this.code = null; + this.message = ""; +} + +PositionError.UNKNOWN_ERROR = 0; +PositionError.PERMISSION_DENIED = 1; +PositionError.POSITION_UNAVAILABLE = 2; +PositionError.TIMEOUT = 3; +/** + * This class provides access to the device SMS functionality. + * @constructor + */ +function Sms() { + +} + +/** + * Sends an SMS message. + * @param {Integer} number The phone number to send the message to. + * @param {String} message The contents of the SMS message to send. + * @param {Function} successCallback The function to call when the SMS message is sent. + * @param {Function} errorCallback The function to call when there is an error sending the SMS message. + * @param {PositionOptions} options The options for accessing the GPS location such as timeout and accuracy. + */ +Sms.prototype.send = function(number, message, successCallback, errorCallback, options) { + +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js +} + +PhoneGap.addConstructor(function() { + if (typeof navigator.sms == "undefined") navigator.sms = new Sms(); +}); +/** + * This class provides access to the telephony features of the device. + * @constructor + */ +function Telephony() { + +} + +/** + * Calls the specifed number. + * @param {Integer} number The number to be called. + */ +Telephony.prototype.call = function(number) { + +} + +PhoneGap.addConstructor(function() { + if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony(); +}); +/** + * This class exposes mobile phone interface controls to JavaScript, such as + * native tab and tool bars, etc. + * @constructor + */ +function UIControls() { + this.tabBarTag = 0; + this.tabBarCallbacks = {}; +} + +/** + * Create a native tab bar that can have tab buttons added to it which can respond to events. + */ +UIControls.prototype.createTabBar = function() {}; + +/** + * Show a tab bar. The tab bar has to be created first. + * @param {Object} [options] Options indicating how the tab bar should be shown: + * - \c height integer indicating the height of the tab bar (default: \c 49) + * - \c position specifies whether the tab bar will be placed at the \c top or \c bottom of the screen (default: \c bottom) + */ +UIControls.prototype.showTabBar = function(options) {}; + +/** + * Hide a tab bar. The tab bar has to be created first. + */ +UIControls.prototype.hideTabBar = function(animate) {}; + +/** + * Create a new tab bar item for use on a previously created tab bar. Use ::showTabBarItems to show the new item on the tab bar. + * + * If the supplied image name is one of the labels listed below, then this method will construct a tab button + * using the standard system buttons. Note that if you use one of the system images, that the \c title you supply will be ignored. + * + * Tab Buttons + * - tabButton:More + * - tabButton:Favorites + * - tabButton:Featured + * - tabButton:TopRated + * - tabButton:Recents + * - tabButton:Contacts + * - tabButton:History + * - tabButton:Bookmarks + * - tabButton:Search + * - tabButton:Downloads + * - tabButton:MostRecent + * - tabButton:MostViewed + * @param {String} name internal name to refer to this tab by + * @param {String} [title] title text to show on the tab, or null if no text should be shown + * @param {String} [image] image filename or internal identifier to show, or null if now image should be shown + * @param {Object} [options] Options for customizing the individual tab item + * - \c badge value to display in the optional circular badge on the item; if null or unspecified, the badge will be hidden + */ +UIControls.prototype.createTabBarItem = function(name, label, image, options) {}; + +/** + * Update an existing tab bar item to change its badge value. + * @param {String} name internal name used to represent this item when it was created + * @param {Object} options Options for customizing the individual tab item + * - \c badge value to display in the optional circular badge on the item; if null or unspecified, the badge will be hidden + */ +UIControls.prototype.updateTabBarItem = function(name, options) {}; + +/** + * Show previously created items on the tab bar + * @param {String} arguments... the item names to be shown + * @param {Object} [options] dictionary of options, notable options including: + * - \c animate indicates that the items should animate onto the tab bar + * @see createTabBarItem + * @see createTabBar + */ +UIControls.prototype.showTabBarItems = function(tabs, options) {}; + +/** + * Manually select an individual tab bar item, or nil for deselecting a currently selected tab bar item. + * @param {String} tabName the name of the tab to select, or null if all tabs should be deselected + * @see createTabBarItem + * @see showTabBarItems + */ +UIControls.prototype.selectTabBarItem = function(tab) {}; + +/** + * Function called when a tab bar item has been selected. + * @param {Number} tag the tag number for the item that has been selected + */ +UIControls.prototype.tabBarItemSelected = function(tag) { + if (typeof(this.tabBarCallbacks[tag]) == 'function') + this.tabBarCallbacks[tag](); +}; + +/** + * Create a toolbar. + */ +UIControls.prototype.createToolBar = function() {}; + +/** + * Function called when a tab bar item has been selected. + * @param {String} title the title to set within the toolbar + */ +UIControls.prototype.setToolBarTitle = function(title) {}; + PhoneGap.addConstructor(function() { window.uicontrols = new UIControls(); }); @@ -891,24 +1141,37 @@ PhoneGap.addConstructor(function() { Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) { +<<<<<<< HEAD:android/assets/www/phonegap.js + var position = Geo.getCurrentPosition(); +======= var position = Geo.getCurrentLocation(); +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js this.global_success = successCallback; this.fail = errorCallback; } // Run the global callback +<<<<<<< HEAD:android/assets/www/phonegap.js +Geolocation.prototype.gotCurrentPosition = function(lat, lng) +======= Geolocation.prototype.gotCurrentPosition = function(lat, lng, alt, altacc, head, vel, stamp) +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js { - if (lat == "undefined" || lng == "undefined") + if (lat == 0 || lng == 0) { this.fail(); } else { +<<<<<<< HEAD:android/assets/www/phonegap.js + var p = { "lat" : lat, "lng": lng }; + this.global_success(p); +======= coords = new Coordinates(lat, lng, alt, altacc, head, vel); loc = new Position(coords, stamp); this.global_success(loc); +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js } } @@ -937,14 +1200,18 @@ Geolocation.prototype.watchPosition = function(successCallback, errorCallback, o * Retrieve and stop this listener from listening to the GPS * */ +<<<<<<< HEAD:android/assets/www/phonegap.js +Geolocation.prototype.success(key, lat, lng) +======= Geolocation.prototype.success = function(key, lat, lng, alt, altacc, head, vel, stamp) +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js { var coords = new Coordinates(lat, lng, alt, altacc, head, vel); var loc = new Position(coords, stamp); this.listeners[key].success(loc); } -Geolocation.prototype.fail = function(key) +Geolocation.prototype.fail(key) { this.listeners[key].fail(); } @@ -954,6 +1221,24 @@ Geolocation.prototype.clearWatch = function(watchId) Geo.stop(watchId); } +<<<<<<< HEAD:android/assets/www/phonegap.js + +Notification.prototype.vibrate = function(mills) +{ + Device.vibrate(mills); +} + +/* + * On the Android, we don't beep, we notify you with your + * notification! We shouldn't keep hammering on this, and should + * review what we want beep to do. + */ + +Notification.prototype.beep = function(count, volume) +{ + Device.notify(); +} +======= Notification.prototype.vibrate = function(mills) { @@ -1047,3 +1332,4 @@ Accelerometer.prototype.clearWatch = function(watchId) { PhoneGap.addConstructor(function() { if (typeof navigator.accelerometer == "undefined") navigator.accelerometer = new Accelerometer(); }); +>>>>>>> 4c08b34a81e55a3146e67a8ad2282b7082b640e0:android/assets/www/phonegap.js diff --git a/libs/commons-codec-1.3.jar b/libs/commons-codec-1.3.jar new file mode 100644 index 00000000..957b6752 Binary files /dev/null and b/libs/commons-codec-1.3.jar differ diff --git a/local.properties b/local.properties index e3fc4c14..68fc6af4 100644 --- a/local.properties +++ b/local.properties @@ -7,4 +7,4 @@ # location of the SDK. This is only used by Ant # For customization when using a Version Control System, please read the # header note. -sdk-location=/home/bowserj/android-sdk-linux_x86-1.5_r1 +sdk-location=/home/bowserj/android-sdk-linux_x86-1.5_r3 diff --git a/res/layout/preview.xml b/res/layout/preview.xml new file mode 100644 index 00000000..f7fe83aa --- /dev/null +++ b/res/layout/preview.xml @@ -0,0 +1,23 @@ + + + + +