Update self.native_class

owenthcarey · owenthcarey · commit 0c4b261acce6 · 2023-06-20T13:54:53.000-07:00
diff --git a/apps/android_pythonnative_3/app/src/main/python/create_constraint_layout.py b/apps/android_pythonnative_3/app/src/main/python/create_constraint_layout.py
@@ -19,7 +19,9 @@ def create_constraint_layout(context):
 
     # Create BottomNavigationView
     bottom_nav = BottomNavigationView(context)
-    bottom_nav.setId(View.generateViewId()) # Add this line to generate unique id for the view
+    bottom_nav.setId(
+        View.generateViewId()
+    )  # Add this line to generate unique id for the view
 
     # Create Menu for BottomNavigationView
     menu = bottom_nav.getMenu()
@@ -34,7 +36,7 @@ def create_constraint_layout(context):
     # Add BottomNavigationView to ConstraintLayout
     nav_layout_params = ConstraintLayout.LayoutParams(
         ConstraintLayout.LayoutParams.MATCH_PARENT,
-        ConstraintLayout.LayoutParams.WRAP_CONTENT
+        ConstraintLayout.LayoutParams.WRAP_CONTENT,
     )
     # Set the constraints here
     nav_layout_params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID
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
@@ -1,5 +1,3 @@
-# pythonnative.py
-
 import pythonnative as pn
 
 
@@ -13,8 +11,3 @@ def create_pn_layout(context):
     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
@@ -5,10 +5,9 @@
     from java import jclass
 
     class Button(View):
-        native_class = jclass("android.widget.Button")
-
         def __init__(self, context, title: str = "") -> None:
             super().__init__()
+            self.native_class = jclass("android.widget.Button")
             self.native_instance = self.native_class(context)
             self.set_title(title)
 
@@ -22,10 +21,9 @@ def get_title(self) -> str:
     from rubicon.objc import ObjCClass
 
     class Button(View):
-        native_class = ObjCClass("UIButton")
-
         def __init__(self, title: str = "") -> None:
             super().__init__()
+            self.native_class = ObjCClass("UIButton")
             self.native_instance = self.native_class.alloc().init()
             self.set_title(title)
 
diff --git a/libs/pythonnative/pythonnative/label.py b/libs/pythonnative/pythonnative/label.py
@@ -5,10 +5,9 @@
     from java import jclass
 
     class Label(View):
-        native_class = jclass("android.widget.TextView")
-
         def __init__(self, context, text: str = "") -> None:
             super().__init__()
+            self.native_class = jclass("android.widget.TextView")
             self.native_instance = self.native_class(context)
             self.set_text(text)
 
@@ -22,10 +21,9 @@ def get_text(self) -> str:
     from rubicon.objc import ObjCClass
 
     class Label(View):
-        native_class = ObjCClass("UILabel")
-
         def __init__(self, text: str = "") -> None:
             super().__init__()
+            self.native_class = ObjCClass("UILabel")
             self.native_instance = self.native_class.alloc().init()
             self.set_text(text)
 
diff --git a/libs/pythonnative/pythonnative/linear_layout.py b/libs/pythonnative/pythonnative/linear_layout.py
@@ -5,12 +5,11 @@
     from java import jclass
 
     class LinearLayout(View):
-        native_class = jclass("android.widget.LinearLayout")
-
         def __init__(self, context) -> None:
             super().__init__()
+            self.native_class = jclass("android.widget.LinearLayout")
             self.native_instance = self.native_class(context)
-            self.native_instance.setOrientation(self.native_class.VERTICAL)  # Set orientation to vertical
+            self.native_instance.setOrientation(self.native_class.VERTICAL)
             self.views = []
 
         def add_view(self, view):
@@ -21,10 +20,9 @@ def add_view(self, view):
     from rubicon.objc import ObjCClass
 
     class LinearLayout(View):
-        native_class = ObjCClass("UIStackView")
-
         def __init__(self) -> None:
             super().__init__()
+            self.native_class = ObjCClass("UIStackView")
             self.native_instance = self.native_class.alloc().initWithFrame_(
                 ((0, 0), (0, 0))
             )
diff --git a/libs/pythonnative/pythonnative/screen.py b/libs/pythonnative/pythonnative/screen.py
@@ -5,10 +5,9 @@
     from java import jclass
 
     class Screen(View):
-        native_class = jclass("android.app.Activity")
-
         def __init__(self):
             super().__init__()
+            self.native_class = jclass("android.app.Activity")
             self.native_instance = self.native_class()
             self.layout = None
 
@@ -29,10 +28,9 @@ def show(self):
     from rubicon.objc import ObjCClass
 
     class Screen(View):
-        native_class = ObjCClass("UIViewController")
-
         def __init__(self):
             super().__init__()
+            self.native_class = ObjCClass("UIViewController")
             self.native_instance = self.native_class.alloc().init()
             self.layout = None
 
