Added MOAIApp.vibrate(ms) for Android

mandrav · Jan 31, 2013 · a86fc87 · a86fc87
1 parent 58a2101
commit a86fc87
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/ant/host-source/source/project/AndroidManifest.xml b/ant/host-source/source/project/AndroidManifest.xml
@@ -48,6 +48,7 @@
 	<!-- Moai -->
  	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.VIBRATE" />
 
 	<!-- EXTERNAL PERMISSIONS: Placeholder (DO NOT MOVE OR REMOVE) -->
 
@@ -62,4 +63,4 @@
 
 	<uses-feature android:name="android.hardware.screen.landscape" android:required="true" />
 	<uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="true" />
-</manifest>   
+</manifest>   
diff --git a/ant/host-source/source/project/src/moai/Moai.java b/ant/host-source/source/project/src/moai/Moai.java
@@ -15,6 +15,7 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Vibrator;
 import android.provider.Settings.Secure;
 import android.util.DisplayMetrics;
 
@@ -632,6 +633,13 @@ public static void share ( String prompt, String subject, String text ) {
 		sActivity.startActivity ( Intent.createChooser ( intent, prompt ));
 	}
 
+	//----------------------------------------------------------------//
+	public static void vibrate ( int milliseconds ) {
+
+		Vibrator v = (Vibrator) sActivity.getSystemService(Context.VIBRATOR_SERVICE);
+		v.vibrate(milliseconds);
+	}
+
 	//----------------------------------------------------------------//
 	public static void showDialog ( String title, String message, String positiveButton, String neutralButton, String negativeButton, boolean cancelable ) {
 

diff --git a/src/moaiext-android/MOAIAppAndroid.cpp b/src/moaiext-android/MOAIAppAndroid.cpp
@@ -176,6 +176,40 @@ int MOAIAppAndroid::_share ( lua_State* L ) {
 	return 0;
 }
 
+//----------------------------------------------------------------//
+/**	@name	vibrate
+	@text	Vibrate for the given amount of milliseconds.
+	
+	@in		number	milliseconds	The time-span to vibrate for.
+	@out 	nil
+*/
+int MOAIAppAndroid::_vibrate ( lua_State* L ) {
+
+	MOAILuaState state ( L );
+
+	int ms = lua_tonumber ( state, 1 );
+
+	JNI_GET_ENV ( jvm, env );
+
+	jclass moai = env->FindClass ( "com/ziplinegames/moai/Moai" );
+    if ( moai == NULL ) {
+
+		USLog::Print ( "MOAIAppAndroid: Unable to find java class %s", "com/ziplinegames/moai/Moai" );
+    } else {
+
+    	jmethodID vibrate = env->GetStaticMethodID ( moai, "vibrate", "(I)V" );
+    	if ( vibrate == NULL ) {
+
+			USLog::Print ( "MOAIAppAndroid: Unable to find static java method %s", "vibrate" );
+    	} else {
+
+			env->CallStaticVoidMethod ( moai, vibrate, ms );	
+		}
+	}
+
+	return 0;
+}
+
 //================================================================//
 // MOAIAppAndroid
 //================================================================//
@@ -204,6 +238,7 @@ void MOAIAppAndroid::RegisterLuaClass ( MOAILuaState& state ) {
 		{ "openURL",				_openURL },
 		{ "setListener",			_setListener },
 		{ "share",					_share },
+		{ "vibrate",				_vibrate },
 		{ NULL, NULL }
 	};
 
@@ -276,4 +311,4 @@ extern "C" void Java_com_ziplinegames_moai_Moai_AKUAppDidStartSession ( JNIEnv*
 extern "C" void Java_com_ziplinegames_moai_Moai_AKUAppWillEndSession ( JNIEnv* env, jclass obj ) {
 
 	MOAIAppAndroid::Get ().NotifyWillEndSession ();
-}
+}
diff --git a/src/moaiext-android/MOAIAppAndroid.h b/src/moaiext-android/MOAIAppAndroid.h
@@ -36,6 +36,7 @@ class MOAIAppAndroid :
 	static int	_openURL			( lua_State* L );
 	static int	_setListener		( lua_State* L );
 	static int	_share				( lua_State* L );
+	static int	_vibrate			( lua_State* L );
 
 public:
 
@@ -49,4 +50,4 @@ class MOAIAppAndroid :
 	void	RegisterLuaClass			( MOAILuaState& state );
 };
 
-#endif
+#endif