Add Button event handlers

owenthcarey · owenthcarey · commit 94a437f102ab · 2023-07-12T18:04:50.000-07:00
diff --git a/apps/android_pythonnative_3/app/src/main/python/app/main_3.py b/apps/android_pythonnative_3/app/src/main/python/app/main_3.py
@@ -8,9 +8,12 @@ def __init__(self, native_instance):
     def on_create(self):
         super().on_create()
         stack_view = pn.StackView(self.native_instance)
-        list_data = ["item_{}".format(i) for i in range(100)]
-        list_view = pn.ListView(self.native_instance, list_data)
-        stack_view.add_view(list_view)
+        # list_data = ["item_{}".format(i) for i in range(100)]
+        # list_view = pn.ListView(self.native_instance, list_data)
+        # stack_view.add_view(list_view)
+        button = pn.Button(self.native_instance, "Button")
+        button.set_on_click(lambda: print("Button was clicked!"))
+        stack_view.add_view(button)
         self.set_root_view(stack_view)
 
     def on_start(self):
diff --git a/apps/android_pythonnative_3/app/src/main/python/app/second_page.py b/apps/android_pythonnative_3/app/src/main/python/app/second_page.py
@@ -8,8 +8,9 @@ def __init__(self, native_instance):
     def on_create(self):
         super().on_create()
         stack_view = pn.StackView(self.native_instance)
-        label = pn.Label(self.native_instance, "Label")
-        stack_view.add_view(label)
+        button = pn.Button(self.native_instance, "Button")
+        button.set_on_click(lambda: print("Button was clicked!"))
+        stack_view.add_view(button)
         self.set_root_view(stack_view)
 
     def on_start(self):
diff --git a/libs/pythonnative/pythonnative/button.py b/libs/pythonnative/pythonnative/button.py
@@ -1,4 +1,5 @@
 from abc import ABC, abstractmethod
+from typing import Callable
 from .utils import IS_ANDROID
 from .view import ViewBase
 
@@ -20,13 +21,17 @@ def set_title(self, title: str) -> None:
     def get_title(self) -> str:
         pass
 
+    @abstractmethod
+    def set_on_click(self, callback: Callable[[], None]) -> None:
+        pass
+
 
 if IS_ANDROID:
     # ========================================
     # Android class
     # ========================================
 
-    from java import jclass
+    from java import dynamic_proxy, jclass
 
     class Button(ButtonBase, ViewBase):
         def __init__(self, context, title: str = "") -> None:
@@ -41,12 +46,26 @@ def set_title(self, title: str) -> None:
         def get_title(self) -> str:
             return self.native_instance.getText().toString()
 
+        def set_on_click(self, callback: Callable[[], None]) -> None:
+            class OnClickListener(
+                dynamic_proxy(jclass("android.view.View").OnClickListener)
+            ):
+                def __init__(self, callback):
+                    super().__init__()
+                    self.callback = callback
+
+                def onClick(self, view):
+                    self.callback()
+
+            listener = OnClickListener(callback)
+            self.native_instance.setOnClickListener(listener)
+
 else:
     # ========================================
     # iOS class
     # ========================================
 
-    from rubicon.objc import ObjCClass
+    from rubicon.objc import ObjCClass, SEL
 
     class Button(ButtonBase, ViewBase):
         def __init__(self, title: str = "") -> None:
@@ -60,3 +79,12 @@ def set_title(self, title: str) -> None:
 
         def get_title(self) -> str:
             return self.native_instance.titleForState_(0)
+
+        def set_on_click(self, callback: Callable[[], None]) -> None:
+            def objc_callback(_cmd, sender):
+                callback()
+
+            action = SEL(objc_callback)
+            self.native_instance.addTarget_action_forControlEvents_(
+                self.native_instance, action, 1
+            )
diff --git a/libs/pythonnative/pythonnative/page.py b/libs/pythonnative/pythonnative/page.py
@@ -183,4 +183,5 @@ def on_restore_instance_state(self) -> None:
 
         def navigate_to(self, page) -> None:
             self.native_instance.navigationController().pushViewControllerAnimated_(
-                page.native_instance, True)
+                page.native_instance, True
+            )
