rhodes 2.3.2 → 2.4.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java

@@ -32,22 +32,51 @@ import android.location.LocationProvider;
 import android.os.Bundle;
 import android.os.Looper;
 
-public class GeoLocationImpl implements LocationListener {
+public class GeoLocationImpl {
 
 	private static final String TAG = "GeoLocationImpl";
-	private static final String PROVIDER = LocationManager.GPS_PROVIDER;
+	
 	private LocationManager locationManager = null;
 	private boolean available = false;
 	private double longitude = 0;
 	private double latitude = 0;
 	private boolean determined = false;
 	
+	private RhoLocationListener mGpsListener = new RhoLocationListener();
+	private RhoLocationListener mNetworkListener = new RhoLocationListener();
+	
+	class RhoLocationListener implements LocationListener {
+		@Override
+		public void onStatusChanged(String provider, int status, Bundle extras) {
+			Logger.T(TAG, "onStatusChanged: provider=" + provider + ", status=" + status);
+			setCurrentGpsLocation(null);
+		}
+		
+		@Override
+		public void onProviderEnabled(String provider) {
+			Logger.T(TAG, "onProviderEnabled: provider=" + provider);
+			setCurrentGpsLocation(null);
+		}
+		
+		@Override
+		public void onProviderDisabled(String provider) {
+			Logger.T(TAG, "onProviderDisabled: provider=" + provider);
+			setCurrentGpsLocation(null);
+		}
+		
+		@Override
+		public void onLocationChanged(Location location) {
+			Logger.T(TAG, "onLocationChanged");
+			setCurrentGpsLocation(location);
+		}
+	};
+	
 	private static int TIMEOUT_STOP = -1;
 	
 	private int timeout = 10*60*1000; // 10 minutes
 	private Thread thCancel = new Thread(new Runnable() {
 		public void run() {
-			Logger.T(TAG, "Cancel thread started");
+			Logger.T(TAG, "\"cancel\" thread started");
 			for (;;) {
 				if (timeout < 0)
 					break;
@@ -56,7 +85,7 @@ public class GeoLocationImpl implements LocationListener {
 					Thread.sleep(timeout);
 				}
 				catch (InterruptedException e) {
-					Logger.T(TAG, "Cancel thread interrupted");
+					Logger.T(TAG, "\"cancel\" thread interrupted");
 					continue;
 				}
 				if (!isKnownPosition()) {
@@ -69,7 +98,7 @@ public class GeoLocationImpl implements LocationListener {
 				}
 				timeout = 2147483647;
 			}
-			Logger.T(TAG, "Cancel thread stopped");
+			Logger.T(TAG, "\"cancel\" thread stopped");
 		}
 	});
 	
@@ -77,23 +106,55 @@ public class GeoLocationImpl implements LocationListener {
 	private native void geoCallbackError();
 	
 	public GeoLocationImpl() {
+		Logger.T(TAG, "GeoLocationImpl instance created");
 		setCurrentGpsLocation(null);
 		thCancel.start();
 	}
 
 	private void setCurrentGpsLocation(Location location) {
-		Logger.T(TAG, "GeoLocationImpl.setCurrentGpsLocation");
+		Logger.T(TAG, "setCurrentGpsLocation: location=" + location);
 		try {
+			// This array MUST be sorted in order "most-priority-first" meaning
+			// that we'll don't ask next provider if previous returned non-null value
+			final String[] providers = {LocationManager.GPS_PROVIDER, LocationManager.NETWORK_PROVIDER};
+			final LocationListener[] listeners = {mGpsListener, mNetworkListener};
+			
 			if (locationManager == null) {
 				Context ctx = RhodesService.getContext();
 				locationManager = (LocationManager)ctx.getSystemService(Context.LOCATION_SERVICE);
-				LocationProvider gpsProvider = locationManager.getProvider(PROVIDER);
-				available = gpsProvider != null && locationManager.isProviderEnabled(PROVIDER);
-				locationManager.requestLocationUpdates(PROVIDER, 0, 0, this, Looper.getMainLooper());
+				for (int i = 0; i < providers.length; ++i) {
+					final String providerName = providers[i];
+					LocationProvider provider = locationManager.getProvider(providerName);
+					if (!available)
+						available = provider != null && locationManager.isProviderEnabled(providerName);
+					locationManager.requestLocationUpdates(providerName, 0, 0, listeners[i], Looper.getMainLooper());
+				}
 			}
 			
-			if (location == null)
-				location = locationManager.getLastKnownLocation(PROVIDER);
+			if (location != null) {
+				// We've received location update
+				Logger.T(TAG, "Received location update from \"" + location.getProvider() + "\" provider");
+				
+				// If we've received fix from GPS, stop updates from Network location manager
+				// as we don't need it anymore
+				if (LocationManager.GPS_PROVIDER.equals(location.getProvider())) {
+					Logger.T(TAG, "Stop \"" + LocationManager.NETWORK_PROVIDER + "\" provider");
+					locationManager.removeUpdates(mNetworkListener);
+				}
+			}
+			else {
+				// Ask providers for last known position and use first non-null value
+				// That's why important place provider names in providers array in order
+				// "most-priority-first"
+				for (int i = 0; i < providers.length; ++i) {
+					final String providerName = providers[i];
+					location = locationManager.getLastKnownLocation(providerName);
+					if (location != null) {
+						Logger.T(TAG, "Use last known location from \"" + location.getProvider() + "\" provider");
+						break;
+					}
+				}
+			}
 			
 			boolean prevDetermined = determined;
 			double prevLat = latitude;
@@ -103,44 +164,48 @@ public class GeoLocationImpl implements LocationListener {
 				longitude = location.getLongitude();
 				latitude = location.getLatitude();
 				determined = true;
-			} else {
+			}
+			else {
 				determined = false;
 			}
 
-			Logger.T(TAG, "gps enabled: " + Boolean.toString(locationManager.isProviderEnabled(PROVIDER)));
-			Logger.T(TAG, "determined: " + Boolean.toString(determined));
-			if (determined) {
-				Logger.T(TAG, "longitude: " + Double.toString(longitude));
-				Logger.T(TAG, "latitude: " + Double.toString(latitude));
-			}
+			dumpStatus(providers);
 			
 			if (determined != prevDetermined || latitude != prevLat || longitude != prevLon) {
+				Logger.T(TAG, "Geo location information changed, notify about that");
 				geoCallback();
 			}
+			
 		} catch (Exception e) {
 			determined = false;
 			Logger.E(TAG, e.getMessage());
 		}
 	}
 	
-	public void onLocationChanged(Location location) {
-		Logger.T(TAG, "onLocationChanged");
-		setCurrentGpsLocation(location);
-	}
-
-	public void onProviderDisabled(String provider) {
-		Logger.T(TAG, "onProviderDisabled");
-		setCurrentGpsLocation(null);
-	}
-
-	public void onProviderEnabled(String provider) {
-		Logger.T(TAG, "onProviderEnabled");
-		setCurrentGpsLocation(null);
-	}
-
-	public void onStatusChanged(String provider, int status, Bundle extras) {
-		Logger.T(TAG, "onStatusChanged");
-		setCurrentGpsLocation(null);
+	private void dumpStatus(final String[] providers) {
+		StringBuffer log = new StringBuffer();
+		log.append("Status of location providers: ");
+		for (int i = 0; i < providers.length; ++i) {
+			if (i > 0)
+				log.append(", ");
+			log.append("\"");
+			log.append(providers[i]);
+			log.append("\" - ");
+			if (locationManager.isProviderEnabled(providers[i]))
+				log.append("enabled");
+			else
+				log.append("disabled");
+		}
+		Logger.T(TAG, log.toString());
+		log = new StringBuffer();
+		log.append("location is");
+		if (!determined)
+			log.append(" not");
+		log.append(" determined");
+		if (determined)
+			log.append(": longitude=" + Double.toString(longitude) +
+					", latitude=" + Double.toString(latitude));
+		Logger.T(TAG, log.toString());
 	}
 	
 	public synchronized void stop() {
@@ -150,7 +215,12 @@ public class GeoLocationImpl implements LocationListener {
 		
 		if (locationManager == null)
 			return;
-		locationManager.removeUpdates(this);
+		
+		Logger.T(TAG, "Stop \"" + LocationManager.NETWORK_PROVIDER + "\" provider");
+		locationManager.removeUpdates(mNetworkListener);
+		Logger.T(TAG, "Stop \"" + LocationManager.GPS_PROVIDER + "\" provider");
+		locationManager.removeUpdates(mGpsListener);
+		
 		locationManager = null;
 	}
 

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

@@ -58,7 +58,7 @@ public class SimpleMainView implements MainView {
 	
 	private class ActionBack implements View.OnClickListener {
 		public void onClick(View v) {
-			back(0);
+			goBack();//back(0);
 		}
 	};
 	
@@ -316,6 +316,9 @@ public class SimpleMainView implements MainView {
 			onClick = new ActionBack();
 		}
 		else if (action.equalsIgnoreCase("forward")) {
+			if (RhodesService.isJQTouch_mode()) {
+				return null;
+			}
 			icon = ctx.getResources().getDrawable(AndroidR.drawable.next);
 			onClick = new ActionForward();
 		}
@@ -545,15 +548,10 @@ public class SimpleMainView implements MainView {
 	}
 	
 	public void back(int index) {
-		RhodesService.navigateBack();
-	}
-	
-	public void goBack() 
-	{
 		restoreWebView();
         
         boolean bStartPage = RhodesService.isOnStartPage();
-        
+
         if ( !bStartPage && webView.canGoBack() )		
             webView.goBack();
         else
@@ -563,6 +561,11 @@ public class SimpleMainView implements MainView {
 	            ra.moveTaskToBack(true);
         }		
 	}
+	
+	public void goBack() 
+	{
+		RhodesService.navigateBack();
+	}
 
 	public void forward(int index) {
 		restoreWebView();

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

@@ -26,7 +26,6 @@ import java.util.Vector;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.Utils;
 import com.rhomobile.rhodes.file.RhoFileApi;
 
 import android.content.Context;
@@ -39,11 +38,9 @@ import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RoundRectShape;
-import android.graphics.drawable.shapes.Shape;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.ViewGroup.LayoutParams;
@@ -56,8 +53,8 @@ public class TabbedMainView implements MainView {
 	
 	private static final String TAG = "TabbedMainView";
 	
-	private static final int DISABLED_BKG_COLOR = 0xFF000000 | (128 << 16) | (128 << 8) | (128);
-	private static final int DISABLED_IMG_COLOR = 0xFF000000 | (164 << 16) | (164 << 8) | (164);
+	private static final int DISABLED_BKG_COLOR = 0xFF000000 | (110 << 16) | (110 << 8) | (110);
+	private static final int DISABLED_IMG_COLOR = 0xFF000000 | (140 << 16) | (140 << 8) | (140);
 	
 	private TabHost host;
 	private Vector<TabData> tabData;
@@ -66,9 +63,19 @@ public class TabbedMainView implements MainView {
 	private int mBackgroundColor = 0;
 	private boolean mBackgroundColorEnable = false;
 	
+	private String mChangeTabCallback = null;
+	
 	
 	private boolean mIsReallyOnScreen = false;
-	private String mLoadUrlAfterLoadToScreen = null;
+	//private String mLoadUrlAfterLoadToScreen = null;
+	
+	private static native void onTabBarChangeTabCallback(String callback_url, String body);
+	
+	
+	private void callChangeTabCallback(int index) {
+		String body = "&rho_callback=1" + "&tab_index=" + String.valueOf(index);
+		onTabBarChangeTabCallback(mChangeTabCallback, body);
+	}
 	
 	private static class TabData {
 		public MainView view;
@@ -269,7 +276,7 @@ public class TabbedMainView implements MainView {
 					c_G = (DISABLED_BKG_COLOR & 0xFF00) >> 8;
 					c_B = (DISABLED_BKG_COLOR & 0xFF);
 					
-					int dark_k = 8;
+					int dark_k = 0;
 					int dark_k2 = 32;
 					int c_dark_R = modifyColorComponent( c_R, -dark_k);
 					int c_dark_G = modifyColorComponent( c_G, -dark_k);
@@ -425,6 +432,7 @@ public class TabbedMainView implements MainView {
 		mBackgroundColorEnable = false;		
 
 		Vector<Object> tabs = null;
+		boolean place_tabs_bottom = false;
 		if (params instanceof Vector<?>)
 			tabs = (Vector<Object>)params;
 		else if (params instanceof Map<?,?>) {
@@ -437,6 +445,17 @@ public class TabbedMainView implements MainView {
 				mBackgroundColorEnable = true;
 			}
 			
+			Object callbackObj = settings.get("on_change_tab_callback");
+			if ((callbackObj != null) && (callbackObj instanceof String)) {
+				mChangeTabCallback = new String(((String)callbackObj));
+			}
+
+			Object placeBottomObj = settings.get("place_tabs_bottom");
+			if ((placeBottomObj != null) && (placeBottomObj instanceof String)) {
+				place_tabs_bottom = ((String)placeBottomObj).equalsIgnoreCase("true");
+			}
+			
+			
 			Object tabsObj = settings.get("tabs");
 			if (tabsObj != null && (tabsObj instanceof Vector<?>))
 				tabs = (Vector<Object>)tabsObj;
@@ -447,24 +466,38 @@ public class TabbedMainView implements MainView {
 		
 		int size = tabs.size();
 		
-		host = new TabHost(ctx);
+		host = new TabHost(ctx, null);
 		
 		tabData = new Vector<TabData>(size);
 		tabIndex = 0;
 		
 		TabWidget tabWidget = new TabWidget(ctx);
 		tabWidget.setId(android.R.id.tabs);
-		TabHost.LayoutParams lpt = new TabHost.LayoutParams(LayoutParams.FILL_PARENT,
-				LayoutParams.WRAP_CONTENT, Gravity.TOP);
-		host.addView(tabWidget, lpt);
 
 		FrameLayout frame = new FrameLayout(ctx);
-		frame.setId(android.R.id.tabcontent);
-		FrameLayout.LayoutParams lpf = new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT,
-				LayoutParams.FILL_PARENT, Gravity.BOTTOM);
-		// TODO: detect tab widget height and use it here instead of hardcoded value
-		//lpf.setMargins(0, 128, 0, 0);
-		host.addView(frame, lpf);
+		FrameLayout.LayoutParams lpf = null;
+		TabHost.LayoutParams lpt = null;
+		if (place_tabs_bottom) {
+			frame.setId(android.R.id.tabcontent);
+			lpf = new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT,
+					LayoutParams.FILL_PARENT, Gravity.TOP);
+			host.addView(frame, lpf);
+
+			lpt = new TabHost.LayoutParams(LayoutParams.FILL_PARENT,
+					LayoutParams.WRAP_CONTENT, Gravity.BOTTOM);
+			host.addView(tabWidget, lpt);
+		}
+		else {
+			lpt = new TabHost.LayoutParams(LayoutParams.FILL_PARENT,
+					LayoutParams.WRAP_CONTENT, Gravity.TOP);
+			host.addView(tabWidget, lpt);
+
+			frame = new FrameLayout(ctx);
+			frame.setId(android.R.id.tabcontent);
+			lpf = new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT,
+					LayoutParams.FILL_PARENT, Gravity.BOTTOM);
+			host.addView(frame, lpf);
+		}
 		
 		host.setup();
 		
@@ -610,14 +643,106 @@ public class TabbedMainView implements MainView {
 		
 		tabWidget.measure(host.getWidth(), host.getHeight());
 		int hh = tabWidget.getMeasuredHeight();
-		if (hh < 64) {
-			hh = 64;
+		//if (hh < 64) {
+		//	hh = 64;
+		//}
+		if (place_tabs_bottom) {
+			lpf.setMargins(0, 0, 0, hh);
+		}
+		else {
+			lpf.setMargins(0, hh, 0, 0);
 		}
-		lpf.setMargins(0, hh, 0, 0);
 		host.updateViewLayout(frame, lpf);
-		
 	}
 
+	private class TabHostClickListener implements View.OnTouchListener, View.OnClickListener, TabHost.OnTabChangeListener {
+		
+		public TabHost tabHost;
+		private float x = -1000;
+		private float y = -1000;
+		private int sel_col = 0;
+		private boolean sel_col_enable = false;
+		
+		public boolean onTouch(View v, MotionEvent event) {
+			x = event.getX() + v.getLeft();
+			y = event.getY() + v.getTop();
+			//Utils.platformLog("#$#$#$#$#$#$#$#$#$", "onTouch( "+String.valueOf((int)x)+" , "+String.valueOf((int)y)+" )");
+			return false;
+		}
+
+		public void onClick(View v) {
+			//Utils.platformLog("#$#$#$#$#$#$#$#$#$", "onClick( "+String.valueOf((int)x)+" , "+String.valueOf((int)y)+" )");
+			// found child item
+			for (int i = 0; i < tabHost.getTabWidget().getChildCount(); i++) { 
+				int curIndex = i;
+				int left = tabHost.getTabWidget().getChildAt(curIndex).getLeft();
+				int top = tabHost.getTabWidget().getChildAt(curIndex).getTop();
+				int width = tabHost.getTabWidget().getChildAt(curIndex).getWidth();
+				int height = tabHost.getTabWidget().getChildAt(curIndex).getHeight();
+				//Utils.platformLog("#$#$#$#$#$#$#$#$#$", "current item have rect [ "+String.valueOf(left)+" , "+String.valueOf(top)+" , "+String.valueOf(width)+" , "+String.valueOf(height)+" ]");
+				if (	( ( left <= x) && (x <= (left+width))) &&
+						( (top <= y) && (y <= (top+height))) ) {
+					//Utils.platformLog("#$#$#$#$#$#$#$#$#$", "clicked item no "+String.valueOf(curIndex));
+					onTabChangedIndex(curIndex, true);
+					return;
+				}
+			}
+			//Utils.platformLog("#$#$#$#$#$#$#$#$#$", "not found clicked item");
+		}
+
+		private void onTabChangedIndex(int index, boolean byself) {
+			//Utils.platformLog("#$#$#$#$#$#$#$#$#$", "onTabChangedIndex( "+String.valueOf(index)+" )");
+			int new_tabIndex = index;
+			sel_col = 0;
+			sel_col_enable = false;
+			TabData data = tabData.elementAt(new_tabIndex);
+			if (data == null) {
+				return;
+			}
+			if (data.disabled) {
+				// return to previous selected
+				tabHost.setCurrentTab(tabIndex);
+				return;
+			}
+			boolean real_change = (tabIndex != new_tabIndex);
+			if (real_change && byself) {
+				tabHost.setCurrentTab(new_tabIndex);
+				// all will processed when onTabChanged received
+				return;
+			}
+			tabIndex = new_tabIndex;
+
+			if (real_change && (mChangeTabCallback != null)) {
+				callChangeTabCallback(tabIndex);
+			}
+			
+			if ((data.reload /*|| real_change*/) || !data.loaded ) {
+				if (mIsReallyOnScreen) {
+					RhodesService.loadUrl(data.url);
+					data.loaded = true;
+				}
+			}
+			sel_col = data.selected_color;
+			sel_col_enable = data.selected_color_enabled;
+			
+			if (mIsReallyOnScreen && real_change) {
+				processTabHostColors(tabHost, sel_col, sel_col_enable);
+			}
+		}
+		
+		public void onTabChanged(String tabId) {
+			try {
+				int new_tabIndex = Integer.parseInt(tabId);
+				onTabChangedIndex(new_tabIndex, false);
+			}
+			catch (NumberFormatException e) {
+				Logger.E(TAG, e);
+			}
+		}
+		
+		
+	}
+	
 	public void loadFirstPage() {
 
 		int sel_col = 0;
@@ -657,40 +782,15 @@ public class TabbedMainView implements MainView {
 		
 		host.requestLayout();
 
-		host.setOnTabChangedListener(new TabHost.OnTabChangeListener() {
-			private TabHost tabHost = host;
-			
-			public void onTabChanged(String tabId) {
-				//Utils.platformLog("TabbedMainView", "onTabChangeListener( "+tabId+" )");
-				int sel_col = 0;
-				boolean sel_col_enable = false;
-				try {
-					int new_tabIndex = Integer.parseInt(tabId);
-					TabData data = tabData.elementAt(new_tabIndex);
-					if (data != null) {
-						if (data.disabled) {
-							// return to previous selected
-							tabHost.setCurrentTab(tabIndex);
-							return;
-						}
-					}
-					boolean real_change = (tabIndex != new_tabIndex);
-					tabIndex = new_tabIndex;
-					if ((data.reload && real_change) || !data.loaded ) {
-						if (mIsReallyOnScreen) {
-							RhodesService.loadUrl(data.url);
-							data.loaded = true;
-						}
-					}
-					sel_col = data.selected_color;
-					sel_col_enable = data.selected_color_enabled;
-				}
-				catch (NumberFormatException e) {
-					Logger.E(TAG, e);
-				}
-				processTabHostColors(tabHost, sel_col, sel_col_enable);
-			}
-		});
+		TabHostClickListener listener = new TabHostClickListener();
+		listener.tabHost = host;
+		
+		host.setOnTabChangedListener(listener);
+		
+		for (int i = 0; i < host.getTabWidget().getChildCount(); i++) { 
+				host.getTabWidget().getChildAt(i).setOnTouchListener( listener);
+				host.getTabWidget().getChildAt(i).setOnClickListener(listener);
+		}
 
 		if (data != null) {
 			try {