From f1b9b9eba751c5e8ca417913fdca45546b608cf4 Mon Sep 17 00:00:00 2001 From: Gabriel Pettier Date: Sun, 1 Sep 2019 16:00:40 +0200 Subject: [PATCH 1/3] wip --- .../java/org/kivy/android/PythonActivity.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java index 33d0855ef3..93531e9f2d 100644 --- a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java +++ b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java @@ -151,12 +151,18 @@ protected void onPostExecute(String result) { File path = new File(getIntent().getData().getSchemeSpecificPart()); Project p = Project.scanDirectory(path); + String custom_orientation = this.getExtra("orientation"); + String entry_point = getEntryPoint(p.dir); SDLActivity.nativeSetenv("ANDROID_ENTRYPOINT", p.dir + "/" + entry_point); SDLActivity.nativeSetenv("ANDROID_ARGUMENT", p.dir); SDLActivity.nativeSetenv("ANDROID_APP_PATH", p.dir); - if (p != null) { + if (custom_orientation == "landscape") + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + else if (custom_orientation == "portrait") + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + else if (p != null) { if (p.landscape) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); } else { @@ -499,9 +505,15 @@ public String getEntryPoint(String search_dir) { * have a compiled version or not. */ List entryPoints = new ArrayList(); - entryPoints.add("main.pyo"); // python 2 compiled files - entryPoints.add("main.pyc"); // python 3 compiled files - for (String value : entryPoints) { + String extra = this.getExtra("entrypoint"); + if (extra != "") + entryPoints.add(extra); // custom entrypoint + + else { + entryPoints.add("main.pyo"); // python 2 compiled files + entryPoints.add("main.pyc"); // python 3 compiled files + } + for (String value : entryPoints) { File mainFile = new File(search_dir + "/" + value); if (mainFile.exists()) { return value; From bedd655f325ad7a47f5d29b0a8c0929602556f6a Mon Sep 17 00:00:00 2001 From: Gabriel Pettier Date: Sun, 1 Sep 2019 17:45:19 +0200 Subject: [PATCH 2/3] call getExtra on mActivity not self --- .../build/src/main/java/org/kivy/android/PythonActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java index 93531e9f2d..0c81ea2b31 100644 --- a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java +++ b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java @@ -151,7 +151,7 @@ protected void onPostExecute(String result) { File path = new File(getIntent().getData().getSchemeSpecificPart()); Project p = Project.scanDirectory(path); - String custom_orientation = this.getExtra("orientation"); + String custom_orientation = PythonActivity.mActivity.getExtra("orientation"); String entry_point = getEntryPoint(p.dir); SDLActivity.nativeSetenv("ANDROID_ENTRYPOINT", p.dir + "/" + entry_point); @@ -505,7 +505,7 @@ public String getEntryPoint(String search_dir) { * have a compiled version or not. */ List entryPoints = new ArrayList(); - String extra = this.getExtra("entrypoint"); + String extra = PythonActivity.mActivity.getExtra("entrypoint"); if (extra != "") entryPoints.add(extra); // custom entrypoint From 26a979f0aa21dfb82c6a2a5c5daa8546966ff1aa Mon Sep 17 00:00:00 2001 From: Gabriel Pettier Date: Sun, 1 Sep 2019 18:25:25 +0200 Subject: [PATCH 3/3] getStringExtra --- .../build/src/main/java/org/kivy/android/PythonActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java index 0c81ea2b31..1ff86bc976 100644 --- a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java +++ b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java @@ -151,7 +151,7 @@ protected void onPostExecute(String result) { File path = new File(getIntent().getData().getSchemeSpecificPart()); Project p = Project.scanDirectory(path); - String custom_orientation = PythonActivity.mActivity.getExtra("orientation"); + String custom_orientation = PythonActivity.mActivity.getStringExtra("orientation"); String entry_point = getEntryPoint(p.dir); SDLActivity.nativeSetenv("ANDROID_ENTRYPOINT", p.dir + "/" + entry_point); @@ -505,7 +505,7 @@ public String getEntryPoint(String search_dir) { * have a compiled version or not. */ List entryPoints = new ArrayList(); - String extra = PythonActivity.mActivity.getExtra("entrypoint"); + String extra = PythonActivity.mActivity.getStringExtra("entrypoint"); if (extra != "") entryPoints.add(extra); // custom entrypoint