From c8552e137e0176c0f5c61193e786429e2e93ac7c Mon Sep 17 00:00:00 2001 From: Owen Carey Date: Tue, 14 Oct 2025 12:11:41 -0700 Subject: [PATCH 1/6] build(repo): remove invalid PyPI classifier --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4ca1465..1f43146 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,6 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", - "Environment :: Handhelds/PDA", "Topic :: Software Development :: User Interfaces", ] dependencies = [ From 6d61ffc64ca5db8ae688d09a748ddda2a1bc0af6 Mon Sep 17 00:00:00 2001 From: Owen Carey Date: Tue, 14 Oct 2025 13:01:05 -0700 Subject: [PATCH 2/6] docs(mkdocs): add Architecture page --- docs/concepts/architecture.md | 57 +++++++++++++++++++++++++++++++++++ mkdocs.yml | 1 + 2 files changed, 58 insertions(+) create mode 100644 docs/concepts/architecture.md diff --git a/docs/concepts/architecture.md b/docs/concepts/architecture.md new file mode 100644 index 0000000..6666f10 --- /dev/null +++ b/docs/concepts/architecture.md @@ -0,0 +1,57 @@ +# Architecture + +PythonNative maps Python directly to native platform APIs. Conceptually, it is closer to NativeScript's dynamic bindings than to React Native's bridge-and-module approach. + +## High-level model + +- Direct bindings: call native APIs synchronously from Python. + - iOS: rubicon-objc exposes Objective-C/Swift classes (e.g., UIViewController, UIButton, WKWebView) and lets you create dynamic Objective-C subclasses and selectors. + - Android: Chaquopy exposes Java classes (e.g., android.widget.Button, android.webkit.WebView) via the java bridge so you can construct and call methods directly. +- Shared Python API: components like Page, StackView, Label, Button, and WebView have a small, consistent surface. Platform-specific behavior is chosen at import time using pythonnative.utils.IS_ANDROID. +- Thin native bootstrap: the host app remains native (Android Activity or iOS UIViewController). It passes a live instance/pointer into Python, and Python drives the UI from there. + +## Comparison + +- Versus React Native: RN typically exposes capabilities via native modules/TurboModules and a bridge. PythonNative does not require authoring such modules for most APIs; you can access platform classes directly from Python. +- Versus NativeScript: similar philosophy—dynamic, synchronous access to Obj-C/Java from the scripting runtime. + +## iOS flow (Rubicon-ObjC) + +- The iOS template (Swift + PythonKit) boots Python and calls your bootstrap(native_instance) with the UIViewController pointer. +- In Python, Rubicon wraps the pointer; you then interact with UIKit classes directly. + +```python +from rubicon.objc import ObjCClass, ObjCInstance + +UIButton = ObjCClass("UIButton") +vc = ObjCInstance(native_ptr) # passed from Swift template +button = UIButton.alloc().init() +# Configure target/action via a dynamic Objective-C subclass (see Button implementation) +``` + +## Android flow (Chaquopy) + +- The Android template (Kotlin + Chaquopy) initializes Python in MainActivity and provides the current Activity/Context to Python. +- Components acquire the Context implicitly and construct real Android views. + +```python +from java import jclass +from pythonnative.utils import get_android_context + +WebViewClass = jclass("android.webkit.WebView") +context = get_android_context() +webview = WebViewClass(context) +webview.loadUrl("https://example.com") +``` + +## Key implications + +- Synchronous native calls: no JS bridge; Python calls are direct. +- Lifecycle rules remain native: Activities/ViewControllers are created by the OS. Python receives and controls them; it does not instantiate Android Activities directly. +- Small, growing surface: the shared Python API favors clarity and consistency, expanding progressively. + +## Related docs + +- Guides / Android: guides/android.md +- Guides / iOS: guides/ios.md +- Concepts / Components: concepts/components.md diff --git a/mkdocs.yml b/mkdocs.yml index c8a6339..1da9d59 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -15,6 +15,7 @@ nav: - Home: index.md - Getting Started: getting-started.md - Concepts: + - Architecture: concepts/architecture.md - Components: concepts/components.md - Examples: - Overview: examples.md From 06ea22d215a1700685a7ca8070ca2189895ed25c Mon Sep 17 00:00:00 2001 From: Owen Carey Date: Fri, 17 Oct 2025 10:19:45 -0700 Subject: [PATCH 3/6] feat(core,templates)!: add push/pop navigation and lifecycle wiring --- docs/concepts/architecture.md | 2 +- docs/getting-started.md | 9 +- docs/guides/navigation.md | 55 ++++++ examples/hello-world/app/main_page.py | 22 ++- examples/hello-world/app/second_page.py | 9 +- mkdocs.yml | 1 + src/pythonnative/cli/pn.py | 9 +- src/pythonnative/page.py | 182 +++++++++++++++++- .../app/src/main/AndroidManifest.xml | 3 + .../android_template/MainActivity.kt | 62 +++++- .../android_template/PageActivity.kt | 86 +++++++++ .../ios_template/SceneDelegate.swift | 11 +- .../ios_template/ViewController.swift | 156 ++++++++++++--- tests/test_cli.py | 18 +- 14 files changed, 552 insertions(+), 73 deletions(-) create mode 100644 docs/guides/navigation.md create mode 100644 src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt diff --git a/docs/concepts/architecture.md b/docs/concepts/architecture.md index 6666f10..dbd1497 100644 --- a/docs/concepts/architecture.md +++ b/docs/concepts/architecture.md @@ -17,7 +17,7 @@ PythonNative maps Python directly to native platform APIs. Conceptually, it is c ## iOS flow (Rubicon-ObjC) -- The iOS template (Swift + PythonKit) boots Python and calls your bootstrap(native_instance) with the UIViewController pointer. +- The iOS template (Swift + PythonKit) boots Python and instantiates your `MainPage` with the current `UIViewController` pointer. - In Python, Rubicon wraps the pointer; you then interact with UIKit classes directly. ```python diff --git a/docs/getting-started.md b/docs/getting-started.md index bd5fb67..f35ff23 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -18,7 +18,7 @@ This scaffolds: - `requirements.txt` - `.gitignore` -A minimal `app/main_page.py` looks like: +A minimal `app/main_page.py` looks like (no bootstrap needed): ```python import pythonnative as pn @@ -36,13 +36,6 @@ class MainPage(pn.Page): button.set_on_click(lambda: print("Button clicked")) stack.add_view(button) self.set_root_view(stack) - - -def bootstrap(native_instance): - """Entry point called by the host app (Activity or ViewController).""" - page = MainPage(native_instance) - page.on_create() - return page ``` ## Run on a platform diff --git a/docs/guides/navigation.md b/docs/guides/navigation.md new file mode 100644 index 0000000..7f17819 --- /dev/null +++ b/docs/guides/navigation.md @@ -0,0 +1,55 @@ +# Navigation + +This guide shows how to navigate between pages and handle lifecycle events. + +## Push / Pop + +Use `push` and `pop` on your `Page` to change screens. You can pass a dotted path string or a class reference. + +```python +import pythonnative as pn + +class MainPage(pn.Page): + def on_create(self): + stack = pn.StackView() + btn = pn.Button("Go next") + btn.set_on_click(lambda: self.push("app.second_page.SecondPage", args={"message": "Hello"})) + stack.add_view(btn) + self.set_root_view(stack) +``` + +On the target page: + +```python +class SecondPage(pn.Page): + def on_create(self): + args = self.get_args() + message = args.get("message", "Second") + stack = pn.StackView() + stack.add_view(pn.Label(message)) + back = pn.Button("Back") + back.set_on_click(lambda: self.pop()) + stack.add_view(back) + self.set_root_view(stack) +``` + +## Lifecycle + +PythonNative forwards lifecycle events from the host: + +- `on_create` +- `on_start` +- `on_resume` +- `on_pause` +- `on_stop` +- `on_destroy` +- `on_restart` (Android only) +- `on_save_instance_state` +- `on_restore_instance_state` + +Android forwards Activity lifecycle via the template `MainActivity` and `PageActivity`. iOS forwards `viewWillAppear`/`viewWillDisappear` via an internal registry. + +## Notes + +- On Android, `push` launches a template `PageActivity` and passes `PY_PAGE_PATH` and optional JSON args. +- On iOS, `push` uses the root `UINavigationController` to push a new `ViewController` and passes page info via KVC. diff --git a/examples/hello-world/app/main_page.py b/examples/hello-world/app/main_page.py index 8a36892..032ef3b 100644 --- a/examples/hello-world/app/main_page.py +++ b/examples/hello-world/app/main_page.py @@ -22,8 +22,20 @@ def on_create(self): except Exception: pass stack.add_view(pn.Label("Hello from PythonNative Demo!")) - button = pn.Button("Tap me") - button.set_on_click(lambda: print("Demo button clicked")) + button = pn.Button("Go to Second Page") + + def on_next(): + # Visual confirmation that tap worked (iOS only) + try: + if UIColor is not None: + button.native_instance.setBackgroundColor_(UIColor.systemGreenColor()) + button.native_instance.setTitleColor_forState_(UIColor.whiteColor(), 0) + except Exception: + pass + # Demonstrate passing args + self.push("app.second_page.SecondPage", args={"message": "Greetings from MainPage"}) + + button.set_on_click(on_next) # Make the button visually obvious try: if UIColor is not None: @@ -57,9 +69,3 @@ def on_save_instance_state(self): def on_restore_instance_state(self): super().on_restore_instance_state() - - -def bootstrap(native_instance): - page = MainPage(native_instance) - page.on_create() - return page diff --git a/examples/hello-world/app/second_page.py b/examples/hello-world/app/second_page.py index 9be9495..dc267cc 100644 --- a/examples/hello-world/app/second_page.py +++ b/examples/hello-world/app/second_page.py @@ -8,8 +8,13 @@ def __init__(self, native_instance): def on_create(self): super().on_create() stack_view = pn.StackView() - label = pn.Label("Second page!") - stack_view.add_view(label) + # Read args passed from MainPage + args = self.get_args() + message = args.get("message", "Second page!") + stack_view.add_view(pn.Label(message)) + back_btn = pn.Button("Back") + back_btn.set_on_click(lambda: self.pop()) + stack_view.add_view(back_btn) self.set_root_view(stack_view) def on_start(self): diff --git a/mkdocs.yml b/mkdocs.yml index 1da9d59..9a29ca4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -23,6 +23,7 @@ nav: - Guides: - Android: guides/android.md - iOS: guides/ios.md + - Navigation: guides/navigation.md - API Reference: - Package: api/pythonnative.md - Meta: diff --git a/src/pythonnative/cli/pn.py b/src/pythonnative/cli/pn.py index 131ff38..e053f8d 100644 --- a/src/pythonnative/cli/pn.py +++ b/src/pythonnative/cli/pn.py @@ -41,7 +41,7 @@ def init_project(args: argparse.Namespace) -> None: os.makedirs(app_dir, exist_ok=True) - # Minimal hello world app scaffold + # Minimal hello world app scaffold (no bootstrap function; host instantiates Page directly) main_page_py = os.path.join(app_dir, "main_page.py") if not os.path.exists(main_page_py) or args.force: with open(main_page_py, "w", encoding="utf-8") as f: @@ -61,13 +61,6 @@ def on_create(self): button.set_on_click(lambda: print("Button clicked")) stack.add_view(button) self.set_root_view(stack) - - -def bootstrap(native_instance): - '''Entry point called by the host app (Android Activity or iOS ViewController).''' - page = MainPage(native_instance) - page.on_create() - return page """ ) diff --git a/src/pythonnative/page.py b/src/pythonnative/page.py index 70301f6..f13b748 100644 --- a/src/pythonnative/page.py +++ b/src/pythonnative/page.py @@ -29,7 +29,9 @@ differences and handles them appropriately. """ +import json from abc import ABC, abstractmethod +from typing import Any, Optional, Union from .utils import IS_ANDROID, set_android_context from .view import ViewBase @@ -85,7 +87,25 @@ def on_restore_instance_state(self) -> None: pass @abstractmethod + def set_args(self, args: Optional[dict]) -> None: + pass + + @abstractmethod + def push(self, page: Union[str, Any], args: Optional[dict] = None) -> None: + pass + + @abstractmethod + def pop(self) -> None: + pass + + def get_args(self) -> dict: + """Return arguments provided to this Page (empty dict if none).""" + # Concrete classes should set self._args; default empty + return getattr(self, "_args", {}) + + # Back-compat: navigate_to delegates to push def navigate_to(self, page) -> None: + self.push(page) pass @@ -105,6 +125,7 @@ def __init__(self, native_instance) -> None: # self.native_instance = self.native_class() # Stash the Activity so child views can implicitly acquire a Context set_android_context(native_instance) + self._args: dict = {} def set_root_view(self, view) -> None: self.native_instance.setContentView(view.native_instance) @@ -136,22 +157,91 @@ def on_save_instance_state(self) -> None: def on_restore_instance_state(self) -> None: print("Android on_restore_instance_state() called") - def navigate_to(self, page) -> None: - # intent = jclass("android.content.Intent")(self.native_instance, page.native_class) - intent = jclass("android.content.Intent")( - self.native_instance, - jclass("com.pythonnative.pythonnative.SecondActivity"), - ) + def set_args(self, args: Optional[dict]) -> None: + # Accept dict or JSON string for convenience when crossing language boundaries + if isinstance(args, str): + try: + self._args = json.loads(args) or {} + return + except Exception: + self._args = {} + return + self._args = args or {} + + def _resolve_page_path(self, page: Union[str, Any]) -> str: + if isinstance(page, str): + return page + # If a class or instance is passed, derive dotted path + try: + module = getattr(page, "__module__", None) + name = getattr(page, "__name__", None) + if module and name: + return f"{module}.{name}" + # Instance: use its class + cls = page.__class__ + return f"{cls.__module__}.{cls.__name__}" + except Exception: + raise ValueError("Unsupported page reference; expected dotted string or class/instance") + + def push(self, page: Union[str, Any], args: Optional[dict] = None) -> None: + page_path = self._resolve_page_path(page) + package_name = self.native_instance.getPackageName() + intent_cls = jclass("android.content.Intent") + target_activity_cls = jclass(f"{package_name}.PageActivity") + intent = intent_cls(self.native_instance, target_activity_cls) + intent.putExtra("PY_PAGE_PATH", page_path) + if args: + intent.putExtra("PY_PAGE_ARGS_JSON", json.dumps(args)) self.native_instance.startActivity(intent) + def pop(self) -> None: + self.native_instance.finish() + else: # ======================================== # iOS class # https://developer.apple.com/documentation/uikit/uiviewcontroller # ======================================== + from typing import Dict + from rubicon.objc import ObjCClass, ObjCInstance + # Global registry mapping native UIViewController pointer address to Page instances. + _IOS_PAGE_REGISTRY: Dict[int, Any] = {} + + def _ios_register_page(vc_instance: Any, page_obj: Any) -> None: + try: + ptr = int(vc_instance.ptr) # rubicon ObjCInstance -> c_void_p convertible to int + _IOS_PAGE_REGISTRY[ptr] = page_obj + except Exception: + pass + + def _ios_unregister_page(vc_instance: Any) -> None: + try: + ptr = int(vc_instance.ptr) + _IOS_PAGE_REGISTRY.pop(ptr, None) + except Exception: + pass + + def forward_lifecycle(native_addr: int, event: str) -> None: + """Forward a lifecycle event from Swift ViewController to the registered Page. + + :param native_addr: Integer pointer address of the UIViewController + :param event: One of 'on_start', 'on_resume', 'on_pause', 'on_stop', 'on_destroy', + 'on_save_instance_state', 'on_restore_instance_state'. + """ + page = _IOS_PAGE_REGISTRY.get(int(native_addr)) + if not page: + return + try: + handler = getattr(page, event, None) + if handler: + handler() + except Exception: + # Avoid surfacing exceptions across the Swift/Python boundary in lifecycle + pass + class Page(PageBase, ViewBase): def __init__(self, native_instance) -> None: super().__init__() @@ -164,6 +254,10 @@ def __init__(self, native_instance) -> None: native_instance = None self.native_instance = native_instance # self.native_instance = self.native_class.alloc().init() + self._args: dict = {} + # Register for lifecycle forwarding + if self.native_instance is not None: + _ios_register_page(self.native_instance, self) def set_root_view(self, view) -> None: # UIViewController.view is a property; access without calling. @@ -195,6 +289,8 @@ def on_stop(self) -> None: def on_destroy(self) -> None: print("iOS on_destroy() called") + if self.native_instance is not None: + _ios_unregister_page(self.native_instance) def on_restart(self) -> None: print("iOS on_restart() called") @@ -205,5 +301,75 @@ def on_save_instance_state(self) -> None: def on_restore_instance_state(self) -> None: print("iOS on_restore_instance_state() called") - def navigate_to(self, page) -> None: - self.native_instance.navigationController().pushViewControllerAnimated_(page.native_instance, True) + def set_args(self, args: Optional[dict]) -> None: + if isinstance(args, str): + try: + self._args = json.loads(args) or {} + return + except Exception: + self._args = {} + return + self._args = args or {} + + def _resolve_page_path(self, page: Union[str, Any]) -> str: + if isinstance(page, str): + return page + try: + module = getattr(page, "__module__", None) + name = getattr(page, "__name__", None) + if module and name: + return f"{module}.{name}" + cls = page.__class__ + return f"{cls.__module__}.{cls.__name__}" + except Exception: + raise ValueError("Unsupported page reference; expected dotted string or class/instance") + + def push(self, page: Union[str, Any], args: Optional[dict] = None) -> None: + page_path = self._resolve_page_path(page) + # Resolve the Swift ViewController class. Swift classes are namespaced by + # the module name (CFBundleName). Try plain name first, then Module.Name. + ViewController = None + try: + ViewController = ObjCClass("ViewController") + except Exception: + try: + NSBundle = ObjCClass("NSBundle") + bundle = NSBundle.mainBundle + module_name = None + try: + # Prefer CFBundleName; fallback to CFBundleExecutable + module_name = bundle.objectForInfoDictionaryKey_("CFBundleName") + if module_name is None: + module_name = bundle.objectForInfoDictionaryKey_("CFBundleExecutable") + except Exception: + module_name = None + if module_name: + ViewController = ObjCClass(f"{module_name}.ViewController") + except Exception: + ViewController = None + + if ViewController is None: + raise NameError("ViewController class not found; ensure Swift class is ObjC-visible") + + next_vc = ViewController.alloc().init() + try: + # Use KVC to pass metadata to Swift + next_vc.setValue_forKey_(page_path, "requestedPagePath") + if args: + next_vc.setValue_forKey_(json.dumps(args), "requestedPageArgsJSON") + except Exception: + pass + # On iOS, `navigationController` is exposed as a property; treat it as such. + nav = getattr(self.native_instance, "navigationController", None) + if nav is None: + # If no navigation controller, this push will be a no-op; rely on template to embed one. + raise RuntimeError( + "No UINavigationController available; ensure template embeds root in navigation controller" + ) + # Method name maps from pushViewController:animated: + nav.pushViewController_animated_(next_vc, True) + + def pop(self) -> None: + nav = getattr(self.native_instance, "navigationController", None) + if nav is not None: + nav.popViewControllerAnimated_(True) diff --git a/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml b/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml index 52e4ce3..30eb440 100644 --- a/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml +++ b/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml @@ -21,6 +21,9 @@ + \ No newline at end of file diff --git a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt index c0bc76e..856dc8a 100644 --- a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt +++ b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt @@ -5,12 +5,16 @@ import android.os.Bundle import android.util.Log import android.widget.TextView import com.chaquo.python.Python +import com.chaquo.python.PyObject import com.chaquo.python.android.AndroidPlatform class MainActivity : AppCompatActivity() { + private val TAG = javaClass.simpleName + private var page: PyObject? = null + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - // setContentView(R.layout.activity_main) + Log.d(TAG, "onCreate() called") // Initialize Chaquopy if (!Python.isStarted()) { @@ -18,9 +22,11 @@ class MainActivity : AppCompatActivity() { } try { val py = Python.getInstance() - val pyModule = py.getModule("app.main_page") - pyModule.callAttr("bootstrap", this) - // Python Page will set the content view via set_root_view + // Instantiate MainPage directly and call on_create + val module = py.getModule("app.main_page") + val pageClass = module.get("MainPage") + page = pageClass?.call(this) + page?.callAttr("on_create") } catch (e: Exception) { Log.e("PythonNative", "Python bootstrap failed", e) // Fallback: show a simple native label if Python bootstrap fails @@ -29,4 +35,52 @@ class MainActivity : AppCompatActivity() { setContentView(tv) } } + + override fun onStart() { + super.onStart() + Log.d(TAG, "onStart() called") + try { page?.callAttr("on_start") } catch (e: Exception) { Log.w(TAG, "on_start failed", e) } + } + + override fun onResume() { + super.onResume() + Log.d(TAG, "onResume() called") + try { page?.callAttr("on_resume") } catch (e: Exception) { Log.w(TAG, "on_resume failed", e) } + } + + override fun onPause() { + super.onPause() + Log.d(TAG, "onPause() called") + try { page?.callAttr("on_pause") } catch (e: Exception) { Log.w(TAG, "on_pause failed", e) } + } + + override fun onStop() { + super.onStop() + Log.d(TAG, "onStop() called") + try { page?.callAttr("on_stop") } catch (e: Exception) { Log.w(TAG, "on_stop failed", e) } + } + + override fun onDestroy() { + super.onDestroy() + Log.d(TAG, "onDestroy() called") + try { page?.callAttr("on_destroy") } catch (e: Exception) { Log.w(TAG, "on_destroy failed", e) } + } + + override fun onRestart() { + super.onRestart() + Log.d(TAG, "onRestart() called") + try { page?.callAttr("on_restart") } catch (e: Exception) { Log.w(TAG, "on_restart failed", e) } + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + Log.d(TAG, "onSaveInstanceState() called") + try { page?.callAttr("on_save_instance_state") } catch (e: Exception) { Log.w(TAG, "on_save_instance_state failed", e) } + } + + override fun onRestoreInstanceState(savedInstanceState: Bundle) { + super.onRestoreInstanceState(savedInstanceState) + Log.d(TAG, "onRestoreInstanceState() called") + try { page?.callAttr("on_restore_instance_state") } catch (e: Exception) { Log.w(TAG, "on_restore_instance_state failed", e) } + } } \ No newline at end of file diff --git a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt new file mode 100644 index 0000000..81c3263 --- /dev/null +++ b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt @@ -0,0 +1,86 @@ +package com.pythonnative.android_template + +import android.os.Bundle +import android.util.Log +import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity +import com.chaquo.python.Python +import com.chaquo.python.PyObject +import com.chaquo.python.android.AndroidPlatform +import org.json.JSONObject + +class PageActivity : AppCompatActivity() { + private val TAG = javaClass.simpleName + private var page: PyObject? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + Log.d(TAG, "onCreate() called") + + if (!Python.isStarted()) { + Python.start(AndroidPlatform(this)) + } + + try { + val py = Python.getInstance() + val pagePath = intent.getStringExtra("PY_PAGE_PATH") ?: "app.main_page.MainPage" + val argsJson = intent.getStringExtra("PY_PAGE_ARGS_JSON") + val moduleName = pagePath.substringBeforeLast('.') + val className = pagePath.substringAfterLast('.') + val pyModule = py.getModule(moduleName) + val pageClass = pyModule.get(className) + page = pageClass?.call(this) + if (!argsJson.isNullOrEmpty()) { + // Let Python handle JSON decoding in set_args + page?.callAttr("set_args", argsJson) + } + page?.callAttr("on_create") + } catch (e: Exception) { + Log.e(TAG, "Failed to instantiate page", e) + // Fallback UI + val tv = TextView(this) + tv.text = "Navigation target failed to load" + setContentView(tv) + } + } + + override fun onStart() { + super.onStart() + try { page?.callAttr("on_start") } catch (e: Exception) { Log.w(TAG, "on_start failed", e) } + } + + override fun onResume() { + super.onResume() + try { page?.callAttr("on_resume") } catch (e: Exception) { Log.w(TAG, "on_resume failed", e) } + } + + override fun onPause() { + super.onPause() + try { page?.callAttr("on_pause") } catch (e: Exception) { Log.w(TAG, "on_pause failed", e) } + } + + override fun onStop() { + super.onStop() + try { page?.callAttr("on_stop") } catch (e: Exception) { Log.w(TAG, "on_stop failed", e) } + } + + override fun onDestroy() { + super.onDestroy() + try { page?.callAttr("on_destroy") } catch (e: Exception) { Log.w(TAG, "on_destroy failed", e) } + } + + override fun onRestart() { + super.onRestart() + try { page?.callAttr("on_restart") } catch (e: Exception) { Log.w(TAG, "on_restart failed", e) } + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + try { page?.callAttr("on_save_instance_state") } catch (e: Exception) { Log.w(TAG, "on_save_instance_state failed", e) } + } + + override fun onRestoreInstanceState(savedInstanceState: Bundle) { + super.onRestoreInstanceState(savedInstanceState) + try { page?.callAttr("on_restore_instance_state") } catch (e: Exception) { Log.w(TAG, "on_restore_instance_state failed", e) } + } +} diff --git a/src/pythonnative/templates/ios_template/ios_template/SceneDelegate.swift b/src/pythonnative/templates/ios_template/ios_template/SceneDelegate.swift index 1302535..11a1f30 100644 --- a/src/pythonnative/templates/ios_template/ios_template/SceneDelegate.swift +++ b/src/pythonnative/templates/ios_template/ios_template/SceneDelegate.swift @@ -13,10 +13,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let _ = (scene as? UIWindowScene) else { return } + guard let windowScene = (scene as? UIWindowScene) else { return } + let window = UIWindow(windowScene: windowScene) + let root = ViewController() + let nav = UINavigationController(rootViewController: root) + window.rootViewController = nav + self.window = window + window.makeKeyAndVisible() } func sceneDidDisconnect(_ scene: UIScene) { diff --git a/src/pythonnative/templates/ios_template/ios_template/ViewController.swift b/src/pythonnative/templates/ios_template/ios_template/ViewController.swift index 0f3ba5e..88e7afc 100644 --- a/src/pythonnative/templates/ios_template/ios_template/ViewController.swift +++ b/src/pythonnative/templates/ios_template/ios_template/ViewController.swift @@ -16,9 +16,17 @@ import Python #endif class ViewController: UIViewController { + // Ensure Python.framework is configured only once per process + private static var hasInitializedPython: Bool = false + // Optional keys for dynamic page navigation + @objc dynamic var requestedPagePath: String? = nil + @objc dynamic var requestedPageArgsJSON: String? = nil + private var pythonReady: Bool = false override func viewDidLoad() { super.viewDidLoad() + // Ensure a visible background when created programmatically (storyboards set this automatically) + view.backgroundColor = .systemBackground NSLog("[PN][ViewController] viewDidLoad") if let bundleId = Bundle.main.bundleIdentifier { NSLog("[PN] Bundle Identifier: \(bundleId)") @@ -45,14 +53,19 @@ class ViewController: UIViewController { let frameworkLib = "\(bundlePath)/Frameworks/Python.framework/Python" setenv("PYTHON_LIBRARY", frameworkLib, 1) if FileManager.default.fileExists(atPath: frameworkLib) { - NSLog("[PN] Using embedded Python lib at: \(frameworkLib)") - PythonLibrary.useLibrary(at: frameworkLib) + if !ViewController.hasInitializedPython { + NSLog("[PN] Using embedded Python lib at: \(frameworkLib)") + PythonLibrary.useLibrary(at: frameworkLib) + ViewController.hasInitializedPython = true + } else { + NSLog("[PN] Python library already initialized; skipping useLibrary") + } + pythonReady = true } else { NSLog("[PN] Embedded Python library not found at: \(frameworkLib)") } } - NSLog("[PN] PythonKit available; attempting Python bootstrap of app.main_page.bootstrap(self)") - // Attempt Python bootstrap of app.main_page.bootstrap(self) + NSLog("[PN] PythonKit available; attempting Python bootstrap") let sys = Python.import("sys") NSLog("[PN] Python version: \(sys.version)") NSLog("[PN] Initial sys.path: \(sys.path)") @@ -69,38 +82,35 @@ class ViewController: UIViewController { NSLog("[PN] Could not list contents of \(appDir).") } } + // Determine which Python page to load + let pagePath: String = requestedPagePath ?? "app.main_page.MainPage" do { - let app = try Python.attemptImport("app.main_page") - let pyNone = Python.None + let moduleName = String(pagePath.split(separator: ".").dropLast().joined(separator: ".")) + let className = String(pagePath.split(separator: ".").last ?? "MainPage") + let pyModule = try Python.attemptImport(moduleName) + // Resolve class by name via builtins.getattr to avoid subscripting issues let builtins = Python.import("builtins") let getattrFn = builtins.getattr - let bootstrap = try getattrFn.throwing.dynamicallyCall(withArguments: [app, "bootstrap", pyNone]) - if bootstrap != Python.None { + let pageClass = try getattrFn.throwing.dynamicallyCall(withArguments: [pyModule, className]) + // Pass native pointer so Python Page can wrap via rubicon.objc + let ptr = Unmanaged.passUnretained(self).toOpaque() + let addr = UInt(bitPattern: ptr) + let page = try pageClass.throwing.dynamicallyCall(withArguments: [addr]) + // If args provided, pass into Page via set_args(dict) + if let jsonStr = requestedPageArgsJSON { + let json = Python.import("json") do { - let isCallable = try Python.callable.throwing.dynamicallyCall(withArguments: [bootstrap]) - if Bool(isCallable) == true { - // Pass the native UIViewController pointer into Python so it can be wrapped by rubicon.objc - let ptr = Unmanaged.passUnretained(self).toOpaque() - let addr = UInt(bitPattern: ptr) - NSLog("[PN] Passing native UIViewController pointer to Python: 0x%llx", addr) - _ = try bootstrap.throwing.dynamicallyCall(withArguments: [addr]) - NSLog("[PN] Python bootstrap succeeded; returning early from viewDidLoad") - return - } else { - NSLog("[PN] 'bootstrap' exists but is not callable") - } + let args = try json.loads.throwing.dynamicallyCall(withArguments: [jsonStr]) + _ = try page.set_args.throwing.dynamicallyCall(withArguments: [args]) } catch { - NSLog("[PN] Python callable/bootstrap raised error: \(error)") - let sys = Python.import("sys") - NSLog("[PN] sys.path at call error: \(sys.path)") + NSLog("[PN] Failed to decode requestedPageArgsJSON: \(error)") } - } else { - NSLog("[PN] Python bootstrap function not found on app.main_page") } + // Call on_create immediately so Python can insert its root view + _ = try page.on_create.throwing.dynamicallyCall(withArguments: []) + return } catch { - NSLog("[PN] Python bootstrap failed during import/getattr: \(error)") - let sys = Python.import("sys") - NSLog("[PN] sys.path at failure: \(sys.path)") + NSLog("[PN] Python bootstrap failed: \(error)") } #endif @@ -113,6 +123,96 @@ class ViewController: UIViewController { view.addSubview(label) } + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + #if canImport(PythonKit) + if pythonReady { + let ptr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque()) + do { + let pn = try Python.attemptImport("pythonnative.page") + _ = try pn.forward_lifecycle.throwing.dynamicallyCall(withArguments: [ptr, "on_start"]) + } catch {} + } + #endif + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + #if canImport(PythonKit) + if pythonReady { + let ptr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque()) + do { + let pn = try Python.attemptImport("pythonnative.page") + _ = try pn.forward_lifecycle.throwing.dynamicallyCall(withArguments: [ptr, "on_resume"]) + } catch {} + } + #endif + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + #if canImport(PythonKit) + if pythonReady { + let ptr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque()) + do { + let pn = try Python.attemptImport("pythonnative.page") + _ = try pn.forward_lifecycle.throwing.dynamicallyCall(withArguments: [ptr, "on_pause"]) + } catch {} + } + #endif + } + + override func viewDidDisappear(_ animated: Bool) { + super.viewDidDisappear(animated) + #if canImport(PythonKit) + if pythonReady { + let ptr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque()) + do { + let pn = try Python.attemptImport("pythonnative.page") + _ = try pn.forward_lifecycle.throwing.dynamicallyCall(withArguments: [ptr, "on_stop"]) + } catch {} + } + #endif + } + + override func encodeRestorableState(with coder: NSCoder) { + super.encodeRestorableState(with: coder) + #if canImport(PythonKit) + if pythonReady { + let ptr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque()) + do { + let pn = try Python.attemptImport("pythonnative.page") + _ = try pn.forward_lifecycle.throwing.dynamicallyCall(withArguments: [ptr, "on_save_instance_state"]) + } catch {} + } + #endif + } + + override func decodeRestorableState(with coder: NSCoder) { + super.decodeRestorableState(with: coder) + #if canImport(PythonKit) + if pythonReady { + let ptr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque()) + do { + let pn = try Python.attemptImport("pythonnative.page") + _ = try pn.forward_lifecycle.throwing.dynamicallyCall(withArguments: [ptr, "on_restore_instance_state"]) + } catch {} + } + #endif + } + + deinit { + #if canImport(PythonKit) + if pythonReady { + let ptr = UInt(bitPattern: Unmanaged.passUnretained(self).toOpaque()) + do { + let pn = try Python.attemptImport("pythonnative.page") + _ = try pn.forward_lifecycle.throwing.dynamicallyCall(withArguments: [ptr, "on_destroy"]) + } catch {} + } + #endif + } + } diff --git a/tests/test_cli.py b/tests/test_cli.py index 25b4991..0d00d12 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -22,7 +22,7 @@ def test_cli_init_and_clean(): assert os.path.isfile(main_page_path) with open(main_page_path, "r", encoding="utf-8") as f: content = f.read() - assert "def bootstrap(" in content + assert "class MainPage(" in content assert os.path.isfile(os.path.join(tmpdir, "pythonnative.json")) assert os.path.isfile(os.path.join(tmpdir, "requirements.txt")) assert os.path.isfile(os.path.join(tmpdir, ".gitignore")) @@ -50,7 +50,21 @@ def test_cli_run_prepare_only_android_and_ios(): # prepare-only android result = run_pn(["run", "android", "--prepare-only"], tmpdir) assert result.returncode == 0, result.stderr - assert os.path.isdir(os.path.join(tmpdir, "build", "android", "android_template")) + android_root = os.path.join(tmpdir, "build", "android", "android_template") + assert os.path.isdir(android_root) + # Ensure new navigation activity exists + page_activity = os.path.join( + android_root, + "app", + "src", + "main", + "java", + "com", + "pythonnative", + "android_template", + "PageActivity.kt", + ) + assert os.path.isfile(page_activity) # prepare-only ios result = run_pn(["run", "ios", "--prepare-only"], tmpdir) From 7a3a695477ece3cf76afd00f203523990f8789df Mon Sep 17 00:00:00 2001 From: Owen Carey Date: Fri, 17 Oct 2025 15:42:54 -0700 Subject: [PATCH 4/6] feat(templates,core): adopt Fragment-based Android navigation --- docs/api/pythonnative.md | 2 + docs/concepts/architecture.md | 6 + docs/guides/navigation.md | 44 ++++++- examples/hello-world/app/second_page.py | 30 +++++ examples/hello-world/app/third_page.py | 30 +++++ src/pythonnative/page.py | 41 +++++-- .../android_template/app/build.gradle | 3 + .../app/src/main/AndroidManifest.xml | 3 - .../android_template/MainActivity.kt | 65 ++-------- .../android_template/Navigator.kt | 26 ++++ .../android_template/PageActivity.kt | 86 -------------- .../android_template/PageFragment.kt | 111 ++++++++++++++++++ .../app/src/main/res/layout/activity_main.xml | 20 +--- .../app/src/main/res/navigation/nav_graph.xml | 22 ++++ src/pythonnative/utils.py | 26 +++- tests/test_cli.py | 18 ++- 16 files changed, 355 insertions(+), 178 deletions(-) create mode 100644 examples/hello-world/app/third_page.py create mode 100644 src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/Navigator.kt delete mode 100644 src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt create mode 100644 src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageFragment.kt create mode 100644 src/pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml diff --git a/docs/api/pythonnative.md b/docs/api/pythonnative.md index 744d7a4..bdf1462 100644 --- a/docs/api/pythonnative.md +++ b/docs/api/pythonnative.md @@ -7,3 +7,5 @@ Key flags and helpers (0.2.0): - `pythonnative.utils.IS_ANDROID`: platform flag with robust detection for Chaquopy/Android. - `pythonnative.utils.get_android_context()`: returns the current Android Activity/Context when running on Android. - `pythonnative.utils.set_android_context(ctx)`: set by `pythonnative.Page` on Android; you generally don’t call this directly. +- `pythonnative.utils.get_android_fragment_container()`: returns the current Fragment container `ViewGroup` used for page rendering. +- `pythonnative.utils.set_android_fragment_container(viewGroup)`: set by the host `PageFragment`; you generally don’t call this directly. diff --git a/docs/concepts/architecture.md b/docs/concepts/architecture.md index dbd1497..c7726dc 100644 --- a/docs/concepts/architecture.md +++ b/docs/concepts/architecture.md @@ -50,6 +50,12 @@ webview.loadUrl("https://example.com") - Lifecycle rules remain native: Activities/ViewControllers are created by the OS. Python receives and controls them; it does not instantiate Android Activities directly. - Small, growing surface: the shared Python API favors clarity and consistency, expanding progressively. +## Navigation model overview + +- See the Navigation guide for full details and comparisons with other frameworks. + - iOS: one host `UIViewController` class, many instances pushed on a `UINavigationController`. + - Android: single host `Activity` with a `NavHostFragment` and a stack of generic `PageFragment`s driven by a navigation graph. + ## Related docs - Guides / Android: guides/android.md diff --git a/docs/guides/navigation.md b/docs/guides/navigation.md index 7f17819..7ae0f4c 100644 --- a/docs/guides/navigation.md +++ b/docs/guides/navigation.md @@ -47,9 +47,49 @@ PythonNative forwards lifecycle events from the host: - `on_save_instance_state` - `on_restore_instance_state` -Android forwards Activity lifecycle via the template `MainActivity` and `PageActivity`. iOS forwards `viewWillAppear`/`viewWillDisappear` via an internal registry. +Android uses a single `MainActivity` hosting a `NavHostFragment` and a generic `PageFragment` per page. iOS forwards `viewWillAppear`/`viewWillDisappear` via an internal registry. ## Notes -- On Android, `push` launches a template `PageActivity` and passes `PY_PAGE_PATH` and optional JSON args. +- On Android, `push` navigates via `NavController` to a `PageFragment` and passes `page_path` and optional JSON `args`. - On iOS, `push` uses the root `UINavigationController` to push a new `ViewController` and passes page info via KVC. + +## Platform specifics + +### iOS (UIViewController per page) +- Each PythonNative page is hosted by a Swift `ViewController` instance. +- Pages are pushed and popped on a root `UINavigationController`. +- Lifecycle is forwarded from Swift to the registered Python page instance. +- Root view wiring: `Page.set_root_view` sizes and inserts the Python-native view into the controller’s view. + +Why this matches iOS conventions +- iOS apps commonly model screens as `UIViewController`s and use `UINavigationController` for hierarchical navigation. +- The approach integrates cleanly with add-to-app and system behaviors (e.g., state restoration). + +### Android (single Activity, Fragment stack) +- Single host `MainActivity` sets a `NavHostFragment` containing a navigation graph. +- Each PythonNative page is represented by a generic `PageFragment` which instantiates the Python page and attaches its root view. +- `push`/`pop` delegate to `NavController` (via a small `Navigator` helper). +- Arguments (`page_path`, `args_json`) live in Fragment arguments and restore across configuration changes and process death. + +Why this matches Android conventions +- Modern Android apps favor one Activity with many Fragments, using Jetpack Navigation for back stack, transitions, and deep links. +- It simplifies lifecycle, back handling, and state compared to one-Activity-per-screen. + +## Comparison to other frameworks +- React Native + - Android: single `Activity`, screens managed via `Fragment`s (e.g., `react-native-screens`). + - iOS: screens map to `UIViewController`s pushed on `UINavigationController`. +- .NET MAUI / Xamarin.Forms + - Android: single `Activity`, pages via Fragments/Navigation. + - iOS: pages map to `UIViewController`s on a `UINavigationController`. +- NativeScript + - Android: single `Activity`, pages as `Fragment`s. + - iOS: pages as `UIViewController`s on `UINavigationController`. +- Flutter (special case) + - Android: single `Activity` (`FlutterActivity`/`FlutterFragmentActivity`). + - iOS: `FlutterViewController` hosts Flutter’s internal navigator; add-to-app can push multiple `FlutterViewController`s. + +Bottom line +- iOS: one host VC class, many instances on a `UINavigationController`. +- Android: one host `Activity`, many `Fragment`s with Jetpack Navigation. diff --git a/examples/hello-world/app/second_page.py b/examples/hello-world/app/second_page.py index dc267cc..99af521 100644 --- a/examples/hello-world/app/second_page.py +++ b/examples/hello-world/app/second_page.py @@ -1,5 +1,13 @@ import pythonnative as pn +try: + # Optional: iOS styling support (safe if rubicon isn't available) + from rubicon.objc import ObjCClass + + UIColor = ObjCClass("UIColor") +except Exception: # pragma: no cover + UIColor = None + class SecondPage(pn.Page): def __init__(self, native_instance): @@ -12,6 +20,28 @@ def on_create(self): args = self.get_args() message = args.get("message", "Second page!") stack_view.add_view(pn.Label(message)) + # Navigate to Third Page + to_third_btn = pn.Button("Go to Third Page") + # Style button on iOS similar to MainPage + try: + if UIColor is not None: + to_third_btn.native_instance.setBackgroundColor_(UIColor.systemBlueColor()) + to_third_btn.native_instance.setTitleColor_forState_(UIColor.whiteColor(), 0) + except Exception: + pass + + def on_next(): + # Visual confirmation that tap worked (iOS only) + try: + if UIColor is not None: + to_third_btn.native_instance.setBackgroundColor_(UIColor.systemGreenColor()) + to_third_btn.native_instance.setTitleColor_forState_(UIColor.whiteColor(), 0) + except Exception: + pass + self.push("app.third_page.ThirdPage", args={"from": "Second"}) + + to_third_btn.set_on_click(on_next) + stack_view.add_view(to_third_btn) back_btn = pn.Button("Back") back_btn.set_on_click(lambda: self.pop()) stack_view.add_view(back_btn) diff --git a/examples/hello-world/app/third_page.py b/examples/hello-world/app/third_page.py new file mode 100644 index 0000000..6c06594 --- /dev/null +++ b/examples/hello-world/app/third_page.py @@ -0,0 +1,30 @@ +import pythonnative as pn + +try: + # Optional: iOS styling support (safe if rubicon isn't available) + from rubicon.objc import ObjCClass + + UIColor = ObjCClass("UIColor") +except Exception: # pragma: no cover + UIColor = None + + +class ThirdPage(pn.Page): + def __init__(self, native_instance): + super().__init__(native_instance) + + def on_create(self): + super().on_create() + stack = pn.StackView() + stack.add_view(pn.Label("This is the Third Page")) + back_btn = pn.Button("Back") + # Style button on iOS similar to MainPage + try: + if UIColor is not None: + back_btn.native_instance.setBackgroundColor_(UIColor.systemBlueColor()) + back_btn.native_instance.setTitleColor_forState_(UIColor.whiteColor(), 0) + except Exception: + pass + back_btn.set_on_click(lambda: self.pop()) + stack.add_view(back_btn) + self.set_root_view(stack) diff --git a/src/pythonnative/page.py b/src/pythonnative/page.py index f13b748..e5734e6 100644 --- a/src/pythonnative/page.py +++ b/src/pythonnative/page.py @@ -128,7 +128,20 @@ def __init__(self, native_instance) -> None: self._args: dict = {} def set_root_view(self, view) -> None: - self.native_instance.setContentView(view.native_instance) + # In fragment-based navigation, attach child view to the current fragment container. + try: + from .utils import get_android_fragment_container + + container = get_android_fragment_container() + # Remove previous children if any, then add the new root + try: + container.removeAllViews() + except Exception: + pass + container.addView(view.native_instance) + except Exception: + # Fallback to setting content view directly on the Activity + self.native_instance.setContentView(view.native_instance) def on_create(self) -> None: print("Android on_create() called") @@ -184,18 +197,26 @@ def _resolve_page_path(self, page: Union[str, Any]) -> str: raise ValueError("Unsupported page reference; expected dotted string or class/instance") def push(self, page: Union[str, Any], args: Optional[dict] = None) -> None: + # Delegate to Navigator.push to navigate to PageFragment with arguments page_path = self._resolve_page_path(page) - package_name = self.native_instance.getPackageName() - intent_cls = jclass("android.content.Intent") - target_activity_cls = jclass(f"{package_name}.PageActivity") - intent = intent_cls(self.native_instance, target_activity_cls) - intent.putExtra("PY_PAGE_PATH", page_path) - if args: - intent.putExtra("PY_PAGE_ARGS_JSON", json.dumps(args)) - self.native_instance.startActivity(intent) + try: + Navigator = jclass(f"{self.native_instance.getPackageName()}.Navigator") + args_json = json.dumps(args) if args else None + Navigator.push(self.native_instance, page_path, args_json) + except Exception: + # As a last resort, do nothing rather than crash + pass def pop(self) -> None: - self.native_instance.finish() + # Delegate to Navigator.pop for back-stack pop + try: + Navigator = jclass(f"{self.native_instance.getPackageName()}.Navigator") + Navigator.pop(self.native_instance) + except Exception: + try: + self.native_instance.finish() + except Exception: + pass else: # ======================================== diff --git a/src/pythonnative/templates/android_template/app/build.gradle b/src/pythonnative/templates/android_template/app/build.gradle index 4098326..2fb8251 100644 --- a/src/pythonnative/templates/android_template/app/build.gradle +++ b/src/pythonnative/templates/android_template/app/build.gradle @@ -53,6 +53,9 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + // AndroidX Navigation for Fragment-based navigation + implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7' + implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml b/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml index 30eb440..52e4ce3 100644 --- a/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml +++ b/src/pythonnative/templates/android_template/app/src/main/AndroidManifest.xml @@ -21,9 +21,6 @@ - \ No newline at end of file diff --git a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt index 856dc8a..35fc3ff 100644 --- a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt +++ b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt @@ -5,12 +5,10 @@ import android.os.Bundle import android.util.Log import android.widget.TextView import com.chaquo.python.Python -import com.chaquo.python.PyObject import com.chaquo.python.android.AndroidPlatform class MainActivity : AppCompatActivity() { private val TAG = javaClass.simpleName - private var page: PyObject? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -21,66 +19,17 @@ class MainActivity : AppCompatActivity() { Python.start(AndroidPlatform(this)) } try { + // Set content view to the NavHost layout; the initial page loads via nav_graph startDestination + setContentView(R.layout.activity_main) + // Optionally, bootstrap Python so first fragment can create the initial page onCreate val py = Python.getInstance() - // Instantiate MainPage directly and call on_create - val module = py.getModule("app.main_page") - val pageClass = module.get("MainPage") - page = pageClass?.call(this) - page?.callAttr("on_create") + // Touch module to ensure bundled Python code is available; actual instantiation happens in PageFragment + py.getModule("app.main_page") } catch (e: Exception) { - Log.e("PythonNative", "Python bootstrap failed", e) - // Fallback: show a simple native label if Python bootstrap fails + Log.e("PythonNative", "Bootstrap failed", e) val tv = TextView(this) tv.text = "Hello from PythonNative (Android template)" setContentView(tv) } } - - override fun onStart() { - super.onStart() - Log.d(TAG, "onStart() called") - try { page?.callAttr("on_start") } catch (e: Exception) { Log.w(TAG, "on_start failed", e) } - } - - override fun onResume() { - super.onResume() - Log.d(TAG, "onResume() called") - try { page?.callAttr("on_resume") } catch (e: Exception) { Log.w(TAG, "on_resume failed", e) } - } - - override fun onPause() { - super.onPause() - Log.d(TAG, "onPause() called") - try { page?.callAttr("on_pause") } catch (e: Exception) { Log.w(TAG, "on_pause failed", e) } - } - - override fun onStop() { - super.onStop() - Log.d(TAG, "onStop() called") - try { page?.callAttr("on_stop") } catch (e: Exception) { Log.w(TAG, "on_stop failed", e) } - } - - override fun onDestroy() { - super.onDestroy() - Log.d(TAG, "onDestroy() called") - try { page?.callAttr("on_destroy") } catch (e: Exception) { Log.w(TAG, "on_destroy failed", e) } - } - - override fun onRestart() { - super.onRestart() - Log.d(TAG, "onRestart() called") - try { page?.callAttr("on_restart") } catch (e: Exception) { Log.w(TAG, "on_restart failed", e) } - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - Log.d(TAG, "onSaveInstanceState() called") - try { page?.callAttr("on_save_instance_state") } catch (e: Exception) { Log.w(TAG, "on_save_instance_state failed", e) } - } - - override fun onRestoreInstanceState(savedInstanceState: Bundle) { - super.onRestoreInstanceState(savedInstanceState) - Log.d(TAG, "onRestoreInstanceState() called") - try { page?.callAttr("on_restore_instance_state") } catch (e: Exception) { Log.w(TAG, "on_restore_instance_state failed", e) } - } -} \ No newline at end of file +} diff --git a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/Navigator.kt b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/Navigator.kt new file mode 100644 index 0000000..2d3d394 --- /dev/null +++ b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/Navigator.kt @@ -0,0 +1,26 @@ +package com.pythonnative.android_template + +import android.os.Bundle +import androidx.core.os.bundleOf +import androidx.fragment.app.FragmentActivity +import androidx.navigation.fragment.NavHostFragment + +object Navigator { + @JvmStatic + fun push(activity: FragmentActivity, pagePath: String, argsJson: String?) { + val navHost = activity.supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment + val navController = navHost.navController + val args = Bundle() + args.putString("page_path", pagePath) + if (argsJson != null) { + args.putString("args_json", argsJson) + } + navController.navigate(R.id.pageFragment, args) + } + + @JvmStatic + fun pop(activity: FragmentActivity) { + val navHost = activity.supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment + navHost.navController.popBackStack() + } +} diff --git a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt deleted file mode 100644 index 81c3263..0000000 --- a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageActivity.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.pythonnative.android_template - -import android.os.Bundle -import android.util.Log -import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity -import com.chaquo.python.Python -import com.chaquo.python.PyObject -import com.chaquo.python.android.AndroidPlatform -import org.json.JSONObject - -class PageActivity : AppCompatActivity() { - private val TAG = javaClass.simpleName - private var page: PyObject? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - Log.d(TAG, "onCreate() called") - - if (!Python.isStarted()) { - Python.start(AndroidPlatform(this)) - } - - try { - val py = Python.getInstance() - val pagePath = intent.getStringExtra("PY_PAGE_PATH") ?: "app.main_page.MainPage" - val argsJson = intent.getStringExtra("PY_PAGE_ARGS_JSON") - val moduleName = pagePath.substringBeforeLast('.') - val className = pagePath.substringAfterLast('.') - val pyModule = py.getModule(moduleName) - val pageClass = pyModule.get(className) - page = pageClass?.call(this) - if (!argsJson.isNullOrEmpty()) { - // Let Python handle JSON decoding in set_args - page?.callAttr("set_args", argsJson) - } - page?.callAttr("on_create") - } catch (e: Exception) { - Log.e(TAG, "Failed to instantiate page", e) - // Fallback UI - val tv = TextView(this) - tv.text = "Navigation target failed to load" - setContentView(tv) - } - } - - override fun onStart() { - super.onStart() - try { page?.callAttr("on_start") } catch (e: Exception) { Log.w(TAG, "on_start failed", e) } - } - - override fun onResume() { - super.onResume() - try { page?.callAttr("on_resume") } catch (e: Exception) { Log.w(TAG, "on_resume failed", e) } - } - - override fun onPause() { - super.onPause() - try { page?.callAttr("on_pause") } catch (e: Exception) { Log.w(TAG, "on_pause failed", e) } - } - - override fun onStop() { - super.onStop() - try { page?.callAttr("on_stop") } catch (e: Exception) { Log.w(TAG, "on_stop failed", e) } - } - - override fun onDestroy() { - super.onDestroy() - try { page?.callAttr("on_destroy") } catch (e: Exception) { Log.w(TAG, "on_destroy failed", e) } - } - - override fun onRestart() { - super.onRestart() - try { page?.callAttr("on_restart") } catch (e: Exception) { Log.w(TAG, "on_restart failed", e) } - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - try { page?.callAttr("on_save_instance_state") } catch (e: Exception) { Log.w(TAG, "on_save_instance_state failed", e) } - } - - override fun onRestoreInstanceState(savedInstanceState: Bundle) { - super.onRestoreInstanceState(savedInstanceState) - try { page?.callAttr("on_restore_instance_state") } catch (e: Exception) { Log.w(TAG, "on_restore_instance_state failed", e) } - } -} diff --git a/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageFragment.kt b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageFragment.kt new file mode 100644 index 0000000..b5d1dab --- /dev/null +++ b/src/pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageFragment.kt @@ -0,0 +1,111 @@ +package com.pythonnative.android_template + +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import androidx.core.os.bundleOf +import androidx.fragment.app.Fragment +import com.chaquo.python.PyObject +import com.chaquo.python.Python +import com.chaquo.python.android.AndroidPlatform + +class PageFragment : Fragment() { + private val TAG = javaClass.simpleName + private var page: PyObject? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (!Python.isStarted()) { + context?.let { Python.start(AndroidPlatform(it)) } + } + try { + val py = Python.getInstance() + val pagePath = arguments?.getString("page_path") ?: "app.main_page.MainPage" + val argsJson = arguments?.getString("args_json") + val moduleName = pagePath.substringBeforeLast('.') + val className = pagePath.substringAfterLast('.') + val pyModule = py.getModule(moduleName) + val pageClass = pyModule.get(className) + // Pass the hosting Activity as native_instance for context + page = pageClass?.call(requireActivity()) + if (!argsJson.isNullOrEmpty()) { + page?.callAttr("set_args", argsJson) + } + } catch (e: Exception) { + Log.e(TAG, "Failed to instantiate page", e) + } + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Create a simple container which Python-native views can be attached to. + val frame = FrameLayout(requireContext()) + frame.layoutParams = ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT + ) + return frame + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + // Python side will call set_root_view to attach a native view to Activity. + // In fragment-based architecture, the Activity will set contentView once, + // so we ensure the fragment's container is available for Python to target. + // Expose the fragment container to Python so Page.set_root_view can attach into it + try { + val py = Python.getInstance() + val utils = py.getModule("pythonnative.utils") + utils.callAttr("set_android_fragment_container", view) + // Now that container exists, invoke on_create so Python can attach its root view + page?.callAttr("on_create") + } catch (_: Exception) { + } + } + + override fun onStart() { + super.onStart() + try { page?.callAttr("on_start") } catch (e: Exception) { Log.w(TAG, "on_start failed", e) } + } + + override fun onResume() { + super.onResume() + try { page?.callAttr("on_resume") } catch (e: Exception) { Log.w(TAG, "on_resume failed", e) } + } + + override fun onPause() { + super.onPause() + try { page?.callAttr("on_pause") } catch (e: Exception) { Log.w(TAG, "on_pause failed", e) } + } + + override fun onStop() { + super.onStop() + try { page?.callAttr("on_stop") } catch (e: Exception) { Log.w(TAG, "on_stop failed", e) } + } + + override fun onDestroyView() { + super.onDestroyView() + } + + override fun onDestroy() { + super.onDestroy() + try { page?.callAttr("on_destroy") } catch (e: Exception) { Log.w(TAG, "on_destroy failed", e) } + } + + companion object { + fun newInstance(pagePath: String, argsJson: String?): PageFragment { + val f = PageFragment() + f.arguments = bundleOf( + "page_path" to pagePath, + "args_json" to argsJson + ) + return f + } + } +} diff --git a/src/pythonnative/templates/android_template/app/src/main/res/layout/activity_main.xml b/src/pythonnative/templates/android_template/app/src/main/res/layout/activity_main.xml index 17eab17..8f9a393 100644 --- a/src/pythonnative/templates/android_template/app/src/main/res/layout/activity_main.xml +++ b/src/pythonnative/templates/android_template/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,10 @@ - - - - - \ No newline at end of file + app:defaultNavHost="true" + app:navGraph="@navigation/nav_graph" /> \ No newline at end of file diff --git a/src/pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml b/src/pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml new file mode 100644 index 0000000..cbf90d7 --- /dev/null +++ b/src/pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/src/pythonnative/utils.py b/src/pythonnative/utils.py index 01d3101..1cbde95 100644 --- a/src/pythonnative/utils.py +++ b/src/pythonnative/utils.py @@ -39,8 +39,9 @@ def _get_is_android() -> bool: IS_ANDROID: bool = _get_is_android() -# Global hook to access the current Android Activity/Context from Python code +# Global hooks to access current Android Activity/Context and Fragment container from Python code _android_context: Any = None +_android_fragment_container: Any = None def set_android_context(context: Any) -> None: @@ -55,6 +56,15 @@ def set_android_context(context: Any) -> None: _android_context = context +def set_android_fragment_container(container_view: Any) -> None: + """Record the current Fragment root container ViewGroup for rendering pages. + + The current Page's `set_root_view` will attach its native view to this container. + """ + global _android_fragment_container + _android_fragment_container = container_view + + def get_android_context() -> Any: """Return the previously set Android Activity/Context or raise if missing.""" @@ -65,3 +75,17 @@ def get_android_context() -> Any: "Android context is not set. Ensure Page is initialized from an Activity " "before constructing views." ) return _android_context + + +def get_android_fragment_container() -> Any: + """Return the previously set Fragment container ViewGroup or raise if missing. + + This is set by the host `PageFragment` when its view is created. + """ + if not IS_ANDROID: + raise RuntimeError("get_android_fragment_container() called on non-Android platform") + if _android_fragment_container is None: + raise RuntimeError( + "Android fragment container is not set. Ensure PageFragment has been created before set_root_view." + ) + return _android_fragment_container diff --git a/tests/test_cli.py b/tests/test_cli.py index 0d00d12..f9b0eaf 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -52,8 +52,8 @@ def test_cli_run_prepare_only_android_and_ios(): assert result.returncode == 0, result.stderr android_root = os.path.join(tmpdir, "build", "android", "android_template") assert os.path.isdir(android_root) - # Ensure new navigation activity exists - page_activity = os.path.join( + # Ensure new Fragment-based navigation exists + page_fragment = os.path.join( android_root, "app", "src", @@ -62,9 +62,19 @@ def test_cli_run_prepare_only_android_and_ios(): "com", "pythonnative", "android_template", - "PageActivity.kt", + "PageFragment.kt", ) - assert os.path.isfile(page_activity) + assert os.path.isfile(page_fragment) + nav_graph = os.path.join( + android_root, + "app", + "src", + "main", + "res", + "navigation", + "nav_graph.xml", + ) + assert os.path.isfile(nav_graph) # prepare-only ios result = run_pn(["run", "ios", "--prepare-only"], tmpdir) From caf69936e085a3f487123ebcb3a6d807fefcc66c Mon Sep 17 00:00:00 2001 From: Owen Carey Date: Fri, 17 Oct 2025 17:59:00 -0700 Subject: [PATCH 5/6] chore(experiments): remove experiments directory --- CONTRIBUTING.md | 2 - experiments/android_pythonnative_3/.gitignore | 15 -- .../android_pythonnative_3/app/.gitignore | 1 - .../android_pythonnative_3/app/build.gradle | 59 ------ .../app/proguard-rules.pro | 21 -- .../pythonnative/ExampleInstrumentedTest.kt | 24 --- .../app/src/main/AndroidManifest.xml | 31 --- .../pythonnative/pythonnative/MainActivity.kt | 144 -------------- .../pythonnative/SecondActivity.kt | 73 ------- .../app/src/main/python/app/__init__.py | 0 .../app/src/main/python/app/main.py | 109 ----------- .../app/src/main/python/app/main_2.py | 38 ---- .../app/src/main/python/app/main_3.py | 42 ---- .../app/src/main/python/app/second_page.py | 37 ---- .../app/src/main/python/create_button.py | 8 - .../main/python/create_constraint_layout.py | 46 ----- .../app/src/main/python/create_pn_layout.py | 13 -- .../src/main/python/create_recycler_view.py | 42 ---- .../app/src/main/python/create_widgets.py | 162 --------------- .../app/src/main/python/plot.py | 14 -- .../app/src/main/python/ui_layout.py | 24 --- .../drawable-v24/ic_launcher_foreground.xml | 30 --- .../res/drawable/ic_launcher_background.xml | 170 ---------------- .../app/src/main/res/layout/activity_main.xml | 18 -- .../src/main/res/layout/activity_second.xml | 9 - .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 - .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes .../app/src/main/res/values-night/themes.xml | 7 - .../app/src/main/res/values/colors.xml | 5 - .../app/src/main/res/values/strings.xml | 3 - .../app/src/main/res/values/themes.xml | 9 - .../app/src/main/res/xml/backup_rules.xml | 13 -- .../main/res/xml/data_extraction_rules.xml | 19 -- .../pythonnative/ExampleUnitTest.kt | 17 -- .../android_pythonnative_3/build.gradle | 7 - .../android_pythonnative_3/gradle.properties | 23 --- .../gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - experiments/android_pythonnative_3/gradlew | 185 ------------------ .../android_pythonnative_3/gradlew.bat | 89 --------- .../android_pythonnative_3/settings.gradle | 16 -- 51 files changed, 1543 deletions(-) delete mode 100644 experiments/android_pythonnative_3/.gitignore delete mode 100644 experiments/android_pythonnative_3/app/.gitignore delete mode 100644 experiments/android_pythonnative_3/app/build.gradle delete mode 100644 experiments/android_pythonnative_3/app/proguard-rules.pro delete mode 100644 experiments/android_pythonnative_3/app/src/androidTest/java/com/pythonnative/pythonnative/ExampleInstrumentedTest.kt delete mode 100644 experiments/android_pythonnative_3/app/src/main/AndroidManifest.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt delete mode 100644 experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/SecondActivity.kt delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/app/__init__.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/app/main.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/app/main_2.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/app/main_3.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/app/second_page.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/create_button.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/create_constraint_layout.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/create_pn_layout.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/create_recycler_view.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/create_widgets.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/plot.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/python/ui_layout.py delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/layout/activity_main.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/layout/activity_second.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/values-night/themes.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/values/colors.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/values/strings.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/values/themes.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/xml/backup_rules.xml delete mode 100644 experiments/android_pythonnative_3/app/src/main/res/xml/data_extraction_rules.xml delete mode 100644 experiments/android_pythonnative_3/app/src/test/java/com/pythonnative/pythonnative/ExampleUnitTest.kt delete mode 100644 experiments/android_pythonnative_3/build.gradle delete mode 100644 experiments/android_pythonnative_3/gradle.properties delete mode 100644 experiments/android_pythonnative_3/gradle/wrapper/gradle-wrapper.jar delete mode 100644 experiments/android_pythonnative_3/gradle/wrapper/gradle-wrapper.properties delete mode 100755 experiments/android_pythonnative_3/gradlew delete mode 100644 experiments/android_pythonnative_3/gradlew.bat delete mode 100644 experiments/android_pythonnative_3/settings.gradle diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cedf103..e0298c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,6 @@ cd examples/hello-world && pn run android - `templates/` – Android/iOS project templates and zips - `examples/` – runnable example apps - `hello-world/` – minimal demo app using the library -- `experiments/` – platform experiments (Android/iOS/Briefcase) - `README.md`, `pyproject.toml` – repo docs and packaging ## Coding guidelines @@ -107,7 +106,6 @@ Recommended scopes (match the smallest accurate directory/module): - Templates and examples: - `templates` – `templates/` (Android/iOS templates, zips) - `examples` – `examples/` (e.g., `hello-world/`) - - `experiments` – `experiments/` diff --git a/experiments/android_pythonnative_3/.gitignore b/experiments/android_pythonnative_3/.gitignore deleted file mode 100644 index aa724b7..0000000 --- a/experiments/android_pythonnative_3/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx -local.properties diff --git a/experiments/android_pythonnative_3/app/.gitignore b/experiments/android_pythonnative_3/app/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/experiments/android_pythonnative_3/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/build.gradle b/experiments/android_pythonnative_3/app/build.gradle deleted file mode 100644 index 50bbbfe..0000000 --- a/experiments/android_pythonnative_3/app/build.gradle +++ /dev/null @@ -1,59 +0,0 @@ -plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' - id 'com.chaquo.python' -} - -android { - namespace 'com.pythonnative.pythonnative' - compileSdk 33 - - defaultConfig { - applicationId "com.pythonnative.pythonnative" - minSdk 24 - targetSdk 33 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - ndk { - abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" - } - python { - pip { - // https://chaquo.com/chaquopy/doc/current/android.html#android-requirements -// install "matplotlib" -// install "pythonnative" - - // A directory containing a setup.py, relative to the project - // directory (must contain at least one slash): - install "/Users/owenthcarey/Documents/pythonnative-workspace/libs/pythonnative" - } - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } -} - -dependencies { - - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' -} \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/proguard-rules.pro b/experiments/android_pythonnative_3/app/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/experiments/android_pythonnative_3/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/androidTest/java/com/pythonnative/pythonnative/ExampleInstrumentedTest.kt b/experiments/android_pythonnative_3/app/src/androidTest/java/com/pythonnative/pythonnative/ExampleInstrumentedTest.kt deleted file mode 100644 index e2269ba..0000000 --- a/experiments/android_pythonnative_3/app/src/androidTest/java/com/pythonnative/pythonnative/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.pythonnative.pythonnative - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.pythonnative.pythonnative", appContext.packageName) - } -} \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/AndroidManifest.xml b/experiments/android_pythonnative_3/app/src/main/AndroidManifest.xml deleted file mode 100644 index 411d3d1..0000000 --- a/experiments/android_pythonnative_3/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt b/experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt deleted file mode 100644 index b29e93e..0000000 --- a/experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt +++ /dev/null @@ -1,144 +0,0 @@ -package com.pythonnative.pythonnative - -import android.graphics.BitmapFactory -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import android.util.Log -import android.widget.Button -import android.widget.ImageView -import android.widget.TextView -import android.graphics.Color -import android.view.View -import android.widget.LinearLayout -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.recyclerview.widget.RecyclerView -import com.chaquo.python.PyException -import com.chaquo.python.PyObject -import com.chaquo.python.Python -import com.chaquo.python.android.AndroidPlatform -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import org.json.JSONObject - -class MainActivity : AppCompatActivity() { - private val TAG = javaClass.simpleName - private lateinit var page: PyObject - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - Log.d(TAG, "onCreate() called") - -// setContentView(R.layout.activity_main) -// val layoutMain = findViewById(R.id.layout_main) - - // Initialize Chaquopy - if (!Python.isStarted()) { - Python.start(AndroidPlatform(this)) - } - val py = Python.getInstance() - - // Create an instance of the Page class -// val pyModule = py.getModule("app/main_2") -// page = pyModule.callAttr("Page", this) -// val pyLayout = page.callAttr("on_create").toJava(View::class.java) -// setContentView(pyLayout) - - // Create an instance of the Page class - val pyModule = py.getModule("app/main_3") - page = pyModule.callAttr("MainPage", this) - page.callAttr("on_create") - -// val pyModule = py.getModule("app/main") -// val pyLayout = pyModule.callAttr("on_create", this).toJava(View::class.java) -// setContentView(pyLayout) - -// val createButtonModule = py.getModule("create_button") -// val pyButton = createButtonModule.callAttr("create_button", this).toJava(Button::class.java) -// layoutMain.addView(pyButton) - -// val createWidgetsModule = py.getModule("create_widgets") -// val pyLayout = createWidgetsModule.callAttr("create_widgets", this).toJava(LinearLayout::class.java) -// layoutMain.addView(pyLayout) - -// val createConstraintLayoutModule = py.getModule("create_constraint_layout") -// val pyLayout = createConstraintLayoutModule.callAttr("create_constraint_layout", this).toJava(ConstraintLayout::class.java) -// layoutMain.addView(pyLayout) - -// val createRecyclerViewModule = py.getModule("create_recycler_view") -// val pyRecyclerView = createRecyclerViewModule.callAttr("create_recycler_view", this).toJava(RecyclerView::class.java) -// layoutMain.addView(pyRecyclerView) - - // Existing code for displaying plot -// val imageView = findViewById(R.id.image_home) -// val plotModule = py.getModule("plot") -// val xInput = "1 2 3 4 5" -// val yInput = "1 4 9 16 25" -// CoroutineScope(Dispatchers.Main).launch { -// try { -// val bytes = plotModule.callAttr( -// "plot", -// xInput, -// yInput -// ).toJava(ByteArray::class.java) -// withContext(Dispatchers.IO) { -// val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) -// withContext(Dispatchers.Main) { -// imageView.setImageBitmap(bitmap) -// } -// } -// } catch (e: PyException) { -// Log.e("Python Error", "Error executing Python code", e) -// } -// } - } - - override fun onStart() { - super.onStart() - Log.d(TAG, "onStart() called") - page.callAttr("on_start") - } - - override fun onResume() { - super.onResume() - Log.d(TAG, "onResume() called") - page.callAttr("on_resume") - } - - override fun onPause() { - super.onPause() - Log.d(TAG, "onPause() called") - page.callAttr("on_pause") - } - - override fun onStop() { - super.onStop() - Log.d(TAG, "onStop() called") - page.callAttr("on_stop") - } - - override fun onDestroy() { - super.onDestroy() - Log.d(TAG, "onDestroy() called") - page.callAttr("on_destroy") - } - - override fun onRestart() { - super.onRestart() - Log.d(TAG, "onRestart() called") - page.callAttr("on_restart") - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - Log.d(TAG, "onSaveInstanceState() called") - page.callAttr("on_save_instance_state") - } - - override fun onRestoreInstanceState(savedInstanceState: Bundle) { - super.onRestoreInstanceState(savedInstanceState) - Log.d(TAG, "onRestoreInstanceState() called") - page.callAttr("on_restore_instance_state") - } -} diff --git a/experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/SecondActivity.kt b/experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/SecondActivity.kt deleted file mode 100644 index e377e5e..0000000 --- a/experiments/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/SecondActivity.kt +++ /dev/null @@ -1,73 +0,0 @@ -package com.pythonnative.pythonnative - -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import android.util.Log -import com.chaquo.python.PyObject -import com.chaquo.python.Python -import com.chaquo.python.android.AndroidPlatform - -class SecondActivity : AppCompatActivity() { - private val TAG = javaClass.simpleName - private lateinit var page: PyObject - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - Log.d(TAG, "onCreate() called") - if (!Python.isStarted()) { - Python.start(AndroidPlatform(this)) - } - val py = Python.getInstance() - val pyModule = py.getModule("app/second_page") - page = pyModule.callAttr("SecondPage", this) - page.callAttr("on_create") - } - - override fun onStart() { - super.onStart() - Log.d(TAG, "onStart() called") - page.callAttr("on_start") - } - - override fun onResume() { - super.onResume() - Log.d(TAG, "onResume() called") - page.callAttr("on_resume") - } - - override fun onPause() { - super.onPause() - Log.d(TAG, "onPause() called") - page.callAttr("on_pause") - } - - override fun onStop() { - super.onStop() - Log.d(TAG, "onStop() called") - page.callAttr("on_stop") - } - - override fun onDestroy() { - super.onDestroy() - Log.d(TAG, "onDestroy() called") - page.callAttr("on_destroy") - } - - override fun onRestart() { - super.onRestart() - Log.d(TAG, "onRestart() called") - page.callAttr("on_restart") - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - Log.d(TAG, "onSaveInstanceState() called") - page.callAttr("on_save_instance_state") - } - - override fun onRestoreInstanceState(savedInstanceState: Bundle) { - super.onRestoreInstanceState(savedInstanceState) - Log.d(TAG, "onRestoreInstanceState() called") - page.callAttr("on_restore_instance_state") - } -} \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/python/app/__init__.py b/experiments/android_pythonnative_3/app/src/main/python/app/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/experiments/android_pythonnative_3/app/src/main/python/app/main.py b/experiments/android_pythonnative_3/app/src/main/python/app/main.py deleted file mode 100644 index 2eab767..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/app/main.py +++ /dev/null @@ -1,109 +0,0 @@ -import pythonnative as pn - - -def on_create(context): - stack_view = pn.StackView(context) - - # label = pn.Label(context, "This is a PythonNative label") - # stack_view.add_view(label) - # - # switch = pn.Switch(context) - # stack_view.add_view(switch) - # - # text_field = pn.TextField(context) - # stack_view.add_view(text_field) - # - # text_view = pn.TextView(context) - # stack_view.add_view(text_view) - - activity_indicator_view = pn.ActivityIndicatorView(context) - activity_indicator_view.start_animating() - stack_view.add_view(activity_indicator_view) - - material_activity_indicator_view = pn.MaterialActivityIndicatorView(context) - material_activity_indicator_view.start_animating() - stack_view.add_view(material_activity_indicator_view) - - progress_view = pn.ProgressView(context) - progress_view.set_progress(0.5) - stack_view.add_view(progress_view) - - material_progress_view = pn.MaterialProgressView(context) - material_progress_view.set_progress(0.5) - stack_view.add_view(material_progress_view) - - material_button = pn.MaterialButton(context, "MaterialButton") - stack_view.add_view(material_button) - - search_bar = pn.SearchBar(context) - stack_view.add_view(search_bar) - - image_view = pn.ImageView(context) - stack_view.add_view(image_view) - - picker_view = pn.PickerView(context) - stack_view.add_view(picker_view) - - # date_picker = pn.DatePicker(context) - # stack_view.add_view(date_picker) - - # time_picker = pn.TimePicker(context) - # stack_view.add_view(time_picker) - - # TODO: fix - # material_time_picker = pn.MaterialTimePicker(context) - # stack_view.add_view(material_time_picker) - - # TODO: fix - # material_date_picker = pn.MaterialDatePicker(context) - # stack_view.add_view(material_date_picker) - - # TODO: fix - # material_switch = pn.MaterialSwitch(context) - # stack_view.add_view(material_switch) - - # TODO: fix - # material_search_bar = pn.MaterialSearchBar(context) - # stack_view.add_view(material_search_bar) - - # web_view = pn.WebView(context) - # web_view.load_url("https://www.djangoproject.com/") - # stack_view.add_view(web_view) - # - # for i in range(100): - # button = pn.Button(context, "Click me") - # stack_view.add_view(button) - - return stack_view.native_instance - - -def on_start(): - print("on_start() called") - - -def on_resume(): - print("on_resume() called") - - -def on_pause(): - print("on_pause() called") - - -def on_stop(): - print("on_stop() called") - - -def on_destroy(): - print("on_destroy() called") - - -def on_restart(): - print("on_restart() called") - - -def on_save_instance_state(): - print("on_save_instance_state() called") - - -def on_restore_instance_state(): - print("on_restore_instance_state() called") diff --git a/experiments/android_pythonnative_3/app/src/main/python/app/main_2.py b/experiments/android_pythonnative_3/app/src/main/python/app/main_2.py deleted file mode 100644 index 1dba4ee..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/app/main_2.py +++ /dev/null @@ -1,38 +0,0 @@ -import pythonnative as pn - - -class Page: - def __init__(self, context): - self.context = context - - def on_create(self): - print("on_create() called") - stack_view = pn.StackView(self.context) - material_button = pn.MaterialButton(self.context, "MaterialButton") - stack_view.add_view(material_button) - # Create and add other views to the stack_view here - return stack_view.native_instance - - def on_start(self): - print("on_start() called") - - def on_resume(self): - print("on_resume() called") - - def on_pause(self): - print("on_pause() called") - - def on_stop(self): - print("on_stop() called") - - def on_destroy(self): - print("on_destroy() called") - - def on_restart(self): - print("on_restart() called") - - def on_save_instance_state(self): - print("on_save_instance_state() called") - - def on_restore_instance_state(self): - print("on_restore_instance_state() called") diff --git a/experiments/android_pythonnative_3/app/src/main/python/app/main_3.py b/experiments/android_pythonnative_3/app/src/main/python/app/main_3.py deleted file mode 100644 index 6c24d43..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/app/main_3.py +++ /dev/null @@ -1,42 +0,0 @@ -import pythonnative as pn - - -class MainPage(pn.Page): - def __init__(self, native_instance): - super().__init__(native_instance) - - def on_create(self): - super().on_create() - stack_view = pn.StackView(self.native_instance) - # list_data = ["item_{}".format(i) for i in range(100)] - # list_view = pn.ListView(self.native_instance, list_data) - # stack_view.add_view(list_view) - button = pn.Button(self.native_instance, "Button") - button.set_on_click(lambda: self.navigate_to("")) - # button.set_on_click(lambda: print("Button was clicked!")) - stack_view.add_view(button) - self.set_root_view(stack_view) - - def on_start(self): - super().on_start() - - def on_resume(self): - super().on_resume() - - def on_pause(self): - super().on_pause() - - def on_stop(self): - super().on_stop() - - def on_destroy(self): - super().on_destroy() - - def on_restart(self): - super().on_restart() - - def on_save_instance_state(self): - super().on_save_instance_state() - - def on_restore_instance_state(self): - super().on_restore_instance_state() diff --git a/experiments/android_pythonnative_3/app/src/main/python/app/second_page.py b/experiments/android_pythonnative_3/app/src/main/python/app/second_page.py deleted file mode 100644 index 442fb53..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/app/second_page.py +++ /dev/null @@ -1,37 +0,0 @@ -import pythonnative as pn - - -class SecondPage(pn.Page): - def __init__(self, native_instance): - super().__init__(native_instance) - - def on_create(self): - super().on_create() - stack_view = pn.StackView(self.native_instance) - label = pn.Label(self.native_instance, "Second page!") - stack_view.add_view(label) - self.set_root_view(stack_view) - - def on_start(self): - super().on_start() - - def on_resume(self): - super().on_resume() - - def on_pause(self): - super().on_pause() - - def on_stop(self): - super().on_stop() - - def on_destroy(self): - super().on_destroy() - - def on_restart(self): - super().on_restart() - - def on_save_instance_state(self): - super().on_save_instance_state() - - def on_restore_instance_state(self): - super().on_restore_instance_state() diff --git a/experiments/android_pythonnative_3/app/src/main/python/create_button.py b/experiments/android_pythonnative_3/app/src/main/python/create_button.py deleted file mode 100644 index 1924e4a..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/create_button.py +++ /dev/null @@ -1,8 +0,0 @@ -from java import cast, chaquopy, dynamic_proxy, jarray, jclass - - -def create_button(context): - Button = jclass("android.widget.Button") - button = Button(context) - button.setText("Button created in Python") - return button diff --git a/experiments/android_pythonnative_3/app/src/main/python/create_constraint_layout.py b/experiments/android_pythonnative_3/app/src/main/python/create_constraint_layout.py deleted file mode 100644 index 9d295bd..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/create_constraint_layout.py +++ /dev/null @@ -1,46 +0,0 @@ -from java import jclass - - -BottomNavigationView = jclass( - "com.google.android.material.bottomnavigation.BottomNavigationView" -) -ConstraintLayout = jclass("androidx.constraintlayout.widget.ConstraintLayout") -View = jclass("android.view.View") -ViewGroup = jclass("android.view.ViewGroup") - - -def create_constraint_layout(context): - # Create ConstraintLayout - layout = ConstraintLayout(context) - layout_params = ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - layout.setLayoutParams(layout_params) - - # Create BottomNavigationView - bottom_nav = BottomNavigationView(context) - bottom_nav.setId( - View.generateViewId() - ) # Add this line to generate unique id for the view - - # Create Menu for BottomNavigationView - menu = bottom_nav.getMenu() - - # Add items to the menu - menu.add(0, 0, 0, "Home") - menu.add(0, 1, 0, "Search") - menu.add(0, 2, 0, "Notifications") - menu.add(0, 3, 0, "Messages") - menu.add(0, 4, 0, "Profile") - - # Add BottomNavigationView to ConstraintLayout - nav_layout_params = ConstraintLayout.LayoutParams( - ConstraintLayout.LayoutParams.MATCH_PARENT, - ConstraintLayout.LayoutParams.WRAP_CONTENT, - ) - # Set the constraints here - nav_layout_params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID - bottom_nav.setLayoutParams(nav_layout_params) - layout.addView(bottom_nav) - - return layout diff --git a/experiments/android_pythonnative_3/app/src/main/python/create_pn_layout.py b/experiments/android_pythonnative_3/app/src/main/python/create_pn_layout.py deleted file mode 100644 index b4a7fde..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/create_pn_layout.py +++ /dev/null @@ -1,13 +0,0 @@ -import pythonnative as pn - - -def create_pn_layout(context): - layout = pn.StackView(context) - - label = pn.Label(context, "This is a PythonNative label") - layout.add_view(label) - - button = pn.Button(context, "Click me") - layout.add_view(button) - - return layout.native_instance diff --git a/experiments/android_pythonnative_3/app/src/main/python/create_recycler_view.py b/experiments/android_pythonnative_3/app/src/main/python/create_recycler_view.py deleted file mode 100644 index 973c75a..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/create_recycler_view.py +++ /dev/null @@ -1,42 +0,0 @@ -from java import jclass, static_proxy, Override - -LinearLayoutManager = jclass("androidx.recyclerview.widget.LinearLayoutManager") -RecyclerView = jclass("androidx.recyclerview.widget.RecyclerView") -TextView = jclass("android.widget.TextView") - - -# RecyclerView ViewHolder -class MyViewHolder(static_proxy(RecyclerView.ViewHolder)): - def __init__(self, item_view): - super(MyViewHolder, self).__init__(item_view) - self.my_text_view = TextView(item_view.getContext()) - - -# RecyclerView Adapter -class MyAdapter(static_proxy(RecyclerView.Adapter)): - def __init__(self, my_dataset): - self.my_dataset = my_dataset - - @Override(RecyclerView.Adapter) - def onCreateViewHolder(self, parent, viewType): - text_view = TextView(parent.getContext()) - return MyViewHolder(text_view) - - @Override(RecyclerView.Adapter) - def onBindViewHolder(self, holder, position): - holder.my_text_view.setText(self.my_dataset[position]) - - @Override(RecyclerView.Adapter) - def getItemCount(self): - return len(self.my_dataset) - - -# Create the RecyclerView -def create_recycler_view(context): - my_recycler_view = RecyclerView(context) - my_layout_manager = LinearLayoutManager(context) - my_recycler_view.setLayoutManager(my_layout_manager) - my_dataset = ["Data 1", "Data 2", "Data 3"] - my_adapter = MyAdapter(my_dataset) - my_recycler_view.setAdapter(my_adapter) - return my_recycler_view diff --git a/experiments/android_pythonnative_3/app/src/main/python/create_widgets.py b/experiments/android_pythonnative_3/app/src/main/python/create_widgets.py deleted file mode 100644 index 22668b3..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/create_widgets.py +++ /dev/null @@ -1,162 +0,0 @@ -from java import dynamic_proxy, jclass, static_proxy -import random - -# Import View class which contains OnClickListener -View = jclass('android.view.View') -Color = jclass('android.graphics.Color') - - -class ButtonClickListener(dynamic_proxy(View.OnClickListener)): - def __init__(self, button): - super().__init__() - self.button = button - - def onClick(self, view): - # Generate a random hex color. - color = "#" + "".join( - [random.choice("0123456789ABCDEF") for _ in range(6)]) - - # Set the button's background color. - self.button.setBackgroundColor(Color.parseColor(color)) - - # Print something to the console. - print("Button clicked! New color is " + color) - - -def create_widgets(context): - # Java Classes - RelativeLayout = jclass("android.widget.RelativeLayout") - FrameLayout = jclass("android.widget.FrameLayout") - GridLayout = jclass("android.widget.GridLayout") - LinearLayout = jclass("android.widget.LinearLayout") - Button = jclass("android.widget.Button") - TextView = jclass("android.widget.TextView") - EditText = jclass("android.widget.EditText") - CheckBox = jclass("android.widget.CheckBox") - RadioButton = jclass("android.widget.RadioButton") - ImageView = jclass("android.widget.ImageView") - ProgressBar = jclass("android.widget.ProgressBar") - Switch = jclass("android.widget.Switch") - ToggleButton = jclass("android.widget.ToggleButton") - SeekBar = jclass("android.widget.SeekBar") - CardView = jclass("androidx.cardview.widget.CardView") - ViewPager = jclass("androidx.viewpager.widget.ViewPager") - DatePicker = jclass("android.widget.DatePicker") - TimePicker = jclass("android.widget.TimePicker") - Spinner = jclass("android.widget.Spinner") - AutoCompleteTextView = jclass("android.widget.AutoCompleteTextView") - RatingBar = jclass("android.widget.RatingBar") - AbsoluteLayout = jclass("android.widget.AbsoluteLayout") - ScrollView = jclass("android.widget.ScrollView") - HorizontalScrollView = jclass("android.widget.HorizontalScrollView") - TableLayout = jclass("android.widget.TableLayout") - TableRow = jclass("android.widget.TableRow") - ViewFlipper = jclass("android.widget.ViewFlipper") - ViewSwitcher = jclass("android.widget.ViewSwitcher") - WebView = jclass("android.webkit.WebView") - RecyclerView = jclass("androidx.recyclerview.widget.RecyclerView") - DrawerLayout = jclass("androidx.drawerlayout.widget.DrawerLayout") - CoordinatorLayout = jclass("androidx.coordinatorlayout.widget.CoordinatorLayout") - BottomNavigationView = jclass( - "com.google.android.material.bottomnavigation.BottomNavigationView" - ) - Chip = jclass("com.google.android.material.chip.Chip") - FloatingActionButton = jclass( - "com.google.android.material.floatingactionbutton.FloatingActionButton" - ) - Snackbar = jclass("com.google.android.material.snackbar.Snackbar") - NavigationView = jclass("com.google.android.material.navigation.NavigationView") - ConstraintLayout = jclass("androidx.constraintlayout.widget.ConstraintLayout") - TextInputLayout = jclass("com.google.android.material.textfield.TextInputLayout") - MaterialCardView = jclass("com.google.android.material.card.MaterialCardView") - BottomSheetDialogFragment = jclass( - "com.google.android.material.bottomsheet.BottomSheetDialogFragment" - ) - - # Create LinearLayout - layout = LinearLayout(context) - layout_params = LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT - ) - layout.setLayoutParams(layout_params) - layout.setOrientation(LinearLayout.VERTICAL) - - # Create Button - button = Button(context) - button.setText("Button created in Python") - button.setOnClickListener(ButtonClickListener(button)) - layout.addView(button) - - # Create TextView - text_view = TextView(context) - text_view.setText("TextView created in Python") - layout.addView(text_view) - - # Create EditText - edit_text = EditText(context) - edit_text.setHint("EditText created in Python") - layout.addView(edit_text) - - # Create CheckBox - check_box = CheckBox(context) - check_box.setText("CheckBox created in Python") - layout.addView(check_box) - - # Create RadioButton - radio_button = RadioButton(context) - radio_button.setText("RadioButton created in Python") - layout.addView(radio_button) - - # Create ImageView (X) - image_view = ImageView(context) - layout.addView(image_view) - - # Create ProgressBar - progress_bar = ProgressBar(context) - layout.addView(progress_bar) - - # Create Switch - switch = Switch(context) - switch.setText("Switch created in Python") - layout.addView(switch) - - # Create ToggleButton - toggle_button = ToggleButton(context) - toggle_button.setTextOn("On") - toggle_button.setTextOff("Off") - layout.addView(toggle_button) - - # Create SeekBar (X) - seek_bar = SeekBar(context) - layout.addView(seek_bar) - - # Create CardView (X) - card_view = CardView(context) - layout.addView(card_view) - - # Create ViewPager (X) - view_pager = ViewPager(context) - layout.addView(view_pager) - - # Create DatePicker (X) - date_picker = DatePicker(context) - layout.addView(date_picker) - - # Create TimePicker (X) - time_picker = TimePicker(context) - layout.addView(time_picker) - - # Create Spinner (X) - spinner = Spinner(context) - layout.addView(spinner) - - # Create AutoCompleteTextView (X) - auto_complete_text_view = AutoCompleteTextView(context) - layout.addView(auto_complete_text_view) - - # Create RatingBar (X) - rating_bar = RatingBar(context) - layout.addView(rating_bar) - - # Return layout - return layout diff --git a/experiments/android_pythonnative_3/app/src/main/python/plot.py b/experiments/android_pythonnative_3/app/src/main/python/plot.py deleted file mode 100644 index fdfdf94..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/plot.py +++ /dev/null @@ -1,14 +0,0 @@ -import io -import matplotlib.pyplot as plt - - -def plot(x, y): - xa = [float(word) for word in x.split()] - ya = [float(word) for word in y.split()] - - fig, ax = plt.subplots() - ax.plot(xa, ya) - - f = io.BytesIO() - plt.savefig(f, format="png") - return f.getvalue() diff --git a/experiments/android_pythonnative_3/app/src/main/python/ui_layout.py b/experiments/android_pythonnative_3/app/src/main/python/ui_layout.py deleted file mode 100644 index 4dd882c..0000000 --- a/experiments/android_pythonnative_3/app/src/main/python/ui_layout.py +++ /dev/null @@ -1,24 +0,0 @@ -import json - - -def on_button_click(): - print("Button clicked!") - - -def generate_layout(): - layout = { - "widgets": [ - { - "type": "Button", - "properties": { - "text": "Click me!", - "textColor": "#FFFFFF", - "backgroundColor": "#DB4437", - }, - "eventHandlers": { - "onClick": "on_button_click", - }, - }, - ] - } - return json.dumps(layout) diff --git a/experiments/android_pythonnative_3/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/experiments/android_pythonnative_3/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/drawable/ic_launcher_background.xml b/experiments/android_pythonnative_3/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/experiments/android_pythonnative_3/app/src/main/res/layout/activity_main.xml b/experiments/android_pythonnative_3/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 0e81562..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/layout/activity_second.xml b/experiments/android_pythonnative_3/app/src/main/res/layout/activity_second.xml deleted file mode 100644 index 9569f77..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/layout/activity_second.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6f3b755..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/experiments/android_pythonnative_3/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/experiments/android_pythonnative_3/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/experiments/android_pythonnative_3/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/experiments/android_pythonnative_3/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/experiments/android_pythonnative_3/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/experiments/android_pythonnative_3/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/experiments/android_pythonnative_3/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/experiments/android_pythonnative_3/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/experiments/android_pythonnative_3/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/experiments/android_pythonnative_3/app/src/main/res/values-night/themes.xml b/experiments/android_pythonnative_3/app/src/main/res/values-night/themes.xml deleted file mode 100644 index c128015..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/values/colors.xml b/experiments/android_pythonnative_3/app/src/main/res/values/colors.xml deleted file mode 100644 index c8524cd..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/values/strings.xml b/experiments/android_pythonnative_3/app/src/main/res/values/strings.xml deleted file mode 100644 index 115bda4..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - pythonnative - \ No newline at end of file diff --git a/experiments/android_pythonnative_3/app/src/main/res/values/themes.xml b/experiments/android_pythonnative_3/app/src/main/res/values/themes.xml deleted file mode 100644 index 80a3862..0000000 --- a/experiments/android_pythonnative_3/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - -