rhodes 1.5.4 → 1.5.5

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java

@@ -36,4 +36,6 @@ public interface MainView {
 	
 	public void switchTab(int index);
 	public int activeTab();
+	
+	public void loadData(String data, int index);
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -74,7 +74,13 @@ public class SimpleMainView implements MainView {
 			reload(0);
 		}
 	};
-	
+
+	private class ActionExit implements View.OnClickListener {
+		public void onClick(View v) {
+			Rhodes.exit();
+		}
+	};
+
 	private class ActionCustomRunnable implements Runnable {
 		private boolean callback;
 		private String url;
@@ -138,22 +144,11 @@ public class SimpleMainView implements MainView {
 		view.addView(bottom);
 		
 		if (params != null) {
-			LinearLayout left = new LinearLayout(r);
-			left.setGravity(Gravity.LEFT);
-			left.setOrientation(LinearLayout.HORIZONTAL);
-			left.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 1));
-			bottom.addView(left);
-			
-			LinearLayout right = new LinearLayout(r);
-			right.setGravity(Gravity.RIGHT);
-			right.setOrientation(LinearLayout.HORIZONTAL);
-			right.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 1));
-			bottom.addView(right);
-			
-			LinearLayout current = left;
-			
 			String rootPath = r.getRootPath() + "/apps/";
 			
+			LinearLayout group = null;
+			// First group should have gravity LEFT
+			int gravity = Gravity.LEFT;
 			for (int i = 0, lim = params.size(); i < lim; ++i) {
 				Object param = params.elementAt(i);
 				if (!(param instanceof Map<?,?>))
@@ -193,8 +188,13 @@ public class SimpleMainView implements MainView {
 					icon = r.getResources().getDrawable(AndroidR.drawable.refresh);
 					onClick = new ActionRefresh();
 				}
+				else if (action.equalsIgnoreCase("close") || action.equalsIgnoreCase("exit")) {
+					icon = r.getResources().getDrawable(AndroidR.drawable.exit);
+					onClick = new ActionExit();
+				}
 				else if (action.equalsIgnoreCase("separator")) {
-					current = right;
+					group = null;
+					gravity = Gravity.CENTER;
 					continue;
 				}
 				
@@ -204,8 +204,9 @@ public class SimpleMainView implements MainView {
 						throw new IllegalArgumentException("'icon' should be String");
 					String iconPath = rootPath + (String)iconObj;
 					Bitmap bitmap = BitmapFactory.decodeFile(iconPath);
-					if (bitmap != null)
-						icon = new BitmapDrawable(bitmap);
+					if (bitmap == null)
+						throw new IllegalArgumentException("Can't find icon: " + iconPath);
+					icon = new BitmapDrawable(bitmap);
 				}
 				
 				if (icon == null) {
@@ -238,8 +239,19 @@ public class SimpleMainView implements MainView {
 				
 				button.setOnClickListener(onClick);
 				button.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
-				current.addView(button);
+				if (group == null) {
+					group = new LinearLayout(r);
+					group.setGravity(gravity);
+					group.setOrientation(LinearLayout.HORIZONTAL);
+					group.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 1));
+					bottom.addView(group);
+				}
+				group.addView(button);
 			}
+			
+			// Last group should have gravity RIGHT
+			if (group != null)
+				group.setGravity(Gravity.RIGHT);
 		}
 	}
 	
@@ -282,5 +294,9 @@ public class SimpleMainView implements MainView {
 	public int activeTab() {
 		return 0;
 	}
+	
+	public void loadData(String data, int index) {
+		webView.loadData(data, "text/html", "utf-8");
+	}
 
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java

@@ -212,4 +212,8 @@ public class TabbedMainView implements MainView {
 		return host.getCurrentTab();
 	}
 
+	public void loadData(String data, int index) {
+		getWebView(index).loadData(data, "text/html", "utf-8");
+	}
+
 }

data/platform/android/build/android.rake

@@ -328,7 +328,7 @@ namespace "build" do
 
     end
 #    desc "Build RhoBundle for android"
-    task :rhobundle => ["config:android","build:bundle:noxruby",:extensions,:librhodes] do
+    task :rhobundle => ["config:android","build:bundle:noxruby",:generate_sources,:extensions,:librhodes] do
 #      Rake::Task["build:bundle:noxruby"].execute
 
       assets = File.join(Jake.get_absolute($androidpath), "Rhodes", "assets")
@@ -345,11 +345,35 @@ namespace "build" do
       File.open(File.join(assets, "name"), "w") { |f| f.write($appname) }
     end
 
+    task :generate_sources => "config:android" do
+      # Generate gapikey.h
+      gapikey_h = File.join($androidpath, "Rhodes", "jni", "include", "gapikey.h")
+      gapi_defined = false
+      if File.file? gapikey_h
+        File.open(gapikey_h, 'r') do |f|
+          while line = f.gets
+            gapi_defined = true if line =~ /GOOGLE_API_KEY/
+            break if gapi_defined
+          end
+        end
+      end
+
+      if $use_geomapping != gapi_defined or not File.file? gapikey_h
+        File.open(gapikey_h, 'w') do |f|
+          f.puts "#ifndef RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F"
+          f.puts "#define RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F"
+          f.puts "#define GOOGLE_API_KEY \"#{$gapikey}\"" if $use_geomapping and !$gapikey.nil?
+          f.puts "#endif /* RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F */"
+        end
+      end
+    end
+
     task :extensions => "config:android" do
 
       ENV["ANDROID_NDK"] = $androidndkpath
       ENV["ANDROID_API_LEVEL"] = ANDROID_API_LEVEL.to_s
       ENV["TARGET_TEMP_DIR"] = $extensionsdir
+      ENV["RHO_ROOT"] = $startdir
       ENV["BUILD_DIR"] ||= $startdir + "/platform/android/build"
 
       mkdir_p $bindir + "/libs/" + $confdir + "/extensions" unless File.exist? $bindir + "/libs/" + $confdir + "/extensions"
@@ -370,9 +394,11 @@ namespace "build" do
           extpath = rhoextpath
         end
         
-     
-
-        puts Jake.run('./build', [], extpath) if File.executable? File.join(extpath, 'build')
+        if RUBY_PLATFORM =~ /(win|w)32$/
+          puts Jake.run('build.bat', [], extpath) if File.exists? File.join(extpath, 'build.bat')
+        else
+          puts Jake.run('./build', [], extpath) if File.executable? File.join(extpath, 'build')
+        end
         exit 1 unless $? == 0
         
       end
@@ -566,27 +592,6 @@ namespace "build" do
       objdir = File.join $rhobindir, $confdir, "librhodes"
       libname = File.join $bindir, "libs", $confdir, "librhodes.so"
 
-      # Generate gapikey.h
-      gapikey_h = File.join(incdir, 'gapikey.h')
-      gapi_defined = false
-      if File.file? gapikey_h
-        File.open(gapikey_h, 'r') do |f|
-          while line = f.gets
-            gapi_defined = true if line =~ /GOOGLE_API_KEY/
-            break if gapi_defined
-          end
-        end
-      end
-
-      if $use_geomapping != gapi_defined or not File.file? gapikey_h
-        File.open(gapikey_h, 'w') do |f|
-          f.puts "#ifndef RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F"
-          f.puts "#define RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F"
-          f.puts "#define GOOGLE_API_KEY \"#{$gapikey}\"" if $use_geomapping and !$gapikey.nil?
-          f.puts "#endif /* RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F */"
-        end
-      end
-
       args = []
       args << "-I#{srcdir}/../include"
       args << "-I#{$shareddir}"

data/platform/bb/build/rhodes_build.files

@@ -2,6 +2,7 @@ platform\bb\rhodes\src\com\rho\Jsr75File.java
 platform\bb\rhodes\src\com\rho\rubyext\GeoLocation.java
 platform\bb\rhodes\src\com\rho\rubyext\System.java
 platform\bb\rhodes\src\com\rho\rubyext\XMLParser.java
+platform\bb\rhodes\src\com\rho\rubyext\Alert.java
 platform\bb\rhodes\src\com\rho\net\BaseSocket.java
 platform\bb\rhodes\src\com\rho\net\bb\BBHttpConnection.java
 platform\bb\rhodes\src\com\rho\net\bb\NativeBBHttpConnection.java
@@ -22,7 +23,6 @@ platform\bb\rhodes\src\rhomobile\RhoPhonebook.java
 platform\bb\rhodes\src\rhomobile\SecondaryResourceFetchThread.java
 platform\bb\rhodes\src\rhomobile\Utilities.java
 platform\bb\rhodes\src\rhomobile\WebView.java
-platform\bb\rhodes\src\rhomobile\Alert.java
 platform\bb\rhodes\src\rhomobile\datetime\DateTimePicker.java
 platform\bb\rhodes\src\rhomobile\datetime\DateTimeScreen.java
 platform\bb\rhodes\src\rhomobile\RingtoneManager.java

data/platform/bb/rhodes/rhodes.jdp

@@ -30,6 +30,7 @@ src\com\rho\Jsr75File.java
 src\com\rho\rubyext\GeoLocation.java
 src\com\rho\rubyext\System.java
 src\com\rho\rubyext\XMLParser.java
+src\com\rho\rubyext\Alert.java
 src\com\rho\net\BaseSocket.java
 src\com\rho\net\bb\BBHttpConnection.java
 src\com\rho\net\bb\NativeBBHttpConnection.java
@@ -39,7 +40,6 @@ src\com\rho\net\TCPSocket.java
 src\com\rho\RhoMainScreen.java
 src\com\rho\RhoRubyHelper.java
 src\com\rho\Version.java
-src\rhomobile\Alert.java
 src\rhomobile\camera\Camera.java
 src\rhomobile\camera\CameraFilesListener.java
 src\rhomobile\camera\CameraScreen.java

data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java

@@ -6,7 +6,7 @@ import net.rim.device.api.system.ApplicationDescriptor;
 import net.rim.device.api.system.CodeModuleGroup;
 import net.rim.device.api.system.DeviceInfo;
 import net.rim.device.api.io.http.HttpHeaders;
-import rhomobile.Alert;
+import com.rho.rubyext.Alert;
 import rhomobile.NativeBar;
 import rhomobile.RhoPhonebook;
 import rhomobile.RhodesApplication;

data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java

@@ -0,0 +1,300 @@
+package com.rho.rubyext;
+
+import java.io.InputStream;
+import java.util.Vector;
+
+import javax.microedition.media.Player;
+
+import net.rim.device.api.system.Application;
+import net.rim.device.api.ui.component.Dialog;
+
+import com.rho.RhoClassFactory;
+import com.rho.RhoEmptyLogger;
+import com.rho.RhoLogger;
+import com.rho.RhodesApp;
+import com.rho.SimpleFile;
+import com.xruby.runtime.builtin.*;
+import com.xruby.runtime.lang.*;
+
+public class Alert
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("Alert");
+
+	public static final RubyID titleID = RubyID.intern("title");
+	public static final RubyID messageID = RubyID.intern("message");
+	public static final RubyID iconID = RubyID.intern("icon");
+	public static final RubyID callbackID = RubyID.intern("callback");
+	public static final RubyID buttonsID = RubyID.intern("buttons");
+	public static final RubyID buttonidID = RubyID.intern("id");
+	
+	public static final RubyID alertTypeID = RubyID.intern("alert");
+	public static final RubyID questionTypeID = RubyID.intern("question");
+	public static final RubyID infoTypeID = RubyID.intern("info");
+	
+    public static void showPopup(final String message) 
+    {
+    	Application.getApplication().invokeLater(new Runnable() {
+            public void run() {    	
+            	Application.getApplication().requestForeground();
+            	Dialog.alert(message);
+            }
+    	});
+    }
+
+    private static String getHashStringValue(RubyHash hash, RubyID id)
+    {
+    	RubyValue val = hash.get(id.toSymbol());
+    	
+    	return val != null && val != RubyConstant.QNIL ? val.toStr() : ""; 
+    }
+    
+    private static class PopupHandler implements Runnable
+    {
+    	String m_strMessage = "";
+    	String m_strCallback = "";
+    	Vector m_vecButtons = new Vector();
+    	Vector m_vecIDs = new Vector();
+    	private static final int atAlert = 1;
+    	private static final int atQuestion = 2;
+    	private static final int atInfo = 3;
+    	int      m_nType = 0;
+    	
+    	PopupHandler(RubyHash hash)
+    	{
+    		m_strMessage = getHashStringValue(hash, messageID );
+    		m_strCallback = getHashStringValue(hash, callbackID );
+    		
+    		RubyValue valButtons = hash.get(buttonsID.toSymbol());
+    		if ( valButtons != null && valButtons instanceof RubyArray )
+    		{
+    			RubyArray arButtons = (RubyArray)valButtons;
+    			for ( int i = 0; i < arButtons.size(); i++ )
+    			{
+    				RubyValue valButton = arButtons.get(i);
+    				if ( valButton != null && valButton instanceof RubyString )
+    				{
+    					m_vecButtons.addElement(valButton.toStr());
+    					m_vecIDs.addElement(valButton.toStr());
+    				}else if ( valButton != null && valButton instanceof RubyHash )
+    				{
+    					String strLabel = getHashStringValue((RubyHash)valButton, titleID );
+    					if ( strLabel.length() > 0 )
+    					{
+    						m_vecButtons.addElement(strLabel);
+    						String strID = getHashStringValue((RubyHash)valButton, buttonidID );
+    						if ( strID.length() > 0 )
+    							m_vecIDs.addElement(strID);
+    						else
+    							m_vecIDs.addElement(strLabel);
+    					}
+    				}
+    			}
+    		}
+    		
+    		RubyValue valIcon = hash.get(iconID.toSymbol());
+    		if ( valIcon instanceof RubySymbol )
+    		{
+    			if ( valIcon == alertTypeID.toSymbol() )
+    				m_nType = atAlert;
+    			else if( valIcon == questionTypeID.toSymbol() )
+    				m_nType = atQuestion;
+    			else if( valIcon == infoTypeID.toSymbol() )
+    				m_nType = atInfo;
+    			
+    		}else
+    		{
+    			if (m_vecButtons.size() > 0 )
+    				m_nType = atQuestion;
+    			else
+    				m_nType = atInfo;
+    		}
+    	}
+    	
+        public void run() {    	
+        	Application.getApplication().requestForeground();
+
+        	switch( m_nType )
+        	{
+        	case atAlert:
+        		Dialog.alert(m_strMessage);
+        		break;
+        	case atQuestion:
+        		Object[] btns = new Object[m_vecButtons.size()];
+        		m_vecButtons.copyInto(btns);
+            	int nRes = Dialog.ask(m_strMessage,btns,0);
+            	
+            	try
+            	{
+	            	RhodesApp.getInstance().callPopupCallback(m_strCallback, (String)m_vecIDs.elementAt(nRes), 
+	            			(String)m_vecButtons.elementAt(nRes));
+            	}catch(Exception exc)
+            	{
+            		LOG.ERROR("show_popup callback failed.", exc);
+            	}
+        		break;
+        	case atInfo:
+            	Dialog.inform(m_strMessage);
+        		break;
+        		
+        	}
+        }
+    	
+    }
+    
+    public static void vibrate(final String duration) 
+    {
+    	Application.getApplication().invokeLater(new Runnable() {
+            public void run() {    	
+		    	int dt = 2500;
+		    	try {
+		    		dt = Integer.parseInt(duration);
+		    	} catch (NumberFormatException e) {    		
+		    	}
+		    	
+		    	if (dt > 25500) dt = 25500;
+		    	
+		    	if (dt > 0) {
+		    		net.rim.device.api.system.Alert.startVibrate(dt);
+		    	}
+            }
+    	});
+    }
+	
+    private static final String[][] filetypes = { {"mp3", "audio/mpeg"}, {"wav","audio/x-wav"} };
+    private static String getTypeFromExt(String file_name) {
+    	int pt = file_name.lastIndexOf('.');
+    	if (pt<0) {
+    		return filetypes[0][1];
+    	}
+    	String ext = file_name.substring(pt+1);
+    	for (int cnt = filetypes.length - 1; cnt >= 0; --cnt) {
+    		if(filetypes[cnt][0].equals(ext)) {
+    			return filetypes[cnt][1];
+    		}
+    	}
+    	return null;
+    }
+	
+    public static void play_file(final String file_name, final String media_type) 
+    {
+    	Application.getApplication().invokeLater(new Runnable() 
+    	{
+            public void run() {            	
+            	String type = media_type == null ? getTypeFromExt(file_name) : media_type;
+            	if (type != null) {
+            		LOG.INFO("File type: " + type);
+            	} else {
+            		LOG.ERROR("Error - can't play unknown file type");
+            		return;
+            	}
+            	
+            	String types[] = 
+            		javax.microedition.media.Manager.getSupportedContentTypes(null);
+            	for (int cnt = types.length - 1; cnt >= 0; --cnt) {
+            		if (type.equals(types[cnt])) {
+            			LOG.INFO( "Playing file " + file_name + " of type: " + types[cnt]);
+            			
+            			SimpleFile file = null;
+            			try {
+            				//retrieve the file
+            				Class clazz = Class.forName("rhomobile.RhodesApplication");
+            				file = RhoClassFactory.createFile();
+            				String strClassName = file_name;
+            				if ( !strClassName.startsWith("/apps") )
+            					strClassName = "/apps" + file_name;
+            				
+            				InputStream is = file.getResourceAsStream(clazz.getClass(), strClassName);
+            				//create an instance of the player from the InputStream
+            				Player player = javax.microedition.media.Manager.createPlayer(is,type);
+            				player.realize();
+            				player.prefetch();
+            				//start the player
+            				player.start();
+            	        } catch (Exception ex) { 
+            	        	LOG.ERROR("Error playing " + file_name + " :" + ex.getMessage());
+                        } finally {
+                			try{
+                				if ( file != null )
+                					file.close();
+                			}catch(Exception exc){}         	
+                        }
+            			return;
+            		}
+            	}
+            	
+            	LOG.ERROR("Error - media type " + type + " isn't supported.");
+            }
+    	});
+    }
+	
+	public static void initMethods(RubyClass klass) {
+		klass.getSingletonClass().defineMethod("show_popup", new RubyOneArgMethod() 
+		{
+			protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) 
+			{
+				try {
+					if ( arg0 instanceof RubyString )
+					{
+						String message = arg0.toString();
+						Alert.showPopup(message);
+					}else if ( arg0 instanceof RubyHash)
+					{
+					    	PopupHandler handler = new PopupHandler((RubyHash)arg0);
+					    	Application.getApplication().invokeLater(handler);
+					}
+					else
+						throw new RubyException(RubyRuntime.ArgumentErrorClass, "in Alert.show_popup: wrong argument type.Should be String or Hash");
+					
+					return RubyConstant.QNIL;
+				} catch(Exception e) {
+					LOG.ERROR("show_popup failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+					
+			}
+		});
+		klass.getSingletonClass().defineMethod("vibrate", new RubyVarArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) 
+			{
+				if ( args != null && args.size() > 1 )
+					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
+							"in Alert.vibrate: wrong number of arguments ( " + args.size() + " for " + 1 + " )");			
+				
+				try {
+					String duration = "2500";
+					if ((args != null) && (args.size() > 0))
+						duration = args.get(0).toString();
+					Alert.vibrate(duration);
+					
+					return RubyConstant.QNIL;
+				} catch(Exception e) {
+					LOG.ERROR("vibrate failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
+		klass.getSingletonClass().defineMethod("play_file", new RubyVarArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) 
+			{
+				if ( args.size() < 1 || args.size() > 2 )
+					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
+							"in Alert.play_file: wrong number of arguments ( " + args.size() + " for " + 2 + " )");			
+				
+				try {
+					String file_name = args.get(0).toString();
+					String media_type = null;
+					if ((args.size() > 1) && (args.get(1) != RubyConstant.QNIL))
+						media_type = args.get(1).toString();
+					Alert.play_file(file_name,media_type);
+					
+					return RubyConstant.QNIL;
+				} catch(Exception e) {
+					LOG.ERROR("play_file failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
+	}
+	
+}