X-Git-Url: http://nitlanguage.org

diff --git a/examples/mnit_simple/src/simple_android.nit b/examples/mnit_simple/src/simple_android.nit
index 0387ad6..a451597 100644
--- a/examples/mnit_simple/src/simple_android.nit
+++ b/examples/mnit_simple/src/simple_android.nit
@@ -15,15 +15,14 @@
 # limitations under the License.
 
 module simple_android is
-	java_package("org.nitlanguage.simple")
 	android_manifest("""<uses-permission android:name="android.permission.VIBRATE" />""")
 end
 
-import simple
 import mnit_android
-import android::shared_preferences
-import android::assets_and_resources
-import android::audio
+import android::portrait
+import serialization
+
+import simple
 
 in "Java" `{
 	import android.content.Context;
@@ -31,96 +30,20 @@ in "Java" `{
 `}
 
 redef class App
-	var soundsp: Sound
-	var soundmp: Sound
-
-	redef fun init_window
-	do
-		super
-		manage_audio_mode
-		# retrieve sound
-		soundsp = load_sound("sound.ogg")
-		soundmp = load_music("xylofon.ogg")
-		default_mediaplayer.looping = true
-		default_mediaplayer.prepare
-		soundmp.play
-	end
-
 	redef fun input( ie )
 	do
-		if ie isa PointerEvent and ie.depressed then
-			do_java_stuff
-			#test_shared_preferences
-			soundsp.play
-			test_assets
-			test_resources
+		if ie isa PointerEvent and ie.depressed then 
+			test_java_ffi
 		end
 		return super
 	end
 
-	#testing the assets manager
-	fun test_assets
-	do
-		assert asset_manager.bitmap("fighter.png") != null
-	end
-
-	#testing the resources manager
-	fun test_resources do
-		assert resource_manager.string("string_test") == "string test"
-		assert resource_manager.boolean("test_bool") == true
-		assert resource_manager.dimension("test_dimen_1") != null
-		assert resource_manager.dimension("test_dimen_2") != null
-	end
-
-
-	fun test_shared_preferences
-	do
-		# Private mode tests
-		var sp = new SharedPreferences.privately(self, "test")
-		sp.add_bool("a_boolean",  true)
-		sp.add_float("a_float", 66.6)
-		sp.add_int("an_int", 666)
-		sp.add_int("a_second_int", 666777)
-		sp.add_long("a_long", 6666666666)
-		sp.add_string("a_string", "A string")
-		sp["another_int"] = 85
-		sp["yet_another_string"] = "Another string"
-		sp.remove("a_second_int")
-
-		# Serialized object test
-		var my_point = new Point(10, 10)
-		sp["a_point"] = my_point
-		var my_deserialized_point = sp.deserialize("a_point")
-		assert my_point.to_s == my_deserialized_point.to_s
-
-		assert sp.bool("a_boolean", false) == true
-		assert sp.bool("wrong_boolean", false) == false
-		assert sp.float("a_float", 0.0) != 0.0
-		assert sp.float("wrong_float", 0.0) == 0.0
-		assert sp.int("an_int", 0) == 666
-		assert sp.int("a_second_int", 0) == 0
-		assert sp.long("a_long", 0) == 6666666666
-		assert sp.long("wrong_long", 0) == 0
-		assert sp.string("a_string", "ERROR!") == "A string"
-		assert sp.string("wrong_string", "ERROR!") == "ERROR!"
-		assert sp.long("another_int", 0) == 85
-		assert sp.string("yet_another_string", "ERROR!") == "Another string"
-		assert sp.has("an_int") == true
-		assert sp.has("a_second_int") == false
-
-		sp.clear
-		assert sp.all == null
-
-		sp.destroy
-	end
-
-	fun do_java_stuff import native_activity in "Java" `{
+	fun test_java_ffi import native_activity in "Java" `{
 		// + Log (no context needed)
 		android.util.Log.d("mnit_simple", "Java within NIT!!!");
 
 		// - Context needed from now on
-		// NativeActivity is a Java sub-class of Context
-		final android.app.NativeActivity context = App_native_activity(recv);
+		final android.app.Activity context = App_native_activity(self);
 
 		// Vibration
 		android.os.Vibrator v = (android.os.Vibrator)
@@ -143,7 +66,6 @@ end
 
 class Point
 	auto_serializable
-	super Serializable
 
 	var x: Int
 	var y: Int
@@ -156,4 +78,3 @@ class Point
 
 	redef fun to_s do return "({x}, {y})"
 end
-