Merge pull request #101 from FoamyGuy/displayio_api_update

displayio api updates

Author: dhalbert

adafruit_displayio_layout/layouts/tab_layout.py

@@ -28,6 +28,7 @@
 
     from adafruit_bitmap_font.bdf import BDF
     from adafruit_bitmap_font.pcf import PCF
+    from circuitpython_typing.displayio import AnyDisplay
     from fontio import BuiltinFont
 except ImportError:
     pass
@@ -53,7 +54,7 @@ class TabLayout(displayio.Group):
 
     :param int x: x location the layout should be placed. Pixel coordinates.
     :param int y: y location the layout should be placed. Pixel coordinates.
-    :param displayio.Display display: The Display object to show the tab layout on.
+    :param AnyDisplay display: The Display object to show the tab layout on.
     :param int tab_text_scale: Size of the text shown in the tabs.
       Whole numbers 1 and greater are valid
     :param Optional[Union[BuiltinFont, BDF, PCF]] custom_font: A pre-loaded font object to use
@@ -75,7 +76,7 @@ def __init__(
         self,
         x: int = 0,
         y: int = 0,
-        display: Optional[displayio.Display] = None,
+        display: Optional[AnyDisplay] = None,
         tab_text_scale: int = 1,
         custom_font: Optional[Union[BuiltinFont, BDF, PCF]] = terminalio.FONT,
         inactive_tab_spritesheet: Optional[str] = None,

adafruit_displayio_layout/widgets/flip_input.py

@@ -38,6 +38,8 @@
 
 try:
     from typing import Any, List, Optional, Tuple
+
+    from circuitpython_typing.displayio import AnyDisplay
 except ImportError:
     pass
 
@@ -54,7 +56,7 @@ class FlipInput(Widget, Control):
     :param int x: pixel position
     :param int y: pixel position
 
-    :param displayio.Display display: the display where the widget will be displayed
+    :param AnyDisplay display: the display where the widget will be displayed
     :param value_list: the list of strings that will be displayed
     :type value_list: List[str]
     :param Font font: the font used for the text (defaults to ``terminalio.FONT``)
@@ -87,7 +89,7 @@ class FlipInput(Widget, Control):
 
     def __init__(
         self,
-        display: displayio.Display,
+        display: AnyDisplay,
         *,
         value_list: List[str],
         font: FONT = FONT,
@@ -586,7 +588,7 @@ def _blit_constrained(
 
 # _animate_bitmap - performs animation of scrolling between two bitmaps
 def _animate_bitmap(
-    display: displayio.Display,
+    display: AnyDisplay,
     target_bitmap: displayio.Bitmap,
     bitmap1: displayio.Bitmap,
     bitmap1_offset: Tuple[int, int],

adafruit_displayio_layout/widgets/icon_animated.py

@@ -37,7 +37,7 @@
 try:
     from typing import Any, Optional, Tuple
 
-    from busdisplay import BusDisplay
+    from circuitpython_typing.displayio import AnyDisplay
 except ImportError:
     pass
 
@@ -86,7 +86,7 @@ class IconAnimated(IconWidget):
     @classmethod
     def init_class(
         cls,
-        display: Optional[BusDisplay],
+        display: Optional[AnyDisplay],
         max_scale: float = 1.5,
         max_icon_size: Tuple[int, int] = (80, 80),
         max_color_depth: int = 256,
@@ -100,7 +100,7 @@ def init_class(
                 ``IconAnimated.init_class(display=board.DISPLAY, max_scale=1.5,
                 max_icon_size=(80,80), max_color_depth=256)``
 
-        :param displayio.Display display: The display where the icons will be displayed.
+        :param AnyDisplay display: The display where the icons will be displayed.
         :param float max_scale: The maximum zoom of the any of the icons, should be >= 1.0,
          (default: 1.5)
         :param max_icon_size: The maximum (x,y) pixel dimensions of any `IconAnimated` bitmap size

requirements.txt

@@ -8,3 +8,4 @@ adafruit-circuitpython-bitmap-font
 adafruit-circuitpython-display-text
 adafruit-circuitpython-imageload
 adafruit-circuitpython-display-shapes
+adafruit-circuitpython-typing