android/src/com/phonegap/demo/CompassListener.java android/src/com/phonegap/demo/FileUtils.java javascripts/android/file.js @@ -3,16 +3,15 @@ package="com.phonegap.demo" android:versionName="1.0.1" android:versionCode="2"> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.VIBRATE" /> - <uses-permission android:name="android.permission.ACCESS_GPS" /> - <uses-permission android:name="android.permission.ACCESS_ASSISTED_GPS" /> - <uses-permission android:name="android.permission.ACCESS_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true"> @@ -29,6 +28,6 @@ <action android:name="android.intent.action.PICK" /> </activity> </application> - <uses-sdk android:minSdkVersion="3" /> + <uses-sdk android:minSdkVersion="4" /> -</manifest> \ No newline at end of file +</manifest> android/AndroidManifest.xml @@ -87,6 +87,17 @@ alert(fail); } + // This is just to do this. + function readFile() + { + navigator.file.read('/sdcard/phonegap.txt', fail , fail); + } + + function writeFile() + { + navigator.file.write('foo.txt', "This is a test of writing to a file", fail, fail); + } + function init(){ document.addEventListener("touchmove", preventBehavior, false); setTimeout(deviceInfo, 1); @@ -112,7 +123,9 @@ <a href="tel://411" class="btn large">Call 411</a> <a href="#" class="btn" onclick="beep();">Beep</a> <a href="#" class="btn" onclick="vibrate();">Vibrate</a> - <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a> + <a href="#" class="btn" onclick="show_pic();">Get a Picture</a> + <a href="#" class="btn" onclick="readFile();">Read from file</a> + <a href="#" class="btn" onclick="writeFile();">Write to File</a> <div id="viewport" class="viewport"> <img style="width:60px;height:60px" id="test_img" src="" /> </div> android/assets/www/index.html @@ -94,6 +94,3 @@ padding:1.2em 0; } - #viewport { - display: none; - } android/assets/www/master.css @@ -7,16 +7,8 @@ # "build.properties", and override values to adapt the script to your # project structure. -# Project target. -target=Google Inc.:Google APIs:3 -# apk configurations. This property allows creation of APK files with limited -# resources. For example, if your application contains many locales and -# you wish to release multiple smaller apks instead of a large one, you can -# define configuration to create apks with limited language sets. -# Format is a comma separated list of configuration names. For each -# configuration, a property will declare the resource configurations to -# include. Example: -# apk-configurations=european,northamerica -# apk-config-european=en,fr,it,de,es -# apk-config-northamerica=en,es apk-configurations= +# Project target. +target=android-4 +# Indicates whether an apk should be generated for each density. +split.density=false android/default.properties @@ -8,6 +8,7 @@ import android.content.Context; import android.hardware.SensorListener; import android.webkit.WebView; +@SuppressWarnings("deprecation") public class AccelListener implements SensorListener{ WebView mAppView; android/src/com/phonegap/demo/AccelListener.java @@ -46,6 +46,7 @@ public class DroidGap extends Activity { private GeoBroker geo; private AccelListener accel; private CameraLauncher launcher; + private FileUtils fs; /** Called when the activity is first created. */ @Override @@ -93,16 +94,18 @@ public class DroidGap extends Activity { private void bindBrowser(WebView appView) { - gap = new PhoneGap(this, appView); geo = new GeoBroker(appView, this); accel = new AccelListener(this, appView); launcher = new CameraLauncher(appView, this); + fs = new FileUtils(appView); + // This creates the new javascript interfaces for PhoneGap appView.addJavascriptInterface(gap, "DroidGap"); appView.addJavascriptInterface(geo, "Geo"); appView.addJavascriptInterface(accel, "Accel"); appView.addJavascriptInterface(launcher, "GapCam"); + appView.addJavascriptInterface(fs, "FileUtil"); } /** android/src/com/phonegap/demo/DroidGap.java @@ -21,13 +21,12 @@ package com.phonegap.demo; * 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 java.util.TimeZone; import android.content.Context; import android.content.IntentFilter; import android.net.Uri; -import android.os.Handler; import android.os.Vibrator; import android.telephony.TelephonyManager; import android.webkit.WebView; @@ -41,7 +40,7 @@ public class PhoneGap{ * UUID, version and availability */ public boolean droid = true; - public static String version = "0.2"; + public static String version = "0.8.0"; public static String platform = "Android"; public static String uuid; private Context mCtx; @@ -62,9 +61,8 @@ public class PhoneGap{ public void beep(long pattern) { - RingtoneManager beeper = new RingtoneManager(mCtx); - Uri ringtone = beeper.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); - Ringtone notification = beeper.getRingtone(mCtx, ringtone); + Uri ringtone = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); + Ringtone notification = RingtoneManager.getRingtone(mCtx, ringtone); for (long i = 0; i < pattern; ++i) { notification.play(); @@ -162,72 +160,6 @@ public class PhoneGap{ http.get(url, file); } - - - - public int testSaveLocationExists(){ - if (fileManager.testSaveLocationExists()) - return 0; - else - return 1; - } - - public long getFreeDiskSpace(){ - long freeDiskSpace=fileManager.getFreeDiskSpace(); - return freeDiskSpace; - } - - public int testFileExists(String file){ - if (fileManager.testFileExists(file)) - return 0; - else - return 1; - } - - public int testDirectoryExists(String file){ - if (fileManager.testFileExists(file)) - return 0; - else - return 1; - } - - /** - * Delete a specific directory. - * Everyting in side the directory would be gone. - * TODO: JavaScript Call backs for success and error handling - */ - public int deleteDirectory (String dir){ - if (fileManager.deleteDirectory(dir)) - return 0; - else - return 1; - } - - - /** - * Delete a specific file. - * TODO: JavaScript Call backs for success and error handling - */ - public int deleteFile (String file){ - if (fileManager.deleteFile(file)) - return 0; - else - return 1; - } - - - /** - * Create a new directory. - * TODO: JavaScript Call backs for success and error handling - */ - public int createDirectory(String dir){ - if (fileManager.createDirectory(dir)) - return 0; - else - return 1; - } - - /** * AUDIO * TODO: Basic functions done but needs more work on error handling and call backs, remove record hack android/src/com/phonegap/demo/PhoneGap.java @@ -3,62 +3,11 @@ * This class provides access to the device media, interfaces to both sound and video * @constructor */ -var MEDIA_AUDIO = "mp3"; -function Media(src) { - this.src = src; +Media.prototype.playAudio = function(filename) { + PhoneGap.startPlayingiAudio(filename); } -Media.prototype.record = function() { - var fileparse = this.src.split('.'); - var filetype = fileparse[fileparse.length - 1]; - if ( filetype == MEDIA_AUDIO ) - { - // Queue up Audio API - } - else - { - // Start Camera Preview for Video Recording - } +Media.prototype.stopAudio = function() { + PhoneGap.stopPlayingAudio(); } - -Media.prototype.play = function() { - var fileparse = this.src.split('.'); - var filetype = fileparse[fileparse.length - 1]; - if ( filetype = MEDIA_AUDIO) - { - // Play Audio - } - else - { - // Bring up Video Overlay - // (Note: On HTML 5 Browsers (iPhone), this should - // create a DIV with a VIDEO tag in it) - } -} - -Media.prototype.pause = function() { - // Do some pausing -} - -Media.prototype.stop = function() { - // Stop playback -} - - -/** - * This class contains information about any Media errors. - * @constructor - */ -function MediaError() { - this.code = null, - this.message = ""; -} - -MediaError.MEDIA_ERR_ABORTED = 1; -MediaError.MEDIA_ERR_NETWORK = 2; -MediaError.MEDIA_ERR_DECODE = 3; -MediaError.MEDIA_ERR_NONE_SUPPORTED = 4; - - -//if (typeof navigator.audio == "undefined") navigator.audio = new Media(src); javascripts/android/media.js android/assets/www/phonegap.js fafe5434da903780fe1f17c280b8a0a165779008 fea61e1ed0990f3cda617bc22ccae3c68d380458 Fil Maj filip.maj@nitobi.com http://github.com/sintaxi/phonegap/commit/e7765530ec377b37121dab6489cc9a8a4fbd662c e7765530ec377b37121dab6489cc9a8a4fbd662c 2009-10-29T14:14:56-07:00 2009-10-29T14:14:56-07:00 Merge branch 'master' of git://github.com/bowserj/phonegap edc326fa560c54360543600cad73046eb707da99 Fil Maj filip.maj@nitobi.com