auto_super_init: handle the case of constructors redefinition (instead of infinitivel...
[nit.git] / src / android_platform.nit
index 41553eb..8532cf8 100644 (file)
@@ -1,4 +1,3 @@
-# This file is part of NIT ( http://www.nitlanguage.org )
 #
 # Copyright 2014 Alexis Laferrière <alexis.laf@xymus.net>
 #
@@ -20,6 +19,7 @@ module android_platform
 import platform
 import abstract_compiler
 import common_ffi
+intrude import common_ffi::extra_java_files
 import android_annotations
 
 redef class ToolContext
@@ -50,6 +50,8 @@ class AndroidToolchain
                return "{android_project_root}/jni/nit_compile/"
        end
 
+       redef fun default_outname(mainmodule) do return "{mainmodule.name}.apk"
+
        redef fun write_files(compiler, compile_dir, cfiles)
        do
                var android_project_root = android_project_root.as(not null)
@@ -66,10 +68,23 @@ 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
+
                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]
@@ -90,6 +105,30 @@ class AndroidToolchain
                        if f isa ExternCFile then cfiles.add(f.filename.basename(""))
                end
 
+               # Is there an icon?
+               var resolutions = ["ldpi", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"]
+               var icon_available = false
+               for res in resolutions do
+                       var path = "res/drawable-{res}/icon.png"
+                       if path.file_exists then
+                               icon_available = true
+                               break
+                       end
+               end
+
+               var icon_declaration
+               if icon_available then
+                       icon_declaration = "android:icon=\"@drawable/icon\""
+               else icon_declaration = ""
+
+               # Also copy over the java files
+               dir = "{android_project_root}/src/"
+               var extra_java_files = compiler.mainmodule.extra_java_files
+               if extra_java_files != null then for file in extra_java_files do
+                       var path = file.filename
+                       path.file_copy_to("{dir}/{path.basename("")}")
+               end
+
                ## Generate delagating makefile
                dir = "{android_project_root}/jni/"
                """
@@ -124,7 +163,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"
@@ -137,7 +179,8 @@ $(call import-module,android/native_app_glue)
                 android:label="@string/app_name"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                 android:configChanges="orientation|keyboardHidden"
-                android:screenOrientation="portrait">
+                android:screenOrientation="portrait"
+                {{{icon_declaration}}}>
             <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name=\"{{{app_package}}}\"
                     android:value=\"{{{app_name}}}\" />
@@ -153,21 +196,10 @@ $(call import-module,android/native_app_glue)
 
 {{{project.manifest_lines.join("\n")}}}
 
-</manifest> 
+</manifest>
 <!-- END_INCLUDE(manifest) -->
                """.write_to_file("{dir}/AndroidManifest.xml")
 
-               ### generate res/values/strings.xml
-               dir = "{android_project_root}/res/"
-               if not dir.file_exists then dir.mkdir
-               dir = "{dir}/values/"
-               if not dir.file_exists then dir.mkdir
-               """<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">{{{app_name}}}</string>
-</resources>
-               """.write_to_file("{dir}/strings.xml")
-
                ### Link to png sources
                # libpng is not available on Android NDK
                # FIXME make obtionnal when we have alternatives to mnit
@@ -200,6 +232,31 @@ $(call import-module,android/native_app_glue)
                                toolcontext.exec_and_check(["ln", "-s", assets_dir, target_assets_dir], "Android project error")
                        end
                end
+
+               ### copy resources  (for android)
+               # This will be accessed from `android_project_root`
+               var res_dir
+               if compiler.mainmodule.location.file != null then
+                       # it is a real file, use "{file}/../res"
+                       res_dir = "{compiler.mainmodule.location.file.filename.dirname}/../res"
+               else
+                       # probably used -m, use "."
+                       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}"
+                       toolcontext.exec_and_check(["cp", "-R", res_dir, target_res_dir], "Android project error")
+               end
+
+               if not res_dir.file_exists or not "{res_dir}/values/strings.xml".file_exists then
+                       # 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)
@@ -213,7 +270,7 @@ $(call import-module,android/native_app_glue)
                var release = toolcontext.opt_release.value
 
                # Compile C code (and thus Nit)
-               toolcontext.exec_and_check(["ndk-build", "-s", "-j", "4", "-C", android_project_root], "Android project error")
+               toolcontext.exec_and_check(["ndk-build", "-s", "-j", "-C", android_project_root], "Android project error")
 
                # Generate the apk
                var args = ["ant", "-q", "-f", android_project_root+"/build.xml"]
@@ -223,8 +280,7 @@ $(call import-module,android/native_app_glue)
                toolcontext.exec_and_check(args, "Android project error")
 
                # Move the apk to the target
-               var outname = toolcontext.opt_output.value
-               if outname == null then outname = "{compiler.mainmodule.name}.apk"
+               var outname = outfile(compiler.mainmodule)
 
                var src_apk_suffix
                if release then