fixed entrypoint option and added several others for integration of native android activities

Author: zworkb

pythonforandroid/bootstraps/common/build/build.py

@@ -665,6 +665,30 @@ def parse_args(args=None):
                               'https://developer.android.com/guide/'
                               'topics/manifest/'
                               'activity-element.html'))
+
+    ap.add_argument('--android-entrypoint', dest='android_entrypoint',
+                    default='org.kivy.android.PythonActivity',
+                    help='defines which java class sill be used for startup, usually a subclass of PythonActivity')
+    ap.add_argument('--android-apptheme', dest='android_apptheme',
+                    default='@android:style/Theme.NoTitleBar',
+                    help='defines which app theme should be selected for the main activity')
+    ap.add_argument('--add-java-source-compat', dest='java_source_compat',
+                    default=[],
+                    action='append',
+                    help='add java source compatibility to gradle.build')
+    ap.add_argument('--add-java-target-compat', dest='java_target_compat',
+                    default=[],
+                    action='append',
+                    help='add java target compatibility to gradle.build')
+    ap.add_argument('--add-gradle-repository', dest='gradle_repositories',
+                    default=[],
+                    action='append',
+                    help='add a repository for gradle')
+    ap.add_argument('--add-packaging-option', dest='packaging_options',
+                    default=[],
+                    action='append',
+                    help='android packaging options')
+
     ap.add_argument('--wakelock', dest='wakelock', action='store_true',
                     help=('Indicate if the application needs the device '
                           'to stay on'))

pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle

@@ -13,68 +13,85 @@ allprojects {
     repositories {
         google()
         jcenter()
-	    flatDir {
-	    	dirs 'libs'
-	    }
+        {%- for repo in args.gradle_repositories %}
+        {{repo}}
+        {%- endfor %}
+        flatDir {
+            dirs 'libs'
+        }
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-	compileSdkVersion {{ android_api }}
-	buildToolsVersion '{{ build_tools_version }}'
-	defaultConfig {
-		minSdkVersion {{ args.min_sdk_version }}
-		targetSdkVersion {{ android_api }}
-		versionCode {{ args.numeric_version }}
-		versionName '{{ args.version }}'
-	}
+    compileSdkVersion {{ android_api }}
+    buildToolsVersion '{{ build_tools_version }}'
+    defaultConfig {
+        minSdkVersion {{ args.min_sdk_version }}
+        targetSdkVersion {{ android_api }}
+        versionCode {{ args.numeric_version }}
+        versionName '{{ args.version }}'
+    }
 
-	{% if args.sign -%}
-	signingConfigs {
-		release {
-			storeFile file(System.getenv("P4A_RELEASE_KEYSTORE"))
-			keyAlias System.getenv("P4A_RELEASE_KEYALIAS")
-			storePassword System.getenv("P4A_RELEASE_KEYSTORE_PASSWD")
-			keyPassword System.getenv("P4A_RELEASE_KEYALIAS_PASSWD")
-		}
-	}
+    {% if args.sign -%}
+    signingConfigs {
+        release {
+            storeFile file(System.getenv("P4A_RELEASE_KEYSTORE"))
+            keyAlias System.getenv("P4A_RELEASE_KEYALIAS")
+            storePassword System.getenv("P4A_RELEASE_KEYSTORE_PASSWD")
+            keyPassword System.getenv("P4A_RELEASE_KEYALIAS_PASSWD")
+        }
+    }
     {%- endif %}
 
-	buildTypes {
-		debug {
-		}
-		release {
-			{% if args.sign -%}
-			signingConfig signingConfigs.release
-			{%- endif %}
-		}
-	}
+    {% if args.packaging_options -%}
+    packagingOptions {
+        {%- for option in args.packaging_options %}
+        {{option}}
+        {%- endfor %}
+    }
+    {%- endif %}
+
+    buildTypes {
+        debug {
+        }
+        release {
+            {% if args.sign -%}
+            signingConfig signingConfigs.release
+            {%- endif %}
+        }
+    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
+        {%- for compat in args.java_source_compat %}
+        sourceCompatibility {{compat}}
+        {%- endfor %}
+        {%- for compat in args.java_target_compat %}
+        targetCompatibility {{compat}}
+        {%- endfor %}
     }
 
     sourceSets {
         main {
             jniLibs.srcDir 'libs'
-            }
+        }
     }
 
 }
 
 dependencies {
-	{%- for aar in aars %}
-	compile(name: '{{ aar }}', ext: 'aar')
-	{%- endfor -%}
-        {%- for jar in jars %}
-        compile files('src/main/libs/{{ jar }}')
-        {%- endfor -%}
-	{%- if args.depends -%}
-	{%- for depend in args.depends %}
-	compile '{{ depend }}'
-	{%- endfor %}
-	{%- endif %}
+    {%- for aar in aars %}
+    compile(name: '{{ aar }}', ext: 'aar')
+    {%- endfor -%}
+    {%- for jar in jars %}
+    compile files('src/main/libs/{{ jar }}')
+    {%- endfor -%}
+    {%- if args.depends -%}
+    {%- for depend in args.depends %}
+    compile '{{ depend }}'
+    {%- endfor %}
+    {%- endif %}
 }

pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml

@@ -54,7 +54,7 @@
     <application android:label="@string/app_name"
                  android:icon="@drawable/icon"
                  android:allowBackup="{{ args.allow_backup }}"
-                 android:theme="@android:style/Theme.NoTitleBar{% if not args.window %}.Fullscreen{% endif %}"
+                 android:theme="{{args.android_apptheme}}{% if not args.window %}.Fullscreen{% endif %}"
                  android:hardwareAccelerated="true" >
         {% for l in args.android_used_libs %}
         <uses-library android:name="{{ l }}" />
@@ -64,7 +64,7 @@
         <meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}
         <meta-data android:name="wakelock" android:value="{% if args.wakelock %}1{% else %}0{% endif %}"/>
 
-        <activity android:name="org.kivy.android.PythonActivity"
+        <activity android:name="{{args.android_entrypoint}}"
                   android:label="@string/app_name"
                   android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode{% if args.min_sdk_version >= 8 %}|uiMode{% endif %}{% if args.min_sdk_version >= 13 %}|screenSize|smallestScreenSize{% endif %}{% if args.min_sdk_version >= 17 %}|layoutDirection{% endif %}{% if args.min_sdk_version >= 24 %}|density{% endif %}"
                   android:screenOrientation="{{ args.orientation }}"