Add utils.py to pythonnative

owenthcarey · owenthcarey · commit 6331007556f7 · 2023-06-20T10:33:56.000-07:00
diff --git a/apps/android_pythonnative_3/app/build.gradle b/apps/android_pythonnative_3/app/build.gradle
@@ -21,7 +21,8 @@ android {
         }
         python {
             pip {
-                install "matplotlib"
+//                install "matplotlib"
+                install "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
@@ -40,6 +40,10 @@ class MainActivity : AppCompatActivity() {
         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)
+//        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
@@ -0,0 +1,15 @@
+# pythonnative.py
+
+import pythonnative as pn
+
+
+def create_pn_layout():
+    layout = pn.LinearLayout()
+
+    label = pn.Label("This is a PythonNative label")
+    layout.add_view(label)
+
+    button = pn.Button("Click me")
+    layout.add_view(button)
+
+    return layout.native_instance
diff --git a/libs/pythonnative/pythonnative/button.py b/libs/pythonnative/pythonnative/button.py
@@ -1,7 +1,7 @@
-import platform
+from .utils import IS_ANDROID
 from .view import View
 
-if platform.system() == "Android":
+if IS_ANDROID:
     from java import jclass
 
     class Button(View):
@@ -18,7 +18,7 @@ def set_title(self, title: str) -> None:
         def get_title(self) -> str:
             return self.native_instance.getText().toString()
 
-elif platform.system() == "iOS":
+else:
     from rubicon.objc import ObjCClass
 
     class Button(View):
diff --git a/libs/pythonnative/pythonnative/label.py b/libs/pythonnative/pythonnative/label.py
@@ -1,7 +1,7 @@
-import platform
+from .utils import IS_ANDROID
 from .view import View
 
-if platform.system() == "Android":
+if IS_ANDROID:
     from java import jclass
 
     class Label(View):
@@ -18,7 +18,7 @@ def set_text(self, text: str) -> None:
         def get_text(self) -> str:
             return self.native_instance.getText().toString()
 
-elif platform.system() == "iOS":
+else:
     from rubicon.objc import ObjCClass
 
     class Label(View):
diff --git a/libs/pythonnative/pythonnative/linear_layout.py b/libs/pythonnative/pythonnative/linear_layout.py
@@ -1,7 +1,7 @@
-import platform
+from .utils import IS_ANDROID
 from .view import View
 
-if platform.system() == "Android":
+if IS_ANDROID:
     from java import jclass
 
     class LinearLayout(View):
@@ -17,7 +17,7 @@ def add_view(self, view):
             self.views.append(view)
             self.native_instance.addView(view.native_instance)
 
-elif platform.system() == "iOS":
+else:
     from rubicon.objc import ObjCClass
 
     class LinearLayout(View):
diff --git a/libs/pythonnative/pythonnative/screen.py b/libs/pythonnative/pythonnative/screen.py
@@ -1,7 +1,7 @@
-import platform
+from .utils import IS_ANDROID
 from .view import View
 
-if platform.system() == "Android":
+if IS_ANDROID:
     from java import jclass
 
     class Screen(View):
@@ -25,7 +25,7 @@ def show(self):
             # This method should contain code to start the Activity
             pass
 
-elif platform.system() == "iOS":
+else:
     from rubicon.objc import ObjCClass
 
     class Screen(View):
diff --git a/libs/pythonnative/pythonnative/utils.py b/libs/pythonnative/pythonnative/utils.py
@@ -0,0 +1,3 @@
+import os
+
+IS_ANDROID = "ANDROID_BOOTLOGO" in os.environ

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ android {`
`21`	`21`	`}`
`22`	`22`	`python {`
`23`	`23`	`pip {`
`24`		`- install "matplotlib"`
	`24`	`+// install "matplotlib"`
	`25`	`+ install "pythonnative"`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import os`
	`2`	`+`
	`3`	`+IS_ANDROID = "ANDROID_BOOTLOGO" in os.environ`