Add Android Context to pythonnative

owenthcarey · owenthcarey · commit 5075b3a27c28 · 2023-06-20T11:40:47.000-07:00
diff --git a/apps/android_pythonnative_3/app/build.gradle b/apps/android_pythonnative_3/app/build.gradle
@@ -21,8 +21,13 @@ android {
         }
         python {
             pip {
+                // https://chaquo.com/chaquopy/doc/current/android.html#android-requirements
 //                install "matplotlib"
-                install "pythonnative"
+//                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"
             }
         }
     }
diff --git a/apps/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt b/apps/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt
@@ -36,14 +36,14 @@ class MainActivity : AppCompatActivity() {
 //        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 createLayoutModule = py.getModule("create_pn_layout")
-//        val pyLayout = createLayoutModule.callAttr("create_pn_layout").toJava(LinearLayout::class.java)
+//        val createWidgetsModule = py.getModule("create_widgets")
+//        val pyLayout = createWidgetsModule.callAttr("create_widgets", this).toJava(LinearLayout::class.java)
 //        layoutMain.addView(pyLayout)
 
+        val createLayoutModule = py.getModule("create_pn_layout")
+        val pyLayout = createLayoutModule.callAttr("create_pn_layout", 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)
diff --git a/apps/android_pythonnative_3/app/src/main/python/create_pn_layout.py b/apps/android_pythonnative_3/app/src/main/python/create_pn_layout.py
@@ -3,13 +3,18 @@
 import pythonnative as pn
 
 
-def create_pn_layout():
-    layout = pn.LinearLayout()
+def create_pn_layout(context):
+    layout = pn.LinearLayout(context)
 
-    label = pn.Label("This is a PythonNative label")
+    label = pn.Label(context, "This is a PythonNative label")
     layout.add_view(label)
 
-    button = pn.Button("Click me")
+    button = pn.Button(context, "Click me")
     layout.add_view(button)
 
     return layout.native_instance
+
+    # from java import jclass
+    # LinearLayout = jclass("android.widget.LinearLayout")
+    # layout = LinearLayout(context)
+    # return layout
diff --git a/libs/pythonnative/pythonnative/button.py b/libs/pythonnative/pythonnative/button.py
@@ -7,9 +7,9 @@
     class Button(View):
         native_class = jclass("android.widget.Button")
 
-        def __init__(self, title: str = "") -> None:
+        def __init__(self, context, title: str = "") -> None:
             super().__init__()
-            self.native_instance = self.native_class()
+            self.native_instance = self.native_class(context)
             self.set_title(title)
 
         def set_title(self, title: str) -> None:
diff --git a/libs/pythonnative/pythonnative/label.py b/libs/pythonnative/pythonnative/label.py
@@ -7,9 +7,9 @@
     class Label(View):
         native_class = jclass("android.widget.TextView")
 
-        def __init__(self, text: str = "") -> None:
+        def __init__(self, context, text: str = "") -> None:
             super().__init__()
-            self.native_instance = self.native_class()
+            self.native_instance = self.native_class(context)
             self.set_text(text)
 
         def set_text(self, text: str) -> None:
diff --git a/libs/pythonnative/pythonnative/linear_layout.py b/libs/pythonnative/pythonnative/linear_layout.py
@@ -7,10 +7,10 @@
     class LinearLayout(View):
         native_class = jclass("android.widget.LinearLayout")
 
-        def __init__(self) -> None:
+        def __init__(self, context) -> None:
             super().__init__()
-            self.native_instance = self.native_class()
-            self.native_instance.setOrientation(1)  # Set orientation to vertical
+            self.native_instance = self.native_class(context)
+            self.native_instance.setOrientation(self.native_class.VERTICAL)  # Set orientation to vertical
             self.views = []
 
         def add_view(self, view):

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,13 @@ android {`
`21`	`21`	`}`
`22`	`22`	`python {`
`23`	`23`	`pip {`
	`24`	`+ // https://chaquo.com/chaquopy/doc/current/android.html#android-requirements`
`24`	`25`	`// install "matplotlib"`
`25`		`- install "pythonnative"`
	`26`	`+// install "pythonnative"`
	`27`	`+`
	`28`	`+ // A directory containing a setup.py, relative to the project`
	`29`	`+ // directory (must contain at least one slash):`
	`30`	`+ install "/Users/owenthcarey/Documents/pythonnative-workspace/libs/pythonnative"`
`26`	`31`	`}`
`27`	`32`	`}`
`28`	`33`	`}`