rhodes 2.2.4.beta.1 → 2.2.5.beta.1

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

@@ -26,6 +26,7 @@ import java.util.Vector;
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
+import com.rhomobile.rhodes.nativeview.RhoNativeViewManager;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 import android.content.Context;
@@ -41,12 +42,15 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.webkit.WebView;
 import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public class SimpleMainView implements MainView {
 
+	private final static String TAG = "SimpleMainView";	
+	
 	private static final int WRAP_CONTENT = ViewGroup.LayoutParams.WRAP_CONTENT;
 	private static final int FILL_PARENT = ViewGroup.LayoutParams.FILL_PARENT;
 	
@@ -56,6 +60,27 @@ public class SimpleMainView implements MainView {
 		}
 	};
 	
+	public class MyView extends LinearLayout {
+		public MyView(Context ctx) {
+			super(ctx);
+		}
+		
+		protected void onSizeChanged (int w, int h, int oldw, int oldh) {
+			super.onSizeChanged(w, h, oldw, oldh);
+			StringBuilder msg = new StringBuilder();
+			msg.append(" Main Window :: onSizeChanged() old [ ");
+			msg.append(w);
+			msg.append(" x ");
+			msg.append(h);
+			msg.append(" ]  new [ ");
+			msg.append(oldw);
+			msg.append(" x ");
+			msg.append(oldh);
+			msg.append(" ]");
+			RhodesService.platformLog("SimpleMainView.View", msg.toString());
+		}
+	}
+	
 	private class ActionForward implements View.OnClickListener {
 		public void onClick(View v) {
 			forward(0);
@@ -82,6 +107,7 @@ public class SimpleMainView implements MainView {
 
 	private class ActionExit implements View.OnClickListener {
 		public void onClick(View v) {
+			restoreWebView();
 			RhodesService.exit();
 		}
 	};
@@ -104,7 +130,10 @@ public class SimpleMainView implements MainView {
 	
 	private LinearLayout view;
 	private WebView webView;
+	private RhoNativeViewManager.RhoNativeView mNativeView = null;
+	private View mNativeViewView = null;
 	private LinearLayout navBar = null;
+	private LinearLayout toolBar = null;
 	
 	public View getView() {
 		return view;
@@ -114,8 +143,148 @@ public class SimpleMainView implements MainView {
 		return webView;
 	}
 
+	public void setNativeView(RhoNativeViewManager.RhoNativeView nview) {
+		restoreWebView();
+		mNativeView = nview;
+		mNativeViewView = mNativeView.getView();
+		if (mNativeViewView != null) {
+			view.removeView(webView);
+			//int view_index = 0;
+			//if (navBar != null) {
+				//view_index = 1;
+			//}
+			if (navBar != null) {
+				view.removeView(navBar);
+			}
+			if (toolBar != null) {
+				view.removeView(toolBar);
+			}
+			int index = 0;
+			if (navBar != null) {
+				view.addView(navBar, index);
+				index++;
+			}
+			view.addView( mNativeViewView, index, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+			index++;
+			if (toolBar != null) {
+				view.addView(toolBar, index);
+			}
+			
+			//view.bringChildToFront(mNativeViewView);
+			//view.requestLayout();
+		}
+		else {
+			mNativeView = null;
+			mNativeViewView = null;
+		}
+	}
+	
+	public void restoreWebView() {
+		if (mNativeView != null) {
+			view.removeView(mNativeViewView);
+			mNativeViewView = null;
+			//int view_index = 0;
+			//if (navBar != null) {
+				//view_index = 1;
+			//}
+			
+			if (navBar != null) {
+				view.removeView(navBar);
+			}
+			if (toolBar != null) {
+				view.removeView(toolBar);
+			}
+			
+			int index = 0;
+			if (navBar != null) {
+				view.addView(navBar, index);
+				index++;
+			}
+			view.addView( webView, index, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+			index++;
+			if (toolBar != null) {
+				view.addView(toolBar, index);
+			}
+
+			//view.bringChildToFront(webView);
+
+			mNativeView.destroyView();
+			mNativeView = null;
+			//view.requestLayout();
+		}
+	}
+	
+
+    private String processForNativeView(String _url) {
+    	StringBuilder s = new StringBuilder("processForNativeView : [");
+    	s.append(_url);
+    	s.append("]");
+    	RhodesService.platformLog(TAG, s.toString());
+    	
+    	
+    	
+    	
+    	String url = _url;
+    	String callback_prefix = "call_stay_native";
+
+    	// find protocol:navto pairs
+
+    	int last = -1;
+    	int cur = url.indexOf(":", last+1);
+    	while (cur > 0) {
+    		String protocol = url.substring(last+1, cur);
+    		String navto = url.substring(cur+1, url.length());
+    		
+    		if (callback_prefix.equals(protocol)) {
+    			// navigate but still in native view
+    			String cleared_url = url.substring(callback_prefix.length()+1, url.length());
+    			return cleared_url;
+    		}
+    		// check protocol for nativeView
+    		RhoNativeViewManager.RhoNativeView nvf = RhoNativeViewManager.getNativeViewByteType(protocol);
+    		if (nvf != null) {
+    			// we should switch to NativeView
+    			//restoreWebView();
+    			if (mNativeView != null) {
+    				if ( !protocol.equals(mNativeView.getViewType()) ) {
+        				setNativeView(nvf);
+    				}
+    			}
+    			else {
+    				setNativeView(nvf);
+    			}
+    			if (mNativeView != null) {
+	    			mNativeView.navigate(navto);
+	   				return "";
+    			}
+    		}
+    		last = cur;
+    		int c1 = url.indexOf(":", last+1);
+    		int c2 = url.indexOf("/", last+1);
+    		if ((c1 < c2)) {
+    			if (c1 <= 0) {
+    				cur = c2;
+    			}
+    			else {
+    				cur = c1;
+    			}
+    		}
+    		else {
+    			if (c2 <= 0) {
+    				cur = c1;
+    			}
+    			else {
+    				cur = c2;
+    			}
+    		}
+    	}
+    	restoreWebView();
+    	return url;
+    }
+	
 	
 	public WebView detachWebView() {
+		restoreWebView();
 		WebView v = null;
 		if (webView != null) {
 			view.removeView(webView);
@@ -219,7 +388,7 @@ public class SimpleMainView implements MainView {
 		RhodesService r = RhodesService.getInstance();
 		Context ctx = r.getContext();
 		
-		view = new LinearLayout(ctx);
+		view = new MyView(ctx);
 		view.setOrientation(LinearLayout.VERTICAL);
 		view.setGravity(Gravity.BOTTOM);
 		view.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT));
@@ -238,6 +407,8 @@ public class SimpleMainView implements MainView {
 		bottom.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0));
 		view.addView(bottom);
 		
+		toolBar = bottom;
+		
 		Vector<Object> buttons = null;
 		if (params != null) {
 			if (params instanceof Vector<?>) {
@@ -331,19 +502,29 @@ public class SimpleMainView implements MainView {
 	}
 	
 	public void goBack() {
+		restoreWebView();
 		webView.goBack();
 	}
 
 	public void forward(int index) {
+		restoreWebView();
 		webView.goForward();
 	}
 
 	public void navigate(String url, int index) {
-		webView.loadUrl(url);
+		String cleared_url = processForNativeView(url);
+		if (cleared_url.length() > 0) {
+			webView.loadUrl(url);
+		}
 	}
 	
 	public void reload(int index) {
-		webView.reload();
+		if (mNativeViewView != null) {
+			mNativeViewView.invalidate();
+		}
+		else {
+			webView.reload();
+		}
 	}
 	
 	public String currentLocation(int index) {
@@ -359,6 +540,7 @@ public class SimpleMainView implements MainView {
 	}
 	
 	public void loadData(String data, int index) {
+		restoreWebView();
 		webView.loadData(data, "text/html", "utf-8");
 	}
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java

@@ -5,10 +5,63 @@ import android.view.View;
 import android.webkit.WebView;
 import com.rhomobile.rhodes.RhodesService;
 
-class RhoNativeViewManager {
+public class RhoNativeViewManager {
 
+	public interface RhoNativeView {
+		View getView();
+		void navigate(String url);
+		void destroyView();
+		String getViewType();
+	}
+	
+	private static class RhoNativeViewImpl implements RhoNativeView {
+		
+		RhoNativeViewImpl(String viewType, long factory_h, long view_h) {
+			mViewType = viewType;
+			mFactoryHandle = factory_h;
+			mViewHandle = view_h;
+		}
+		
+		public View getView() {
+			return getViewByHandle(mViewHandle);
+		}
+		
+		public void navigate(String url) {
+			navigateByHandle(mViewHandle, url);
+		}
+		public void destroyView() {
+			destroyByHandle(mFactoryHandle, mViewHandle);
+		}
+		public String getViewType() {
+			return mViewType;
+		}
+		private String mViewType;
+		private long mFactoryHandle;
+		private long mViewHandle;
+	}
+	
 	public static WebView getWebViewObject(int tab_index) {
 		return RhodesService.getInstance().getMainView().getWebView(tab_index);
 	}
 
+	public static RhoNativeView getNativeViewByteType(String typename) {
+		long factory_h = getFactoryHandleByViewType(typename);
+		if (factory_h == 0) {
+			return null;
+		}
+		long view_h = getViewHandleByFactoryHandle(factory_h);
+		if (view_h == 0) {
+			return null;
+		}
+		RhoNativeViewImpl nv = new RhoNativeViewImpl(typename, factory_h, view_h);
+		return nv;
+	}
+	
+	private native static View getViewByHandle(long handle);
+	private native static void navigateByHandle(long handle, String url);
+	private native static long getFactoryHandleByViewType(String viewtype);
+	private native static long getViewHandleByFactoryHandle(long factory_h);
+	private native static void destroyByHandle(long factory_h, long view_h);
+	
+	
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java

@@ -20,43 +20,136 @@
  */
 package com.rhomobile.rhodes.phonebook;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+
+import com.rhomobile.rhodes.Logger;
 
 public class Contact {
 	
+	private static final String TAG = "Contact";	
+	private static final boolean logging_enable = false;
+	
 	private String id = null;
-	private Map<String, ContactField> fields = new HashMap<String, ContactField>();
-	private Iterator<ContactField> iter = null;
+	
+	//private Map<String, ContactField> fields = new HashMap<String, ContactField>();
+	//private Iterator<ContactField> iter = null;
+	private ContactAccessor mAccessor = null;
+
+	private boolean mIsNameFilled = false;
+	private boolean mIsPhoneFilled = false;
+	private boolean mIsEmailsFilled = false;
+	private boolean mIsCompanyFilled = false;
+	
+	private String mFields[] = new String[Phonebook.PB_FIELDS_COUNT];
+	
 	
 	public Contact() {
-		moveToBegin();
+		//moveToBegin();
+	}
+	
+	public void setAccessor(ContactAccessor accessor) {
+		mAccessor = accessor;		
+	}
+	
+	public void makeAllFilled() {
+		mIsNameFilled = true;
+		mIsPhoneFilled = true;
+		mIsEmailsFilled = true;
+		mIsCompanyFilled = true;
+	}
+	
+	private boolean isFullFilled() {
+		return (mIsNameFilled && mIsPhoneFilled && mIsEmailsFilled && mIsCompanyFilled);
+	}
+
+	
+	public void setFieldInner(int key, String value) {
+		if ((key >= 0) && (key < Phonebook.PB_FIELDS_COUNT)) {
+			mFields[key] = value;
+		}
+		else {
+			Logger.E(TAG, "Invalid field index !");
+		}
 	}
 	
-	public void setField(String key, String value)
+	
+	private void prepareField(int key) {
+		if ((mAccessor != null) && (mAccessor instanceof ContactAccessorNew)) {
+			
+			if ((!mIsNameFilled) && ((key == Phonebook.PB_I_FIRST_NAME) || (key == Phonebook.PB_I_LAST_NAME))) {
+				((ContactAccessorNew)mAccessor).fillName(id, this);
+				mIsNameFilled = true;
+			}
+			else {
+				if ((!mIsPhoneFilled) && ((key == Phonebook.PB_I_MOBILE_NUMBER) || (key == Phonebook.PB_I_HOME_NUMBER) || (key == Phonebook.PB_I_BUSINESS_NUMBER))) {
+					((ContactAccessorNew)mAccessor).fillPhones(id, this);
+					mIsPhoneFilled = true;
+				}
+				else {
+					if ((!mIsEmailsFilled) && (key == Phonebook.PB_I_EMAIL_ADDRESS)) {
+						((ContactAccessorNew)mAccessor).fillEmails(id, this);
+						mIsEmailsFilled = true;
+					}
+					else {
+						if ((mIsCompanyFilled) && (key == Phonebook.PB_I_COMPANY_NAME)) {
+							((ContactAccessorNew)mAccessor).fillCompany(id, this);
+							mIsCompanyFilled = true;
+						}
+					}
+				}
+			}	
+		}
+	}
+	
+	public void setField(int key, String value)
 	{
-		fields.put(key, new ContactField(key, value));
+		if ((key >= 0) && (key < Phonebook.PB_FIELDS_COUNT)) {
+			prepareField(key);
+			setFieldInner(key, value);
+		}
+		else {
+			Logger.E(TAG, "Invalid field index !");
+		}
 	}
 	
-	public String getField(String key)
+	public String getField(int key)
 	{
-		if ( fields.containsKey(key) )
-			return fields.get(key).getValue();
-		
+		if ((key >= 0) && (key < Phonebook.PB_FIELDS_COUNT)) {
+			prepareField(key);
+			return mFields[key];
+		}
 		return null;
 	}
 	
 	public void setId(String v) {
 		id = v;
-		setField(Phonebook.PB_ID, "{" + v + "}");
+		setFieldInner(Phonebook.PB_I_ID, convertPlatformIDtoRhodeID(v));
+	}
+	
+	public static String convertPlatformIDtoRhodeID(String id) {
+		return "{" + id + "}";
+	}
+
+	public static String convertRhodeIDtoPlatformID(String id) {
+		return id.substring(1, id.length()-1);
 	}
 	
 	public String id() {
 		return id;
 	}
+
+	private void fillAll() {
+		if (!isFullFilled()) {
+			int i;
+			for (i = 0; i < Phonebook.PB_FIELDS_COUNT; i++) {
+				prepareField(i);
+			}
+		}
+	}
 	
+
+	/*
 	public void moveToBegin() {
+		fillAll();
 		iter = fields.values().iterator();
 	}
 	
@@ -67,5 +160,5 @@ public class Contact {
 	public Object next() {
 		return iter.next();
 	}
-	
+	*/
 }