rhodes 3.3.3.beta.4 → 3.3.3

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

@@ -26,27 +26,22 @@
 
 package com.rhomobile.rhodes.mainview;
 
-import java.lang.reflect.Constructor;
 import java.util.Map;
 import java.util.Vector;
 
 import com.rhomobile.rhodes.AndroidR;
-import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesAppOptions;
-import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.nativeview.IRhoCustomView;
 import com.rhomobile.rhodes.nativeview.RhoNativeViewManager;
-import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
 import com.rhomobile.rhodes.webview.IRhoWebView;
-import com.rhomobile.rhodes.webview.GoogleWebView;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -68,7 +63,7 @@ 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;
+	private static final int FILL_PARENT = ViewGroup.LayoutParams.MATCH_PARENT;
 	
 	private class ActionBack implements View.OnClickListener {
 		public void onClick(View v) {
@@ -76,6 +71,14 @@ public class SimpleMainView implements MainView {
 		}
 	};
 	
+	private void addWebViewToMainView(IRhoWebView webView, int index, LinearLayout.LayoutParams params) {
+		view.addView(webView.getContainerView(), index, params);
+	}
+	
+	private void removeWebViewFromMainView() {
+		view.removeView(webView.getContainerView());
+	}
+	
 	public class MyView extends LinearLayout {
 		public MyView(Context ctx) {
 			super(ctx);
@@ -146,8 +149,7 @@ public class SimpleMainView implements MainView {
 	
 	private LinearLayout view;
 	private IRhoWebView webView;
-	private RhoNativeViewManager.RhoNativeView mNativeView = null;
-	private View mNativeViewView = null;
+	private IRhoCustomView mRhoCustomView = null;
 	private LinearLayout navBar = null;
 	private LinearLayout toolBar = null;
 	
@@ -163,51 +165,40 @@ 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.getView());
-			//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;
-			//}
-			
+    public void setCustomView(IRhoCustomView customView) {
+        restoreWebView();
+        if (customView != null) {
+            removeWebViewFromMainView();
+
+            mRhoCustomView = customView;
+
+            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(customView.getContainerView(), index, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+            index++;
+            if (toolBar != null) {
+                view.addView(toolBar, index);
+            }
+        } else {
+            mRhoCustomView = null;
+        }
+    }
+
+    public void restoreWebView() {
+        if (mRhoCustomView != null) {
+            view.removeView(mRhoCustomView.getContainerView());
+            mRhoCustomView.destroyView();
+            mRhoCustomView = null;
+
 			if (navBar != null) {
 				view.removeView(navBar);
 			}
@@ -220,27 +211,23 @@ public class SimpleMainView implements MainView {
 				view.addView(navBar, index);
 				index++;
 			}
-			view.addView(webView.getView(), index, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+
+			addWebViewToMainView(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();
 		}
-	}
-	
+
+        if (mRhoCustomView != null) {
+            mRhoCustomView.destroyView();
+            mRhoCustomView = null;
+        }
+    }
 
     private String processForNativeView(String _url) {
-    	StringBuilder s = new StringBuilder("processForNativeView : [");
-    	s.append(_url);
-    	s.append("]");
-    	Utils.platformLog(TAG, s.toString());
-    	
+        Logger.T(TAG, "processForNativiewView: " + _url);
+
     	String url = _url;
     	String callback_prefix = "call_stay_native";
 
@@ -258,20 +245,18 @@ public class SimpleMainView implements MainView {
     			return cleared_url;
     		}
     		// check protocol for nativeView
-    		RhoNativeViewManager.RhoNativeView nvf = RhoNativeViewManager.getNativeViewByteType(protocol);
+    		IRhoCustomView nvf = RhoNativeViewManager.getNativeViewByType(protocol);
     		if (nvf != null) {
-    			// we should switch to NativeView
-    			//restoreWebView();
-    			if (mNativeView != null) {
-    				if ( !protocol.equals(mNativeView.getViewType()) ) {
-        				setNativeView(nvf);
+    			if (mRhoCustomView != null) {
+    				if ( !protocol.equals(mRhoCustomView.getViewType()) ) {
+        				setCustomView(nvf);
     				}
     			}
     			else {
-    				setNativeView(nvf);
+    				setCustomView(nvf);
     			}
-    			if (mNativeView != null) {
-	    			mNativeView.navigate(navto);
+    			if (mRhoCustomView != null) {
+	    			mRhoCustomView.navigate(navto);
 	   				return "";
     			}
     		}
@@ -304,7 +289,7 @@ public class SimpleMainView implements MainView {
 		restoreWebView();
 		IRhoWebView v = null;
 		if (webView != null) {
-			view.removeView(webView.getView());
+			removeWebViewFromMainView();
 			v = webView;
 			webView = null;
 		}
@@ -426,7 +411,7 @@ public class SimpleMainView implements MainView {
 	private void setupToolbar(LinearLayout tool_bar, Object params) {
 		Context ctx = RhodesActivity.getContext();
 
-                mCustomBackgroundColorEnable = false;
+        mCustomBackgroundColorEnable = false;
 
 		Vector<Object> buttons = null;
 		if (params != null) {
@@ -525,24 +510,10 @@ public class SimpleMainView implements MainView {
 		view.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT));
 		
 		webView = v;
-		//if (v != null)
-		//	webView = v.detachWebView();
 		if (webView == null) {
-	        if (Capabilities.WEBKIT_BROWSER_ENABLED) {
-	            Logger.D(TAG, "Creating Motorola WebKIT view");
-	            try {
-	                Class<? extends IRhoWebView> viewClass = (Class<? extends IRhoWebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
-	                Constructor<? extends IRhoWebView> viewCtor = viewClass.getConstructor(Context.class, Runnable.class);
-	                webView = viewCtor.newInstance(activity, RhodesApplication.AppState.AppStarted.addObserver("MotorolaStartEngineObserver", true));
-	            } catch (Throwable e) {
-	                Logger.E(TAG, e);
-	                RhodesApplication.stop();
-	            }
-	        } else {
-	            webView = new GoogleWebView(activity);
-	        }
+		    webView = activity.createWebView();
 		}
-		view.addView(webView.getView(), new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+		addWebViewToMainView(webView, 0, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
 		
 		LinearLayout bottom = new LinearLayout(activity);
 		bottom.setOrientation(LinearLayout.HORIZONTAL);
@@ -553,9 +524,6 @@ public class SimpleMainView implements MainView {
 		toolBar = bottom;
 		
 		setupToolbar(toolBar, params);
-		
-		
-		webView.getView().requestFocus();
 	}
 	
 	public SimpleMainView() {
@@ -572,11 +540,12 @@ public class SimpleMainView implements MainView {
 	
 	public void setWebBackgroundColor(int color) {
 		view.setBackgroundColor(color);
+		webView.getContainerView().setBackgroundColor(color);
 		webView.getView().setBackgroundColor(color);
 	}
-	
-	public void back(int index) {
-		restoreWebView();
+
+    public void back(int index) {
+        restoreWebView();
         
         boolean bStartPage = RhodesService.isOnStartPage();
 
@@ -585,12 +554,10 @@ public class SimpleMainView implements MainView {
         }
         else
         {    
-	        RhodesActivity ra = RhodesActivity.getInstance();
-	        if ( ra != null )
-	            ra.moveTaskToBack(true);
+            RhodesActivity.safeGetInstance().moveTaskToBack(true);
         }
-	}
-	
+    }
+
 	public void goBack() 
 	{
 		RhodesService.navigateBack();
@@ -616,22 +583,25 @@ public class SimpleMainView implements MainView {
     public void executeJS(String js, int index) {
         com.rhomobile.rhodes.WebView.executeJs(js, index);
     }
-    
+
 	public void reload(int index) {
-		if (mNativeViewView != null) {
-			mNativeViewView.invalidate();
+		if (mRhoCustomView != null) {
+			mRhoCustomView.getView().invalidate();
 		}
 		else {
 			webView.reload();
 		}
 	}
-	
+
 	public void stopNavigate(int index) {
-	    if (mNativeViewView == null) {
+	    if (mRhoCustomView == null) {
 	        webView.stopLoad();
 	    }
+	    else {
+	        mRhoCustomView.stop();
+	    }
 	}
-	
+
 	public String currentLocation(int index) {
 		return webView.getUrl();
 	}
@@ -639,11 +609,11 @@ public class SimpleMainView implements MainView {
 	public void switchTab(int index) {
 		// Nothing
 	}
-	
+
 	public int activeTab() {
 		return 0;
 	}
-	
+
 	public void loadData(String data, int index) {
 		restoreWebView();
 		webView.loadData(data, "text/html", "utf-8");

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

@@ -28,24 +28,25 @@ package com.rhomobile.rhodes.mainview;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Constructor;
 import java.util.Map;
 
-import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhodesActivity;
-import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
-import com.rhomobile.rhodes.webview.GoogleWebView;
 import com.rhomobile.rhodes.webview.IRhoWebView;
 
 import android.content.Context;
 import android.content.res.AssetManager;
+import android.os.SystemClock;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 public class SplashScreen implements MainView {
+    
+    public interface SplashScreenListener {
+        void onSplashScreenGone(SplashScreen splashScreen);
+        void onSplashScreenNavigateBack();
+    }
 	
 	private static final String TAG = SplashScreen.class.getSimpleName();
 	
@@ -55,8 +56,8 @@ public class SplashScreen implements MainView {
 	private static final String LOADING_PNG = "apps/app/loading.png";
 	private static final String LOADING_PAGE = "apps/app/loading.html";
 	
+	private SplashScreenListener mSplashScreenListener;
 	private FrameLayout mView;
-	
 	private IRhoWebView mWebView;
 	
 	private native void nativeStart();
@@ -64,17 +65,24 @@ public class SplashScreen implements MainView {
 	private native int howLongWaitMs();
 	
 	private boolean mFirstNavigate = true;
+	private long mStartTimeMs = 0;
+	private volatile String mUrlToNavigate = null;
+	private int mNavigateIndex = 0;
+	private Thread mSleepThread;
 	
-    public SplashScreen(RhodesActivity context) {
+    public SplashScreen(Context context, IRhoWebView webView, SplashScreenListener listener) {
+        mSplashScreenListener = listener;
         mView = new FrameLayout(context);
         mView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
 		AssetManager am = context.getResources().getAssets();
-		mWebView = createHtmlView(context, am);
-		mView.addView(mWebView.getView());
-		mFirstNavigate = true;
+		mWebView = loadContent(am, webView);
+		mView.addView(mWebView.getContainerView());
 	}
 
-    private IRhoWebView createHtmlView(RhodesActivity context, AssetManager am) {
+    public synchronized String getUrlToNavigate() { return mUrlToNavigate; }
+    private synchronized void setUrlToNavigate(String url) { mUrlToNavigate = url; }
+
+    private IRhoWebView loadContent(AssetManager am, IRhoWebView view) {
 
         int type = 0;
         final String[][] urls = {{LOADING_ANDROID_PNG, LOADING_PNG}, {LOADING_PAGE}};
@@ -102,46 +110,22 @@ public class SplashScreen implements MainView {
             type++;
         }
 
-        // Now create WebView and load appropriate content there
-        IRhoWebView view = null;//new GoogleWebView(context);
-        if (Capabilities.WEBKIT_BROWSER_ENABLED) {
-            Logger.D(TAG, "Creating Motorola WebKIT view");
-            try {
-                Class<? extends IRhoWebView> viewClass = (Class<? extends IRhoWebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
-                Constructor<? extends IRhoWebView> viewCtor = viewClass.getConstructor(Context.class, Runnable.class);
-                view = viewCtor.newInstance(context, RhodesApplication.AppState.AppStarted.addObserver("MotorolaStartEngineObserver", true));
-            } catch (Throwable e) {
-                Logger.E(TAG, e);
-                RhodesApplication.stop();
-            }
-        } else {
-            Logger.D(TAG, "Creating Google web view");
-            final GoogleWebView googleWebView = new GoogleWebView(context);
-            view = googleWebView;
-            RhodesApplication.runWhen(RhodesApplication.AppState.AppStarted, new RhodesApplication.StateHandler(true) {
-                @Override
-                public void run()
-                {
-                    googleWebView.applyWebSettings();
-                }
-            });
-            switch (type) {
-            case 0:
-              view.loadDataWithBaseURL("file:///android_asset/", "<html><body style=\"margin:0px\"><img src=\""+ fn[type] + "\" height=\"100%\" width=\"100%\" border=\"0\"/></body></html>", "text/html", "utf-8", null);
-              break;
-            case 1:
-              view.loadUrl("file:///android_asset/" + fn[type]);
-              break;
-            default:
-              view.loadData("<html><title>Loading</title><body text='white' bgcolor='black'>Loading...</body></html>", "text/html", "utf-8");
-          }
+        switch (type) {
+        case 0:
+          view.loadDataWithBaseURL("file:///android_asset/", "<html><body style=\"margin:0px\"><img src=\""+ fn[type] + "\" height=\"100%\" width=\"100%\" border=\"0\"/></body></html>", "text/html", "utf-8", null);
+          break;
+        case 1:
+          view.loadUrl("file:///android_asset/" + fn[type]);
+          break;
+        default:
+          view.loadData("<html><title>Loading</title><body text='white' bgcolor='black'>Loading...</body></html>", "text/html", "utf-8");
         }
 
-
         return view;
     }
 	
 	public void start() {
+	    mStartTimeMs = SystemClock.uptimeMillis();
 		nativeStart();
 	}
 	
@@ -163,56 +147,65 @@ public class SplashScreen implements MainView {
 	@Override
 	public void navigate(final String url, final int index) {
 
-		Logger.D(TAG, "navigate: url=" + url);
-		
-		int delay = howLongWaitMs();
-		if (delay < 0) {
-			delay = 0;
-		}
-		
-		Logger.D(TAG, "DELAY for SplashScreen = " + String.valueOf(delay));
-		final SplashScreen curView = this;
-
-        PerformOnUiThread.exec(new Runnable() {
-            private String mUrl = url;
-            private int mIndex = index;
-            public void run() {
-                try {
-                    RhodesActivity activity = RhodesActivity.safeGetInstance();
-                    if (mFirstNavigate) {
-                        mFirstNavigate = false;
-                        activity.switchToSimpleMainView(curView).navigate(mUrl, mIndex);
-                    }
-                    else {
-                        // Recover navigate in case of race conditions
-                        activity.getMainView().navigate(mUrl, mIndex);
-                    }
-                } catch (Throwable e) {
-                    Logger.E(TAG, e);
+        Logger.D(TAG, "navigate: url=" + url);
+
+        long delay = howLongWaitMs();
+        if (delay <= 0) {
+            delay = 0;
+        } else {
+            delay = mStartTimeMs + delay - SystemClock.uptimeMillis();
+            if (delay < 0)
+                delay = 0;
+        }
+
+        Logger.D(TAG, "DELAY for SplashScreen = " + String.valueOf(delay));
+        final SplashScreen curView = this;
+
+        if (getUrlToNavigate() == null) {
+            setUrlToNavigate(url);
+            final long threadDelay = delay;
+            mSleepThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    SystemClock.sleep(threadDelay);
+                    PerformOnUiThread.exec(new Runnable() {
+                        public void run() {
+                            try {
+                                if (mNavigateIndex != 0) {
+                                    throw new IllegalStateException("Non zero tab index(" + mNavigateIndex + ") to navigate from Splash Screen");
+                                }
+                                mSplashScreenListener.onSplashScreenGone(curView);
+                            } catch (Throwable e) {
+                                Logger.E(TAG, e);
+                            }
+                        }
+                    });
                 }
-            }
-        }, delay);
+            });
+            mSleepThread.start();
+        } else {
+            setUrlToNavigate(url);
+        }
+        
 	}
 
     @Override
     public IRhoWebView detachWebView() {
         IRhoWebView v = null;
         if (mWebView != null) {
-            mView.removeView(mWebView.getView());
+            mView.removeView(mWebView.getContainerView());
             v = mWebView;
             mWebView = null;
         }
         return v;
     }
 
-	@Override
-	public void back(int index) 
-	{
-        RhodesActivity ra = RhodesActivity.getInstance();
-        if ( ra != null )
-            ra.moveTaskToBack(true);
-	}
-	
+    @Override
+    public void back(int index) 
+    {
+        mSplashScreenListener.onSplashScreenNavigateBack();
+    }
+
 	@Override
 	public void forward(int index) {
 	}