Merge branch 'master' of git://github.com/shazron/phonegap

phonegap · Aug 14, 2009 · b65e86b · b65e86b
2 parents b0da616 + 35c3bea
commit b65e86b
Show file tree

Hide file tree

Showing 40 changed files with 2,200 additions and 177 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ iphone: lib/iphone/phonegap-min.js
 lib/iphone/phonegap-min.js: lib/iphone/phonegap.js
 	$(JAVA) -jar util/yuicompressor-2.4.2.jar --charset UTF-8 -o $@ lib/iphone/phonegap.js
 
-lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/iphone/accelerometer.js javascripts/iphone/bonjour.js javascripts/iphone/contact.js javascripts/iphone/camera.js javascripts/iphone/debugconsole.js javascripts/iphone/device.js javascripts/iphone/geolocation.js javascripts/iphone/compass.js javascripts/iphone/media.js javascripts/iphone/notification.js javascripts/iphone/phonegap.js javascripts/iphone/uicontrols.js
+lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/network.js javascripts/iphone/accelerometer.js javascripts/iphone/bonjour.js javascripts/iphone/contact.js javascripts/iphone/camera.js javascripts/iphone/debugconsole.js javascripts/iphone/device.js javascripts/iphone/geolocation.js javascripts/iphone/compass.js javascripts/iphone/media.js javascripts/iphone/notification.js javascripts/iphone/phonegap.js javascripts/iphone/uicontrols.js javascripts/iphone/network.js
 	$(RM_RF) lib/iphone
 	$(MKPATH) lib/iphone
 	$(RM_F) $@
@@ -65,6 +65,7 @@ lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js
 	$(CAT) javascripts/sms.js >> $@
 	$(CAT) javascripts/telephony.js >> $@
 	$(CAT) javascripts/uicontrols.js >> $@
+	$(CAT) javascripts/network.js >> $@
 	$(CAT) javascripts/iphone/accelerometer.js >> $@
 	$(CAT) javascripts/iphone/bonjour.js >> $@
 	$(CAT) javascripts/iphone/contact.js >> $@
@@ -77,6 +78,8 @@ lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js
 	$(CAT) javascripts/iphone/notification.js >> $@
 	$(CAT) javascripts/iphone/phonegap.js >> $@
 	$(CAT) javascripts/iphone/uicontrols.js >> $@
+	$(CAT) javascripts/iphone/network.js >> $@
+
 blackberry: lib/blackberry/phonegap-min.js
 
 lib/blackberry/phonegap-min.js: lib/blackberry/phonegap.js
@@ -111,8 +114,8 @@ android: lib/android/phonegap-min.js
 lib/android/phonegap-min.js: lib/android/phonegap.js
 	$(JAVA) -jar util/yuicompressor-2.4.2.jar --charset UTF-8 -o $@ lib/android/phonegap.js
 
-lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/android/device.js javascripts/android/geolocation.js javascripts/android/notification.js
-	$(RM_RF) lib/android
+<<<<<<< HEAD:Makefile
+lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/android/device.js javascripts/android/geolocation.js javascripts/android/notification.js javascripts/android/camera.js
 	$(MKPATH) lib/android
 	$(RM_F) $@
 	$(CAT) javascripts/phonegap.js.base >> $@
@@ -137,3 +140,4 @@ lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.j
 	$(CAT) javascripts/android/geolocation.js >> $@
 	$(CAT) javascripts/android/notification.js >> $@
 	$(CAT) javascripts/android/accelerometer.js >> $@
+	$(CAT) javascripts/android/camera.js >> $@
diff --git a/android/.classpath b/android/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="libs/commons-codec-1.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -23,6 +23,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".CameraPreview"
+        		android:label="@string/app_name" android:screenOrientation="landscape"
+                  android:configChanges="orientation|keyboardHidden">
+        		<action android:name="android.intent.action.PICK" />        		
+        </activity>
     </application>
 	<uses-sdk android:minSdkVersion="3" />
 

diff --git a/android/assets/www/index.html b/android/assets/www/index.html
@@ -8,7 +8,7 @@
 	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
 	  <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>	  
 	  <script type="text/javascript" charset="utf-8">
-	  
+
     var deviceInfo = function(){      
       document.getElementById("platform").innerHTML = device.platform;
       document.getElementById("version").innerHTML = device.version;
@@ -55,18 +55,44 @@
       return result;
     }
 
-	  var preventBehavior = function(e) { 
+	var preventBehavior = function(e) { 
       e.preventDefault(); 
     };
 
+    function show_pic()
+    {
+      navigator.camera.getPicture(dump_pic, fail, { quality: 50 }); 
+    }
+
+    function dump_pic(data)
+    {
+      var viewport = document.getElementById('viewport');
+      console.log(data);
+      viewport.style.display = "";
+      viewport.style.position = "absolute";
+      viewport.style.top = "10px";
+      viewport.style.left = "10px";
+      document.getElementById("test_img").src = "data:image/jpeg;base64," + data;
+    }
+
+    function close()
+    {
+      var viewport = document.getElementById('viewport');
+      viewport.style.position = "relative";
+      viewport.style.display = "none";
+    }
+
+    function fail(fail)
+    {
+      alert(fail);
+    }
 
-		function init(){
-		  // Android is SLOW!!!!  This is not present yet!
-		  setTimeout(deviceInfo, 1);
-		  document.addEventListener("touchmove", preventBehavior, false);	
-		}
+	function init(){
+		document.addEventListener("touchmove", preventBehavior, false);
+		setTimeout(deviceInfo, 1);
+	}
 
-	  </script>
+  </script>
   </head>
   <body onload="init();" id="stage" class="theme">
     <h1>Welcome to PhoneGap!</h1>
@@ -85,6 +111,10 @@ <h4>UUID:   <span id="uuid">&nbsp;</span></h4>
     <a href="#" class="btn large" onclick="getLocation();">Get Location</a>
 	<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" onclick="vibrate();">Vibrate</a>
+    <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
+    <div id="viewport" class="viewport">       
+      <img style="width:60px;height:60px" id="test_img" src="" />
+    </div> 
   </body>
 </html>
diff --git a/android/assets/www/master.css b/android/assets/www/master.css
@@ -93,3 +93,7 @@
   	width:308px;
   	padding:1.2em 0;
   }
+
+  #viewport {
+    display: none;
+  }