Add Screen to pythonnative.py

owenthcarey · owenthcarey · commit 16e35103b2ac · 2023-06-18T13:35:06.000-07:00
diff --git a/apps/pythonnative_demo/app/main.py b/apps/pythonnative_demo/app/main.py
@@ -2,8 +2,8 @@
 
 
 def main():
-    # Create a main view
-    main_view = pn.View()
+    # Create a screen
+    screen = pn.Screen()
 
     # Create a layout
     layout = pn.LinearLayout()
@@ -16,11 +16,11 @@ def main():
     label = pn.Label("Hello, World!")
     layout.add_view(label)
 
-    # Add layout to main view
-    main_view.add_view(layout)
+    # Set layout to screen
+    screen.set_layout(layout)
 
-    # Display the main view
-    main_view.show()
+    # Display the screen
+    screen.show()
 
 
 if __name__ == "__main__":
diff --git a/libs/pythonnative/cli/pn.py b/libs/pythonnative/cli/pn.py
@@ -66,7 +66,9 @@ def run_project(args: argparse.Namespace) -> None:
 
     # Copy the user's Python code into the project
     src_dir = os.path.join(os.getcwd(), "app")
-    dest_dir = os.path.join(build_dir, "app")  # You might need to adjust this depending on the project structure
+    dest_dir = os.path.join(
+        build_dir, "app"
+    )  # You might need to adjust this depending on the project structure
     shutil.copytree(src_dir, dest_dir, dirs_exist_ok=True)
 
     # Install any necessary Python packages into the project environment
diff --git a/libs/pythonnative/pythonnative/__init__.py b/libs/pythonnative/pythonnative/__init__.py
@@ -0,0 +1,3 @@
+from .pythonnative import Button, Label, LinearLayout, Screen
+
+__all__ = ["Button", "Label", "LinearLayout", "Screen"]
diff --git a/libs/pythonnative/pythonnative/pythonnative.py b/libs/pythonnative/pythonnative/pythonnative.py
@@ -12,7 +12,26 @@ class PlatformNotDetectedError(Exception):
 if system == "iOS":
     from rubicon.objc import ObjCClass
 
-    # Map native iOS classes to PythonNative classes
+    class Screen:
+        native_class = ObjCClass("UIViewController")
+
+        def __init__(self):
+            self.native_instance = self.native_class.alloc().init()
+            self.layout = None
+
+        def add_view(self, view):
+            if self.layout is None:
+                raise ValueError("You must set a layout before adding views.")
+            self.layout.add_view(view)
+
+        def set_layout(self, layout):
+            self.layout = layout
+            self.native_instance.view().addSubview_(layout.native_instance)
+
+        def show(self):
+            # This method should contain code to present the ViewController
+            pass
+
     class Button:
         native_class = ObjCClass("UIButton")
 
@@ -26,7 +45,6 @@ def set_title(self, title: str) -> None:
         def get_title(self) -> str:
             return self.native_instance.titleForState_(0)
 
-
     class Label:
         native_class = ObjCClass("UILabel")
 
@@ -40,25 +58,43 @@ def set_text(self, text: str) -> None:
         def get_text(self) -> str:
             return self.native_instance.text()
 
-
     class LinearLayout:
         native_class = ObjCClass("UIStackView")
 
         def __init__(self) -> None:
             self.native_instance = self.native_class.alloc().initWithFrame_(
-                ((0, 0), (0, 0)))
+                ((0, 0), (0, 0))
+            )
             self.native_instance.setAxis_(0)  # Set axis to vertical
             self.views = []
 
         def add_view(self, view):
             self.views.append(view)
             self.native_instance.addArrangedSubview_(view.native_instance)
 
-
 elif system == "Android":
     from java import jclass
 
-    # Map native Android classes to PythonNative classes
+    class Screen:
+        native_class = jclass("android.app.Activity")
+
+        def __init__(self):
+            self.native_instance = self.native_class()
+            self.layout = None
+
+        def add_view(self, view):
+            if self.layout is None:
+                raise ValueError("You must set a layout before adding views.")
+            self.layout.add_view(view)
+
+        def set_layout(self, layout):
+            self.layout = layout
+            self.native_instance.setContentView(layout.native_instance)
+
+        def show(self):
+            # This method should contain code to start the Activity
+            pass
+
     class Button:
         native_class = jclass("android.widget.Button")
 
@@ -72,7 +108,6 @@ def set_title(self, title: str) -> None:
         def get_title(self) -> str:
             return self.native_instance.getText().toString()
 
-
     class Label:
         native_class = jclass("android.widget.TextView")
 
@@ -86,20 +121,17 @@ def set_text(self, text: str) -> None:
         def get_text(self) -> str:
             return self.native_instance.getText().toString()
 
-
     class LinearLayout:
         native_class = jclass("android.widget.LinearLayout")
 
         def __init__(self) -> None:
             self.native_instance = self.native_class()
-            self.native_instance.setOrientation(
-                1)  # Set orientation to vertical
+            self.native_instance.setOrientation(1)  # Set orientation to vertical
             self.views = []
 
         def add_view(self, view):
             self.views.append(view)
             self.native_instance.addView(view.native_instance)
 
-
 else:
     raise PlatformNotDetectedError("Platform could not be detected or is unsupported.")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from .pythonnative import Button, Label, LinearLayout, Screen`
	`2`	`+`
	`3`	`+__all__ = ["Button", "Label", "LinearLayout", "Screen"]`