src: use `as_notnullable` in code

[nit.git] / src / android_platform.nit

diff --git a/src/android_platform.nit b/src/android_platform.nit
index e8c8f97..1bec914 100644 (file)
--- a/src/android_platform.nit
+++ b/src/android_platform.nit
@@ -1,4 +1,3 @@
-# This file is part of NIT ( http://www.nitlanguage.org )
 #
 # Copyright 2014 Alexis Laferrière <alexis.laf@xymus.net>
 #
@@ -68,6 +67,15 @@ class AndroidToolchain
                var app_version = project.version
                if app_version == null then app_version = "1.0"
 
+               var app_min_api = project.min_api
+               if app_min_api == null then app_min_api = 10
+
+               var app_target_api = project.target_api
+               if app_target_api == null then app_target_api = app_min_api
+
+               var app_max_api = ""
+               if project.max_api != null then app_max_api = "android:maxSdkVersion=\"{project.max_api.as(not null)}\""
+
                # Clear the previous android project, so there is no "existing project warning"
                # or conflict between Java files of different projects
                if android_project_root.file_exists then android_project_root.rmdir
@@ -75,7 +83,7 @@ class AndroidToolchain
                var args = ["android", "-s",
                        "create", "project",
                        "--name", short_project_name,
-                       "--target", "android-10",
+                       "--target", "android-{app_target_api}",
                        "--path", android_project_root,
                        "--package", app_package,
                        "--activity", short_project_name]
@@ -130,7 +138,10 @@ $(call import-module,android/native_app_glue)
         android:versionName="{{{app_version}}}">
 
     <!-- This is the platform API where NativeActivity was introduced. -->
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-sdk 
+        android:minSdkVersion="{{{app_min_api}}}" 
+        android:targetSdkVersion="{{{app_target_api}}}" 
+        {{{app_max_api}}} /> 
 
     <application
                android:label="@string/app_name"
@@ -207,14 +218,17 @@ $(call import-module,android/native_app_glue)
                        res_dir = "res"
                end
                if res_dir.file_exists then
+                       # copy the res folder to .nit_compile
                        res_dir = res_dir.realpath
                        var target_res_dir = "{android_project_root}"
-                       if target_res_dir.file_exists then
-                               # copy the res folder to .nit_compile
-                               toolcontext.exec_and_check(["cp", "-R", res_dir, target_res_dir], "Android project error")
-                       end
+                       toolcontext.exec_and_check(["cp", "-R", res_dir, target_res_dir], "Android project error")
+               else
+                       # Create our own custom `res/values/string.xml` with the App name
+"""<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">{{{app_name}}}</string>
+</resources>""".write_to_file "{dir}/res/values/strings.xml"
                end
-
        end
 
        redef fun write_makefile(compiler, compile_dir, cfiles)