rhodes 2.0.0.beta3 → 2.0.0.beta4

data/platform/android/Rhodes/jni/src/navbar.cpp

@@ -10,7 +10,7 @@ RHO_GLOBAL void create_navbar(rho_param *p)
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_NAVBAR);
     if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "create", "(Ljava/util/Vector;)V");
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "create", "(Ljava/util/Map;)V");
     if (!mid) return;
 
     jobject paramsObj = RhoValueConverter(env).createObject(p);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java

@@ -1,5 +1,6 @@
 package com.rhomobile.rhodes;
 
+import java.util.Map;
 import java.util.Vector;
 
 public class NavBar {
@@ -9,21 +10,37 @@ public class NavBar {
 	private static class CreateTask implements Runnable {
 		
 		private String title;
-		private Vector<Object> left;
-		private Vector<Object> right;
+		private Map<Object, Object> left;
+		private Map<Object, Object> right;
 		
-		public CreateTask(Vector<Object> p) {
-			// TODO: implement
+		@SuppressWarnings("unchecked")
+		public CreateTask(Map<Object, Object> p) {
+			Object titleObj = p.get("title");
+			if (titleObj == null || !(titleObj instanceof String))
+				throw new IllegalArgumentException("'title' should be String");
+			title = (String)titleObj;
+			
+			Object leftObj = p.get("left");
+			if (leftObj == null || !(leftObj instanceof Map<?,?>))
+				throw new IllegalArgumentException("'left' - expected Hash");
+			left = (Map<Object,Object>)leftObj;
+			
+			Object rightObj = p.get("right");
+			if (rightObj != null && !(rightObj instanceof Map<?,?>))
+				throw new IllegalArgumentException("'right' - expected Hash");
+			right = (Map<Object,Object>)rightObj;
 		}
 		
 		public void run() {
-			// TODO: implement
+			Rhodes r = RhodesInstance.getInstance();
+			r.getMainView().setNavBar(title, left, right);
 		}
 	};
 	
 	private static class RemoveTask implements Runnable {
 		public void run() {
-			// TODO: implement
+			Rhodes r = RhodesInstance.getInstance();
+			r.getMainView().removeNavBar();
 		}
 	};
 	
@@ -31,7 +48,7 @@ public class NavBar {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 	
-	public static void create(Vector<Object> params) {
+	public static void create(Map<Object, Object> params) {
 		try {
 			Rhodes.performOnUiThread(new CreateTask(params), false);
 		}

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

@@ -20,6 +20,8 @@
  */
 package com.rhomobile.rhodes.mainview;
 
+import java.util.Map;
+
 import android.view.View;
 
 public interface MainView {
@@ -41,4 +43,7 @@ public interface MainView {
 	public int activeTab();
 	
 	public void loadData(String data, int index);
+	
+	public void setNavBar(String title, Map<Object,Object> left, Map<Object,Object> right);
+	public void removeNavBar();
 }

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

@@ -39,6 +39,7 @@ import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 public class SimpleMainView implements MainView {
 
@@ -108,11 +109,96 @@ public class SimpleMainView implements MainView {
 	
 	private LinearLayout view;
 	private WebView webView;
+	private LinearLayout navBar = null;
 	
 	public View getView() {
 		return view;
 	}
 	
+	private View createButton(Map<Object,Object> hash) {
+		Rhodes r = RhodesInstance.getInstance();
+		
+		Object actionObj = hash.get("action");
+		if (actionObj == null || !(actionObj instanceof String))
+			throw new IllegalArgumentException("'action' should be String");
+		
+		String action = (String)actionObj;
+		if (action.length() == 0)
+			throw new IllegalArgumentException("'action' should not be empty");
+		
+		Drawable icon = null;
+		String label = null;
+		View.OnClickListener onClick = null;
+		
+		if (action.equalsIgnoreCase("back")) {
+			icon = r.getResources().getDrawable(AndroidR.drawable.back);
+			onClick = new ActionBack();
+		}
+		else if (action.equalsIgnoreCase("forward")) {
+			icon = r.getResources().getDrawable(AndroidR.drawable.next);
+			onClick = new ActionForward();
+		}
+		else if (action.equalsIgnoreCase("home")) {
+			icon = r.getResources().getDrawable(AndroidR.drawable.home);
+			onClick = new ActionHome();
+		}
+		else if (action.equalsIgnoreCase("options")) {
+			icon = r.getResources().getDrawable(AndroidR.drawable.options);
+			onClick = new ActionOptions();
+		}
+		else if (action.equalsIgnoreCase("refresh")) {
+			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"))
+			return null;
+		
+		Object iconObj = hash.get("icon");
+		if (iconObj != null) {
+			if (!(iconObj instanceof String))
+				throw new IllegalArgumentException("'icon' should be String");
+			String rootPath = r.getRootPath() + "/apps/";
+			String iconPath = rootPath + (String)iconObj;
+			Bitmap bitmap = BitmapFactory.decodeFile(iconPath);
+			if (bitmap == null)
+				throw new IllegalArgumentException("Can't find icon: " + iconPath);
+			icon = new BitmapDrawable(bitmap);
+		}
+		
+		if (icon == null) {
+			Object labelObj = hash.get("label");
+			if (labelObj == null || !(labelObj instanceof String))
+				throw new IllegalArgumentException("'label' should be String");
+			label = (String)labelObj;
+		}
+		
+		if (icon == null && label == null)
+			throw new IllegalArgumentException("One of 'icon' or 'label' should be specified");
+		
+		if (onClick == null)
+			onClick = new ActionCustom(action);
+		
+		View button;
+		if (icon != null) {
+			ImageButton btn = new ImageButton(r);
+			btn.setImageDrawable(icon);
+			button = btn;
+		}
+		else {
+			Button btn = new Button(r);
+			btn.setText(label);
+			button = btn;
+		}
+		
+		button.setOnClickListener(onClick);
+		
+		return button;
+	}
+	
 	@SuppressWarnings("unchecked")
 	private void init(Vector<Object> params) {
 		Rhodes r = RhodesInstance.getInstance();
@@ -133,8 +219,6 @@ public class SimpleMainView implements MainView {
 		view.addView(bottom);
 		
 		if (params != null) {
-			String rootPath = r.getRootPath() + "/apps/";
-			
 			LinearLayout group = null;
 			// First group should have gravity LEFT
 			int gravity = Gravity.LEFT;
@@ -145,88 +229,13 @@ public class SimpleMainView implements MainView {
 				
 				Map<Object, Object> hash = (Map<Object, Object>)param;
 				
-				Object actionObj = hash.get("action");
-				if (actionObj == null || !(actionObj instanceof String))
-					throw new IllegalArgumentException("'action' should be String");
-				
-				String action = (String)actionObj;
-				if (action.length() == 0)
-					throw new IllegalArgumentException("'action' should not be empty");
-				
-				Drawable icon = null;
-				String label = null;
-				
-				View.OnClickListener onClick = null;
-				if (action.equalsIgnoreCase("back")) {
-					icon = r.getResources().getDrawable(AndroidR.drawable.back);
-					onClick = new ActionBack();
-				}
-				else if (action.equalsIgnoreCase("forward")) {
-					icon = r.getResources().getDrawable(AndroidR.drawable.next);
-					onClick = new ActionForward();
-				}
-				else if (action.equalsIgnoreCase("home")) {
-					icon = r.getResources().getDrawable(AndroidR.drawable.home);
-					onClick = new ActionHome();
-				}
-				else if (action.equalsIgnoreCase("options")) {
-					icon = r.getResources().getDrawable(AndroidR.drawable.options);
-					onClick = new ActionOptions();
-				}
-				else if (action.equalsIgnoreCase("refresh")) {
-					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")) {
+				View button = createButton(hash);
+				if (button == null) {
 					group = null;
 					gravity = Gravity.CENTER;
 					continue;
 				}
 				
-				Object iconObj = hash.get("icon");
-				if (iconObj != null) {
-					if (!(iconObj instanceof String))
-						throw new IllegalArgumentException("'icon' should be String");
-					String iconPath = rootPath + (String)iconObj;
-					Bitmap bitmap = BitmapFactory.decodeFile(iconPath);
-					if (bitmap == null)
-						throw new IllegalArgumentException("Can't find icon: " + iconPath);
-					icon = new BitmapDrawable(bitmap);
-				}
-				
-				if (icon == null) {
-					Object labelObj = hash.get("label");
-					if (labelObj == null || !(labelObj instanceof String))
-						throw new IllegalArgumentException("'label' should be String");
-					label = (String)labelObj;
-				}
-				
-				if (icon == null && label == null)
-					throw new IllegalArgumentException("One of 'icon' or 'label' should be specified");
-				
-				View button = null;
-				if (icon != null) {
-					ImageButton btn = new ImageButton(r);
-					btn.setImageDrawable(icon);
-					button = btn;
-				}
-				else {
-					Button btn = new Button(r);
-					btn.setText(label);
-					button = btn;
-				}
-				
-				if (button == null)
-					continue;
-				
-				if (onClick == null)
-					onClick = new ActionCustom(action);
-				
-				button.setOnClickListener(onClick);
 				button.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
 				if (group == null) {
 					group = new LinearLayout(r);
@@ -288,4 +297,42 @@ public class SimpleMainView implements MainView {
 		webView.loadData(data, "text/html", "utf-8");
 	}
 
+	public void setNavBar(String title, Map<Object,Object> left, Map<Object,Object> right) {
+		removeNavBar();
+		
+		Rhodes r = RhodesInstance.getInstance();
+		
+		LinearLayout top = new LinearLayout(r);
+		top.setOrientation(LinearLayout.HORIZONTAL);
+		top.setBackgroundColor(Color.GRAY);
+		top.setGravity(Gravity.CENTER);
+		top.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0));
+		
+		View leftButton = createButton(left);
+		leftButton.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1));
+		top.addView(leftButton);
+		
+		TextView label = new TextView(r);
+		label.setText(title);
+		label.setGravity(Gravity.CENTER);
+		label.setTextSize((float)30.0);
+		label.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 2));
+		top.addView(label);
+		
+		if (right != null) {
+			View rightButton = createButton(right);
+			rightButton.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1));
+			top.addView(rightButton);
+		}
+		
+		navBar = top;
+		view.addView(navBar, 0);
+	}
+	
+	public void removeNavBar() {
+		if (navBar == null)
+			return;
+		view.removeViewAt(0);
+		navBar = null;
+	}
 }

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

@@ -218,5 +218,13 @@ public class TabbedMainView implements MainView {
 	public void loadData(String data, int index) {
 		getView(index).loadData(data, 0);
 	}
+	
+	public void setNavBar(String title, Map<Object,Object> left, Map<Object,Object> right) {
+		getView(activeTab()).setNavBar(title, left, right);
+	}
+	
+	public void removeNavBar() {
+		getView(activeTab()).removeNavBar();
+	}
 
 }

data/platform/shared/sync/SyncSource.cpp

@@ -253,6 +253,20 @@ void CSyncSource::doSyncClientChanges()
     m_arBlobAttrs.removeAllElements();
 }
 
+static void escapeDoubleQuotes(String& str)
+{
+    const char* szQuote = strchr(str.c_str(), '\"');
+    while(szQuote)
+    {
+        int nPos = szQuote - str.c_str();
+        str.insert(nPos, 1, '\\');
+        if ( nPos+2 < str.length() )
+            szQuote = strchr(str.c_str()+nPos+2, '\"');
+        else
+            szQuote = 0;
+    }
+}
+
 //{"source_name":"SampleAdapter","client_id":1,"create":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
 //{"source_name":"SampleAdapter","client_id":1,"update":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
 //{"source_name":"SampleAdapter","client_id":1,"delete":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
@@ -315,6 +329,7 @@ void CSyncSource::makePushBody_Ver3(String& strBody, const String& strUpdateType
             if ( bFirst )
                 strBody += ":{";
 
+            escapeDoubleQuotes(value);
             strBody += "\"" + strAttrib + "\":\"" + value + "\"";
             bFirst = false;
         }

data/rhobuild.yml

@@ -1,19 +1,4 @@
 --- 
-env: 
-  app: /Users/lars/Dev/code/rhomobile/gunz-rhodes2
-  paths: 
-    android-ndk: /Users/lars/Dev/android-ndk-r3
-    java: /Library/Java/Home/bin
-    android: /Users/lars/Dev/android-sdk-mac_86
-    4.6: 
-      jde: 
-      sim: 9000
-      mds: 
-    cabwiz: 
-    4.2: 
-      jde: 
-      sim: 8100
-      mds: 
 excludedirs: 
   bb: 
   - public/js/iui
@@ -26,12 +11,27 @@ excludedirs:
   - "**/.*.swn"
   - "**/jquery*.js"
   - "**/.DS_Store"
+env: 
+  app: /Users/lars/Dev/code/rhomobile/store
+  paths: 
+    android-ndk: /Users/lars/Dev/android-ndk-r3
+    android: /Users/lars/Dev/android-sdk-mac_86
+    java: /Library/Java/Home/bin
+    4.6: 
+      jde: 
+      sim: 9000
+      mds: 
+    4.2: 
+      jde: 
+      sim: 8100
+      mds: 
+    cabwiz: 
 android: 
 build: 
-  symbianpath: platform/symbian
-  bb: 
   bbsignpwd: somepasswordhere
+  bb: 
+  symbianpath: platform/symbian
   bbpath: platform/bb
-  wmpath: platform/wm
   androidpath: platform/android
+  wmpath: platform/wm
   iphonepath: platform/iphone

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.0.0.beta3'
+  s.version = '2.0.0.beta4'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: -1848230037
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta3
-  version: 2.0.0.beta3
+  - beta4
+  version: 2.0.0.beta4
 platform: ruby
 authors: 
 - Rhomobile
@@ -23,11 +22,9 @@ dependencies:
   name: templater
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -39,11 +36,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -55,11 +50,9 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 3
@@ -71,11 +64,9 @@ dependencies:
   name: rdoc
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 2
         - 4
@@ -87,11 +78,9 @@ dependencies:
   name: diff-lcs
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 1
@@ -5409,27 +5398,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rhodes
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: The Rhodes framework is the easiest way to develop NATIVE apps with full device capabilities (GPS, PIM, camera, etc.) for any smartphone.