Merge branch 'refs/heads/main' into add-annotations

# Conflicts:
#	adafruit_button/button.py
#	adafruit_button/button_base.py
#	adafruit_button/sprite_button.py

Author: FoamyGuy

adafruit_button/button.py

@@ -30,6 +30,7 @@
 try:
     from typing import Optional, Union, Tuple, Any, List
     from fontio import FontProtocol
+    from displayio import Group
 except ImportError:
     pass
 
@@ -189,7 +190,7 @@ def __init__(
 
         self.label = label
 
-    def _subclass_selected_behavior(self, value: Optional[Any]) -> None:
+    def _subclass_selected_behavior(self, value: bool) -> None:
         if self._selected:
             new_fill = self.selected_fill
             new_out = self.selected_outline
@@ -202,7 +203,7 @@ def _subclass_selected_behavior(self, value: Optional[Any]) -> None:
             self.body.outline = new_out
 
     @property
-    def group(self) -> "Button":
+    def group(self) -> Group:
         """Return self for compatibility with old API."""
         print(
             "Warning: The group property is being deprecated. "
@@ -211,7 +212,7 @@ def group(self) -> "Button":
         )
         return self
 
-    def contains(self, point: List[int]) -> bool:
+    def contains(self, point: tuple[int, int]) -> bool:
         """Used to determine if a point is contained within a button. For example,
         ``button.contains(touch)`` where ``touch`` is the touch point on the screen will allow for
         determining that a button has been touched.

adafruit_button/button_base.py

@@ -26,12 +26,13 @@
 import terminalio
 
 try:
-    from typing import Optional, Union, Tuple, Any
+    from typing import Optional, Union, Tuple
     from fontio import FontProtocol
 except ImportError:
     pass
 
 
+
 def _check_color(color: Optional[Union[int, tuple[int, int, int]]]) -> int:
     # if a tuple is supplied, convert it to a RGB number
     if isinstance(color, tuple):
@@ -128,7 +129,7 @@ def label(self, newtext: str) -> None:
         if (self.selected_label is None) and (self._label_color is not None):
             self.selected_label = (~_check_color(self._label_color)) & 0xFFFFFF
 
-    def _subclass_selected_behavior(self, value: Optional[Any]) -> None:
+    def _subclass_selected_behavior(self, value: bool):
         # Subclasses should override this!
         pass
 

adafruit_button/sprite_button.py

@@ -26,7 +26,7 @@
 from adafruit_button.button_base import ButtonBase
 
 try:
-    from typing import Optional, Union, Tuple, Any, List
+    from typing import Optional, Union, Tuple, List
     from fontio import FontProtocol
 except ImportError:
     pass
@@ -127,7 +127,7 @@ def height(self) -> int:
         """The height of the button. Read-Only"""
         return self._height
 
-    def contains(self, point: List[int]) -> bool:
+    def contains(self, point: Tuple[int, int]) -> bool:
         """Used to determine if a point is contained within a button. For example,
         ``button.contains(touch)`` where ``touch`` is the touch point on the screen will allow for
         determining that a button has been touched.
@@ -136,7 +136,7 @@ def contains(self, point: List[int]) -> bool:
             self.y <= point[1] <= self.y + self.height
         )
 
-    def _subclass_selected_behavior(self, value: Optional[Any]) -> None:
+    def _subclass_selected_behavior(self, value: bool) -> None:
         if self._selected:
             if self._selected_bmp is not None:
                 self._btn_tilegrid.bitmap = self._selected_bmp