RubyGems - rhodes - Versions diffs - 1.5.5 → 2.0.0.beta1 - Mend

rhodes 1.5.5 → 2.0.0.beta1

Files changed (529) hide show

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

@@ -7,74 +7,23 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebView;
 import android.widget.ImageView;
 public class SplashScreen {
-	private static final String INSTALLING_PAGE = "apps/app/installing.html";
-	private static final String LOADING_PAGE = "apps/app/loading.html";
-	private View view;
+	private ImageView view;
 	private native void nativeStart();
 	private native void nativeHide();
-	public SplashScreen(Context ctx, String file) {
+	public SplashScreen(Context ctx, String file) throws IOException {
+		view = new ImageView(ctx);
 		AssetManager am = ctx.getResources().getAssets();
-		Bitmap bitmap = null;
-		if (file != null) {
-			try {
-				InputStream is = am.open(file);
-				bitmap = BitmapFactory.decodeStream(is);
-				is.close();
-			}
-			catch (IOException e) {}
-		}
-		if (bitmap != null) {
-			ImageView v = new ImageView(ctx);
-			v.setImageBitmap(bitmap);
-			v.setId(Rhodes.RHO_SPLASH_VIEW);
-			view = v;
-		}
-		else {
-			Rhodes r = RhodesInstance.getInstance();
-			WebView v = r.createWebView();
-			boolean bc = r.isBundleChanged();
-			String page = bc ? INSTALLING_PAGE : LOADING_PAGE;
-			boolean hasNeededPage;
-			try {
-				InputStream is1 = am.open(page);
-				if (is1 != null)
-					is1.close();
-				hasNeededPage = true;
-			}
-			catch (IOException e1) {
-				hasNeededPage = false;
-			}
-			if (hasNeededPage) {
-				v.loadUrl("file:///android_asset/" + page);
-			}
-			else {
-				StringBuffer p = new StringBuffer();
-				p.append("<html><title>");
-				p.append(bc ? "Installing" : "Loading");
-				p.append("</title><body>");
-				p.append(bc ? "Installing" : "Loading");
-				p.append("...</body></html>");
-				v.loadData(p.toString(), "text/html", "utf-8");
-			}
-			v.setId(Rhodes.RHO_SPLASH_VIEW);
-			view = v;
-		}
+		InputStream is = am.open(file);
+		Bitmap bitmap = BitmapFactory.decodeStream(is);
+		view.setImageBitmap(bitmap);
+		view.setId(Rhodes.RHO_SPLASH_VIEW);
 	}
 	public void start(ViewGroup outer) {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java CHANGED Viewed

@@ -43,6 +43,13 @@ public class WebView {
 		}
 	};
+	private static class NavigateBackTask implements Runnable {
+		public void run() {
+			Rhodes r = RhodesInstance.getInstance();
+			r.getMainView().goBack();
+		}
+	};
 	private static class RefreshTask implements Runnable {
 		private int index;
@@ -95,6 +102,15 @@ public class WebView {
 		}
 	}
+	public static void navigateBack() {
+		try {
+			Rhodes.performOnUiThread(new NavigateBackTask(), false);
+		}
+		catch (Exception e) {
+			reportFail("navigateBack", e);
+		}
+	}
 	public static void refresh(int index) {
 		try {
 			Rhodes.performOnUiThread(new RefreshTask(index), false);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java CHANGED Viewed

@@ -21,13 +21,29 @@
 package com.rhomobile.rhodes.alert;
 import java.io.File;
+import java.util.Map;
+import java.util.Vector;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
+import android.net.Uri;
 import android.os.Vibrator;
+import android.view.Gravity;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.Rhodes;
 import com.rhomobile.rhodes.RhodesInstance;
@@ -36,24 +52,199 @@ public class Alert {
 	private static final String TAG = "Alert";
+	private static Dialog currentAlert = null;
+	private static native void doCallback(String url, String id, String title);
+	private static class CustomButton {
+		public String id;
+		public String title;
+		public CustomButton(String t) {
+			id = t;
+			title = t;
+		}
+		public CustomButton(String i, String t) {
+			id = i;
+			title = t;
+		}
+	};
+	private static class ShowDialogListener implements OnClickListener {
+		private String callback;
+		private String id;
+		private String title;
+		private Dialog dialog;
+		public ShowDialogListener(String c, String i, String t, Dialog d) {
+			callback = c;
+			id = i;
+			title = t;
+			dialog = d;
+		}
+		public void onClick(View arg0) {
+			if (callback != null) {
+				doCallback(callback, Uri.encode(id), Uri.encode(title));
+			}
+			dialog.dismiss();
+			currentAlert = null;
+		}
+	};
 	private static class ShowDialog implements Runnable {
-		private String message;
+		private Object params;
-		public ShowDialog(String m) {
-			message = m;
+		public ShowDialog(Object p) {
+			params = p;
 		}
+		@SuppressWarnings("unchecked")
 		public void run() {
-			AlertDialog.Builder builder = new AlertDialog.Builder(RhodesInstance.getInstance());
-			builder.setTitle("Alert");
-			builder.setMessage(message);
-			builder.setCancelable(false);
-			builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int which) {
-					// Do nothing here
-				}
-			});
-			builder.show();
+			String title = "Alert";
+			String message = null;
+			Drawable icon = null;
+			String callback = null;
+			Vector<CustomButton> buttons = new Vector<CustomButton>();
+			Rhodes r = RhodesInstance.getInstance();
+			if (params instanceof String) {
+				message = (String)params;
+				buttons.addElement(new CustomButton("OK"));
+			}
+			else if (params instanceof Map<?,?>) {
+				Map<Object, Object> hash = (Map<Object, Object>)params;
+				Object titleObj = hash.get("title");
+				if (titleObj != null && (titleObj instanceof String))
+					title = (String)titleObj;
+				Object messageObj = hash.get("message");
+				if (messageObj != null && (messageObj instanceof String))
+					message = (String)messageObj;
+				Object iconObj = hash.get("icon");
+				if (iconObj != null && (iconObj instanceof String)) {
+					String iconName = (String)iconObj;
+					if (iconName.equalsIgnoreCase("alert"))
+						icon = r.getResources().getDrawable(AndroidR.drawable.alert_alert);
+					else if (iconName.equalsIgnoreCase("question"))
+						icon = r.getResources().getDrawable(AndroidR.drawable.alert_question);
+					else if (iconName.equalsIgnoreCase("info"))
+						icon = r.getResources().getDrawable(AndroidR.drawable.alert_info);
+					else {
+						iconName = r.getRootPath() + "/apps/" + iconName;
+						Bitmap bitmap = BitmapFactory.decodeFile(iconName);
+						if (bitmap != null)
+							icon = new BitmapDrawable(bitmap);
+					}
+				}
+				Object callbackObj = hash.get("callback");
+				if (callbackObj != null && (callbackObj instanceof String))
+					callback = (String)callbackObj;
+				Object buttonsObj = hash.get("buttons");
+				if (buttonsObj != null && (buttonsObj instanceof Vector<?>)) {
+					Vector<Object> btns = (Vector<Object>)buttonsObj;
+					for (int i = 0; i < btns.size(); ++i) {
+						String itemId = null;
+						String itemTitle = null;
+						Object btnObj = btns.elementAt(i);
+						if (btnObj instanceof String) {
+							itemId = (String)btnObj;
+							itemTitle = (String)btnObj;
+						}
+						else if (btnObj instanceof Map<?,?>) {
+							Map<Object, Object> btnHash = (Map<Object, Object>)btnObj;
+							Object btnIdObj = btnHash.get("id");
+							if (btnIdObj != null && (btnIdObj instanceof String))
+								itemId = (String)btnIdObj;
+							Object btnTitleObj = btnHash.get("title");
+							if (btnTitleObj != null && (btnTitleObj instanceof String))
+								itemTitle = (String)btnTitleObj;
+						}
+						if (itemId == null || itemTitle == null) {
+							Logger.E(TAG, "Incomplete button item");
+							continue;
+						}
+						buttons.addElement(new CustomButton(itemId, itemTitle));
+					}
+				}
+			}
+			if (message == null)
+				return;
+			Dialog dialog = new Dialog(r);
+			dialog.setTitle(title);
+			dialog.setCancelable(false);
+			dialog.setCanceledOnTouchOutside(false);
+			LinearLayout main = new LinearLayout(r);
+			main.setOrientation(LinearLayout.VERTICAL);
+			main.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
+			main.setPadding(10, 10, 10, 10);
+			LinearLayout top = new LinearLayout(r);
+			top.setOrientation(LinearLayout.HORIZONTAL);
+			top.setGravity(Gravity.CENTER);
+			top.setPadding(10, 10, 10, 10);
+			top.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+			main.addView(top);
+			if (icon != null) {
+				ImageView imgView = new ImageView(r);
+				imgView.setImageDrawable(icon);
+				imgView.setScaleType(ImageView.ScaleType.CENTER);
+				imgView.setPadding(10, 10, 10, 10);
+				top.addView(imgView);
+			}
+			TextView textView = new TextView(r);
+			textView.setText(message);
+			textView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+			textView.setGravity(Gravity.CENTER);
+			top.addView(textView);
+			LinearLayout bottom = new LinearLayout(r);
+			bottom.setOrientation(buttons.size() > 3 ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
+			bottom.setGravity(Gravity.CENTER);
+			bottom.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+			main.addView(bottom);
+			for (int i = 0, lim = buttons.size(); i < lim; ++i) {
+				CustomButton btn = buttons.elementAt(i);
+				Button button = new Button(r);
+				button.setText(btn.title);
+				button.setOnClickListener(new ShowDialogListener(callback, btn.id, btn.title, dialog));
+				button.setLayoutParams(new LinearLayout.LayoutParams(
+						lim > 3 ? LayoutParams.FILL_PARENT : LayoutParams.WRAP_CONTENT,
+						LayoutParams.WRAP_CONTENT, 1));
+				bottom.addView(button);
+			}
+			dialog.setContentView(main);
+			dialog.show();
+			currentAlert = dialog;
+		}
+	};
+	private static class HideDialog implements Runnable {
+		public void run() {
+			if (currentAlert == null)
+				return;
+			currentAlert.dismiss();
+			currentAlert = null;
 		}
 	};
@@ -61,18 +252,30 @@ public class Alert {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
-	public static void showPopup(String message) {
+	public static void showPopup(Object params) {
 		try {
 			Logger.T(TAG, "showPopup");
-			Rhodes.performOnUiThread(new ShowDialog(message), false);
+			Rhodes.performOnUiThread(new ShowDialog(params), false);
 		}
 		catch (Exception e) {
 			reportFail("showPopup", e);
 		}
 	}
+	public static void hidePopup() {
+		try {
+			Logger.T(TAG, "hidePopup");
+			Rhodes.performOnUiThread(new HideDialog(), false);
+		}
+		catch (Exception e) {
+			reportFail("hidePopup", e);
+		}
+	}
 	public static void vibrate(int duration) {
 		try {
+			if (!Capabilities.VIBRATE_ENABLED)
+				throw new IllegalAccessException("VIBRATE disabled");
 			Logger.T(TAG, "vibrate: " + duration);
 			Rhodes instance = RhodesInstance.getInstance();
 			Vibrator vibrator = (Vibrator)instance.getSystemService(Context.VIBRATOR_SERVICE);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java CHANGED Viewed

@@ -23,6 +23,8 @@ package com.rhomobile.rhodes.camera;
 import java.io.File;
 import android.content.Intent;
+import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.Rhodes;
 import com.rhomobile.rhodes.RhodesInstance;
@@ -45,6 +47,20 @@ public class Camera {
 			f.mkdirs();
 	}
+	private static class CameraDisabled implements Runnable {
+		private String url;
+		public CameraDisabled(String u) {
+			url = u;
+		}
+		public void run() {
+			callback(url, "", "Camera disabled", false);
+		}
+	};
 	private static class Runner implements Runnable {
 		private String url;
@@ -64,18 +80,20 @@ public class Camera {
 		}
 	};
-	public static void takePicture(String sourceUrl) {
+	public static void takePicture(String url) {
 		try {
-			Rhodes.performOnUiThread(new Runner(sourceUrl, ImageCapture.class), false);
+			Runnable runnable = Capabilities.CAMERA_ENABLED ? new Runner(url, ImageCapture.class) :
+				new CameraDisabled(url);
+			Rhodes.performOnUiThread(runnable, false);
 		}
 		catch (Exception e) {
 			reportFail("takePicture", e);
 		}
 	}
-	public static void choosePicture(String sourceUrl) {
+	public static void choosePicture(String url) {
 		try {
-			Rhodes.performOnUiThread(new Runner(sourceUrl, FileList.class), false);
+			Rhodes.performOnUiThread(new Runner(url, FileList.class), false);
 		}
 		catch (Exception e) {
 			reportFail("choosePicture", e);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java CHANGED Viewed

@@ -40,8 +40,12 @@ import android.provider.MediaStore.Images.Media;
 import android.view.KeyEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.ImageButton;
-public class ImageCapture extends Activity implements SurfaceHolder.Callback {
+public class ImageCapture extends Activity implements SurfaceHolder.Callback, OnClickListener {
 	private static final String TAG = "ImageCapture";
@@ -52,6 +56,7 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback {
 	private SurfaceView surfaceView;
 	private SurfaceHolder surfaceHolder;
+	private ImageButton cameraButton;
 	// private Uri target = Media.EXTERNAL_CONTENT_URI;
@@ -59,6 +64,7 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback {
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 		Logger.D(TAG, "onCreate");
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		getWindow().setFlags(Rhodes.WINDOW_FLAGS, Rhodes.WINDOW_MASK);
 		getWindow().setFormat(PixelFormat.TRANSLUCENT);
 		setContentView(AndroidR.layout.camera);
@@ -70,6 +76,9 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback {
 		surfaceHolder = surfaceView.getHolder();
 		surfaceHolder.addCallback(this);
 		surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+		cameraButton = (ImageButton)findViewById(AndroidR.id.cameraButton);
+		cameraButton.setOnClickListener(this);
 	}
 	@Override
@@ -91,33 +100,10 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback {
 	};
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		ImageCaptureCallback iccb = null;
 		switch (keyCode) {
 		case KeyEvent.KEYCODE_DPAD_CENTER:
 		case KeyEvent.KEYCODE_CAMERA:
-			try {
-				String filename = "Image_" + timeStampFormat.format(new Date());
-				ContentValues values = new ContentValues(5);
-				values.put(Media.TITLE, filename);
-				values.put(Media.DISPLAY_NAME, filename);
-				values.put(Media.DATE_TAKEN, new Date().getTime());
-				values.put(Media.MIME_TYPE, "image/jpeg");
-				values.put(Media.DESCRIPTION, "Image capture by camera");
-				Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
-				// String filename = timeStampFormat.format(new Date());
-				String dir = com.rhomobile.rhodes.camera.Camera.BASE_CAMERA_DIR;
-				File fdir = new File(dir);
-				if (!fdir.exists())
-					fdir.mkdirs();
-				OutputStream osCommon = getContentResolver().openOutputStream(uri);
-				iccb = new ImageCaptureCallback(callbackUrl, osCommon, dir + "/" + filename + ".jpg");
-			} catch (Exception ex) {
-				Logger.E(TAG, ex.getMessage());
-			}
-			camera.takePicture(mShutterCallback, mPictureCallbackRaw, iccb);
+			takePicture();
 			return true;
 		case KeyEvent.KEYCODE_BACK:
 			return super.onKeyDown(keyCode, event);
@@ -169,4 +155,37 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback {
 		isPreviewRunning = false;
 		camera.release();
 	}
+	public void onClick(View v) {
+		if (v.getId() == AndroidR.id.cameraButton) {
+			takePicture();
+		}
+	}
+	private void takePicture() {
+		ImageCaptureCallback iccb = null;
+		try {
+			String filename = "Image_" + timeStampFormat.format(new Date());
+			ContentValues values = new ContentValues(5);
+			values.put(Media.TITLE, filename);
+			values.put(Media.DISPLAY_NAME, filename);
+			values.put(Media.DATE_TAKEN, new Date().getTime());
+			values.put(Media.MIME_TYPE, "image/jpeg");
+			values.put(Media.DESCRIPTION, "Image capture by camera");
+			Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
+			// String filename = timeStampFormat.format(new Date());
+			String dir = com.rhomobile.rhodes.camera.Camera.BASE_CAMERA_DIR;
+			File fdir = new File(dir);
+			if (!fdir.exists())
+				fdir.mkdirs();
+			OutputStream osCommon = getContentResolver().openOutputStream(uri);
+			iccb = new ImageCaptureCallback(callbackUrl, osCommon, dir + "/" + filename + ".jpg");
+		} catch (Exception ex) {
+			Logger.E(TAG, ex.getMessage());
+		}
+		camera.takePicture(mShutterCallback, mPictureCallbackRaw, iccb);
+	}
 }