lib/android: update other modules to use android_context

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/lib/android/assets_and_resources.nit b/lib/android/assets_and_resources.nit
index baf4e4a..40dace2 100644 (file)
--- a/lib/android/assets_and_resources.nit
+++ b/lib/android/assets_and_resources.nit
@@ -121,7 +121,7 @@ end
 class AssetManager
 
        # Native asset manager
-       private var native_assets_manager: NativeAssetManager = app.native_activity.assets.new_global_ref is lazy
+       private var native_assets_manager: NativeAssetManager = app.native_context.assets.new_global_ref is lazy
 
        # Close this asset manager
        fun close do native_assets_manager.close
@@ -400,8 +400,8 @@ end
 redef class App
        # Resource Manager used to manage resources placed in the `res` folder of the app
        var resource_manager: ResourcesManager is lazy do
-               var res = native_activity.resources
-               var pkg = native_activity.package_name
+               var res = native_context.resources
+               var pkg = native_context.package_name
                return new ResourcesManager.native(res, pkg.to_s)
        end
 
@@ -409,7 +409,7 @@ redef class App
        var asset_manager: AssetManager is lazy do return new AssetManager
 end
 
-redef extern class NativeActivity
+redef extern class NativeContext
 
        # Get the native AssetsManager of the application, used to initialize the nit's AssetManager
        private fun assets: NativeAssetManager in "Java" `{

diff --git a/lib/android/intent/intent_api10.nit b/lib/android/intent/intent_api10.nit
index 8c6a928..746c0c4 100644 (file)
--- a/lib/android/intent/intent_api10.nit
+++ b/lib/android/intent/intent_api10.nit
@@ -1305,7 +1305,7 @@ class Intent
        redef fun to_s do return intent.to_native_s.to_s
 end
 
-redef extern class NativeActivity
+redef extern class NativeContext
        private fun start_activity(intent: NativeIntent) in "Java" `{ self.startActivity(intent); `}
        private fun start_service(intent: NativeIntent) in "Java" `{ self.startService(intent); `}
        private fun stop_service(intent: NativeIntent) in "Java" `{ self.stopService(intent); `}
@@ -1331,11 +1331,11 @@ end
 redef class App
 
        # Execute the intent and launch the appropriate application
-       fun start_activity(intent: Intent) do native_activity.start_activity(intent.intent)
+       fun start_activity(intent: Intent) do native_context.start_activity(intent.intent)
 
        # Start a service that will be running until the `stop_service` call
-       fun start_service(intent: Intent) do native_activity.start_service(intent.intent)
+       fun start_service(intent: Intent) do native_context.start_service(intent.intent)
 
        # Stop service
-       fun stop_service(intent: Intent) do native_activity.stop_service(intent.intent)
+       fun stop_service(intent: Intent) do native_context.stop_service(intent.intent)
 end

diff --git a/lib/android/notification/notification.nit b/lib/android/notification/notification.nit
index efd7c5f..0b6cb66 100644 (file)
--- a/lib/android/notification/notification.nit
+++ b/lib/android/notification/notification.nit
@@ -109,7 +109,7 @@ class Notification
                if id != null then
                        sys.jni_env.push_local_frame(8)
 
-                       var manager = app.native_activity.notification_manager
+                       var manager = app.native_context.notification_manager
                        manager.cancel(tag.to_java_string, id)
 
                        self.id = null

diff --git a/lib/android/vibration.nit b/lib/android/vibration.nit
index 99ff7ad..cef49ee 100644 (file)
--- a/lib/android/vibration.nit
+++ b/lib/android/vibration.nit
@@ -49,10 +49,10 @@ end
 redef class App
        # Get the handle to this device vibrator as a global ref
        var vibrator: Vibrator is lazy do
-               var v = vibrator_native(native_activity)
+               var v = vibrator_native(native_context)
                return v.new_global_ref
        end
-       private fun vibrator_native(context: NativeActivity): Vibrator in "Java" `{
+       private fun vibrator_native(context: NativeContext): Vibrator in "Java" `{
                android.os.Vibrator v = (android.os.Vibrator)
                        context.getSystemService(android.content.Context.VIBRATOR_SERVICE);
                return v;