pythonnative 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

pythonnative/__init__.py

@@ -1,7 +1,7 @@
 from importlib import import_module
 from typing import Any, Dict
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 __all__ = [
     "ActivityIndicatorView",

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 @@ 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 (Android Activity or iOS ViewController).'''
-    page = MainPage(native_instance)
-    page.on_create()
-    return page
 """
             )
 

pythonnative/page.py

@@ -29,7 +29,9 @@ Just ensure that your PythonNative UI framework is aware of these platform
 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 @@ class PageBase(ABC):
         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,9 +125,23 @@ if IS_ANDROID:
             # 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)
+            # 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")
@@ -136,13 +170,53 @@ if IS_ANDROID:
         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"),
-            )
-            self.native_instance.startActivity(intent)
+        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:
+            # Delegate to Navigator.push to navigate to PageFragment with arguments
+            page_path = self._resolve_page_path(page)
+            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:
+            # 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:
     # ========================================
@@ -150,8 +224,45 @@ else:
     # 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 +275,10 @@ else:
                     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 +310,8 @@ else:
 
         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 +322,75 @@ else:
         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)

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'

pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt

@@ -8,25 +8,28 @@ import com.chaquo.python.Python
 import com.chaquo.python.android.AndroidPlatform
 
 class MainActivity : AppCompatActivity() {
+    private val TAG = javaClass.simpleName
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        // setContentView(R.layout.activity_main)
+        Log.d(TAG, "onCreate() called")
 
         // Initialize Chaquopy
         if (!Python.isStarted()) {
             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()
-            val pyModule = py.getModule("app.main_page")
-            pyModule.callAttr("bootstrap", this)
-            // Python Page will set the content view via set_root_view
+            // 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)
         }
     }
-}
+}

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()
+    }
+}

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
+        }
+    }
+}

pythonnative/templates/android_template/app/src/main/res/layout/activity_main.xml

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.fragment.app.FragmentContainerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_host_fragment"
+    android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+    app:defaultNavHost="true"
+    app:navGraph="@navigation/nav_graph" />

pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_graph"
+    app:startDestination="@id/pageFragment">
+
+    <fragment
+        android:id="@+id/pageFragment"
+        android:name="com.pythonnative.android_template.PageFragment"
+        android:label="PageFragment">
+        <argument
+            android:name="page_path"
+            app:argType="string"
+            android:defaultValue="app.main_page.MainPage" />
+        <argument
+            android:name="args_json"
+            app:argType="string"
+            android:nullable="true" />
+    </fragment>
+
+</navigation>

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) {

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
+    }
+
 
 }
 

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

{pythonnative-0.2.0.dist-info → pythonnative-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonnative
-Version: 0.2.0
+Version: 0.3.0
 Summary: Cross-platform native UI toolkit for Android and iOS
 Author: Owen Carey
 License: MIT License

{pythonnative-0.2.0.dist-info → pythonnative-0.3.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pythonnative/__init__.py,sha256=Y4mxn_dtPj4XtsQSCIST7rlJuptMgh_utlDtgNxtvRM,2050
+pythonnative/__init__.py,sha256=wU7uPSQH-YZsJs1nCdZ9XveG3QTKETbFQjUzQiDY06s,2050
 pythonnative/activity_indicator_view.py,sha256=cYRiyGf5o4dlEy7v6v9yUt212E4cK6Hpn85P7uRIin0,2314
 pythonnative/button.py,sha256=UMwgjb6EhxLQgf3OIXtnoydy5pVEg_1B3fsOp2dLISo,3766
 pythonnative/collection_view.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,7 +15,7 @@ pythonnative/material_search_bar.py,sha256=j8a52smIUAem48AJ693g-aeNswNHpHp3N8M0q
 pythonnative/material_switch.py,sha256=b4K6pKX_RQbmlEiL9nNEZiyOhkvJd5t_m4Ak7RoD7FE,1944
 pythonnative/material_time_picker.py,sha256=bCUcrqsIRbFnt4g-vXfiSuuJrbaJJJjLrSSV_nSdOe8,2319
 pythonnative/material_toolbar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pythonnative/page.py,sha256=Mm8FXAAgYsf57t6ViVIrGzfTtEy8a9a_Y69YWrPvWMc,7071
+pythonnative/page.py,sha256=pJyEmpbMWRC3-iJnZbkBfXr0DcDQK9uYSgdd2u3yzAA,14962
 pythonnative/picker_view.py,sha256=gGryk2SmBi0aWY_faJapWcWGGFCuabx_FaRidnXzIhU,1960
 pythonnative/progress_view.py,sha256=Kyq4Ed4DzDXBr64KYEbyUJJW9WLxN-01QWsHgpU7ymM,2251
 pythonnative/scroll_view.py,sha256=elvqWPihQBREqUPQtAwdPtHVp2prIkg5arKhI-u8His,2024
@@ -25,24 +25,26 @@ pythonnative/switch.py,sha256=Ca-XJnHMQdqJrLzDMRZGmm2d7J7GIZ_B0F1xxXF85Zs,1896
 pythonnative/text_field.py,sha256=CaLH9erxY0hfKWYkkrF9rTkzgmt7Nax8qjqy-qW_Lmc,1962
 pythonnative/text_view.py,sha256=ZO3Ff_vl4CX1evYYTHZqzgYhpxyvk0bSKI2oIMHW9bs,2140
 pythonnative/time_picker.py,sha256=StGElEDNKnuw1j6iVPyIMwBAyZ5yxEwx2XTzfam2a0M,2258
-pythonnative/utils.py,sha256=XbYDUv710VgMXRK__WUX51aW9rzmmX2xqgnaiQ3NTMU,2089
+pythonnative/utils.py,sha256=0Ub6DDg4uX4ToqoyioQzUJ-_ERzXlJ2r70pBSmeiaYY,3038
 pythonnative/view.py,sha256=PJ0vNdRkyKKtiIxTYYDU0iDvR2r4WG8ZVUmMSeeJhmE,586
 pythonnative/web_view.py,sha256=knBh-R1jP_JChADIo1SqwI5mCbonJuI81Q6vdWot7UU,1775
 pythonnative/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pythonnative/cli/pn.py,sha256=7CBzpqCUGx3zBwbAixnkq9sSEajyhd2xhCBCxVlzDdY,27274
+pythonnative/cli/pn.py,sha256=UbkZtkYMNuuC9HylEhF44vQ39JRG4UTdA8Hb1lOLDrI,27136
 pythonnative/templates/android_template/build.gradle,sha256=nM8OKenPZzdTJjzZlpl3EpLAoj1YL9A1arX0UPSvaL4,352
 pythonnative/templates/android_template/gradle.properties,sha256=REPaKLRfQiiVfIV8wYmgwzPWvF1f3bhh_kAMV9p4HME,1358
 pythonnative/templates/android_template/gradlew,sha256=YxNShxF6Hm0SyEWA8fScYdG6AiGOzShmBgXpf5dufWU,5766
 pythonnative/templates/android_template/gradlew.bat,sha256=xGonx5AHdG3lkisXq7YjDWStixujrRWF7lxlQ8KpsSk,2674
 pythonnative/templates/android_template/settings.gradle,sha256=GKZiYUYWsaXxaiKOB65xnOs4jLmf0rhvI_3f8x0ic-o,333
-pythonnative/templates/android_template/app/build.gradle,sha256=Yoy8-RCSysYJ5N-xiZdtJOOcRset-ttFIwaHT4l2bto,1670
+pythonnative/templates/android_template/app/build.gradle,sha256=y0-v6bUcVV1nlm0N90h_jbnYplAhIJTEhSoGiTC3k3Q,1863
 pythonnative/templates/android_template/app/proguard-rules.pro,sha256=Vv2WDPIl9spA-YKxOl27DYvD394T_3ZCKCXGBw0KGJA,750
 pythonnative/templates/android_template/app/src/androidTest/java/com/pythonnative/android_template/ExampleInstrumentedTest.kt,sha256=Am8Yla3i1eR_ac5FVgPU_RsuMrCbyT79h1BcajGE-zI,693
 pythonnative/templates/android_template/app/src/main/AndroidManifest.xml,sha256=MdWrXxOrwUjnqtDbV952NI4nVF2dTUX9xwSS8chhd9I,940
-pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt,sha256=4Y0U1hH-vYtC8KDw-3dxjE3oHce4sQMY5KcAi6kVZmE,1130
+pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt,sha256=sqOQ4k--WVyfnrhfNkzqAEQ211uYNPxhmIUXDrIb0zY,1321
+pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/Navigator.kt,sha256=dWOpdJFuGO2CWZZQjYPmSNxljjDyGUuys7-ehHhAqyM,931
+pythonnative/templates/android_template/app/src/main/java/com/pythonnative/android_template/PageFragment.kt,sha256=lnIgCfAifZWp9mlJvSqO5mUOfMhH-RWaK11WfkE7uZ8,4001
 pythonnative/templates/android_template/app/src/main/res/drawable/ic_launcher_background.xml,sha256=7UI8c6b0Ck0pCfCQHmBSezqAfNWeG1WTvKrhgIscYyE,5606
 pythonnative/templates/android_template/app/src/main/res/drawable-v24/ic_launcher_foreground.xml,sha256=AdGmpsEjTrf-Jw0JfrKD1yucla5RGIhvG2VzqtKA8fc,1702
-pythonnative/templates/android_template/app/src/main/res/layout/activity_main.xml,sha256=ENxRHKEqpOvKdy-ayDEXHxoxLO3kwiX7EqitXVmi8p8,778
+pythonnative/templates/android_template/app/src/main/res/layout/activity_main.xml,sha256=HIgdCNktb3YoJC8QOTIv-0qZRtMRoPdARK59nyYFO6g,461
 pythonnative/templates/android_template/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml,sha256=iPdlNJnvUkEm6lAYqZuvnMMmnn5YTWIF39122znznMA,343
 pythonnative/templates/android_template/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml,sha256=iPdlNJnvUkEm6lAYqZuvnMMmnn5YTWIF39122znznMA,343
 pythonnative/templates/android_template/app/src/main/res/mipmap-hdpi/ic_launcher.webp,sha256=3QCZYZhkDtKPvAnNzXo4B8-HB_PrJVtlljTaPKam_wE,1404
@@ -55,6 +57,7 @@ pythonnative/templates/android_template/app/src/main/res/mipmap-xxhdpi/ic_launch
 pythonnative/templates/android_template/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp,sha256=MAn60Hn1dy8w7Ndn-YkkNn--D4HDAEjWctT9otXKfRI,5914
 pythonnative/templates/android_template/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp,sha256=-Y_vW8O_5bZWksQK0cuuK-xPr58bJJw5diZ0DbcbYtg,3844
 pythonnative/templates/android_template/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp,sha256=X68DN0XIyILEO7GzctTkpYkMrsY9mJKi51bJVBCLhdw,7778
+pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml,sha256=QGvhfqtiWKIu9U_MQboPV3leLByyRgDvyWMoyGCFXKc,763
 pythonnative/templates/android_template/app/src/main/res/values/colors.xml,sha256=77cNdJlUmlfOoysA55DvBjLLDJXNru_RaQPIzRLIieQ,147
 pythonnative/templates/android_template/app/src/main/res/values/strings.xml,sha256=y212ihQZPuuegFVU54kyOMwU50J759yi6h1CNAo-RDc,78
 pythonnative/templates/android_template/app/src/main/res/values/themes.xml,sha256=8Amp6l23WClwtnLrfXYI2UFvC1eS6JzMRivN57rQBzw,420
@@ -66,8 +69,8 @@ pythonnative/templates/android_template/gradle/wrapper/gradle-wrapper.jar,sha256
 pythonnative/templates/android_template/gradle/wrapper/gradle-wrapper.properties,sha256=EWegb_Gq2up5HPSrDpYbDQ5NwrRIWmTFTdkBSDNia_4,230
 pythonnative/templates/ios_template/ios_template/AppDelegate.swift,sha256=_6G8GNcw4idXd75qKgQKTDCr45Ez73QB8WTvhBqqcMw,1349
 pythonnative/templates/ios_template/ios_template/Info.plist,sha256=ZQIJGpo8Y2qP0j29xqOsIEGvPpEVICLTAw2NehC5CSo,704
-pythonnative/templates/ios_template/ios_template/SceneDelegate.swift,sha256=Lnm2xnnXPZ6AaNaPwuSFybyqGmGQwXoUBsfiHHNgT_E,2292
-pythonnative/templates/ios_template/ios_template/ViewController.swift,sha256=yo5a5p1ivAO7eVBGeM0gFPb_YKM4ZXEslPG422kYgfc,5299
+pythonnative/templates/ios_template/ios_template/SceneDelegate.swift,sha256=lqtre92dc6d6s-f4ieh_M_4xmc_zMGW79j46tDu9cOY,2177
+pythonnative/templates/ios_template/ios_template/ViewController.swift,sha256=CvIpVOLRY3WSmm-_25N441b_8kaYKgmfkkQChNcBU7M,9241
 pythonnative/templates/ios_template/ios_template/Assets.xcassets/Contents.json,sha256=D9Sbo8NYXHCWeOAEaoIcPGBoXscGNyDTDTo0SL46IIs,63
 pythonnative/templates/ios_template/ios_template/Assets.xcassets/AccentColor.colorset/Contents.json,sha256=mvZQhvowtJJS-uGhIlcxaR3nlPd3WvdNcb7-tQfRK3w,123
 pythonnative/templates/ios_template/ios_template/Assets.xcassets/AppIcon.appiconset/Contents.json,sha256=VUwGr7K_geOvQjFh5VKB6iVXV1mi0tjGMinUmB2JvQs,177
@@ -78,9 +81,9 @@ pythonnative/templates/ios_template/ios_template.xcodeproj/project.xcworkspace/x
 pythonnative/templates/ios_template/ios_templateTests/ios_templateTests.swift,sha256=YnwzZx7yXB13xKAXEGNgz17VuhWeqkHTRTtBJ2Vu3_E,1238
 pythonnative/templates/ios_template/ios_templateUITests/ios_templateUITests.swift,sha256=l2Pwa50F_rv-qPu2go6e4bQernM6PTQJeNPFl_c4ivY,1387
 pythonnative/templates/ios_template/ios_templateUITests/ios_templateUITestsLaunchTests.swift,sha256=f5JrG0uVtLMeJQy26Yyz7Om-JUkT220osqcbeIVkj2g,815
-pythonnative-0.2.0.dist-info/licenses/LICENSE,sha256=O7jIzERBe5XxsbuZaWnPBneOk6JoSYNj6g2M0noRTws,1069
-pythonnative-0.2.0.dist-info/METADATA,sha256=Xq4sJABcatAnd4GXEJ135lziDLO02zQzC54Wl9mx5kc,5083
-pythonnative-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pythonnative-0.2.0.dist-info/entry_points.txt,sha256=iUtDawWSAJAEyWTycpZxDuYz73ol31butpzDIEAgPO0,48
-pythonnative-0.2.0.dist-info/top_level.txt,sha256=kT4SEATY2ywzrZ2Pgea6_zxyym44Q_PbOsUoOYjJLFE,13
-pythonnative-0.2.0.dist-info/RECORD,,
+pythonnative-0.3.0.dist-info/licenses/LICENSE,sha256=O7jIzERBe5XxsbuZaWnPBneOk6JoSYNj6g2M0noRTws,1069
+pythonnative-0.3.0.dist-info/METADATA,sha256=jaDrFxaYR4ZQvhmSMSP7FXIDPKisfMXZh1eAUL9y5ts,5083
+pythonnative-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pythonnative-0.3.0.dist-info/entry_points.txt,sha256=iUtDawWSAJAEyWTycpZxDuYz73ol31butpzDIEAgPO0,48
+pythonnative-0.3.0.dist-info/top_level.txt,sha256=kT4SEATY2ywzrZ2Pgea6_zxyym44Q_PbOsUoOYjJLFE,13
+pythonnative-0.3.0.dist-info/RECORD,,