Corrected Type Annotations

Author: isacben

adafruit_display_shapes/line.py

@@ -21,6 +21,11 @@
 
 """
 
+try:
+    from typing import Optional
+except ImportError:
+    pass
+
 from adafruit_display_shapes.polygon import Polygon
 
 __version__ = "0.0.0-auto.0"
@@ -49,11 +54,11 @@ def __init__(
         super().__init__([(x0, y0), (x1, y1)], outline=color)
 
     @property
-    def color(self) -> int:
+    def color(self) -> Optional[int]:
         """The line color value. Can be a hex value for a color or
         ``None`` for no line color."""
         return self.outline
 
     @color.setter
-    def color(self, color: int) -> None:
+    def color(self, color: Optional[int]) -> None:
         self.outline = color

adafruit_display_shapes/polygon.py

@@ -138,13 +138,13 @@ def _line(
     # pylint: enable=invalid-name, too-many-locals, too-many-branches
 
     @property
-    def outline(self) -> int:
+    def outline(self) -> Optional[int]:
         """The outline of the polygon. Can be a hex value for a color or
         ``None`` for no outline."""
         return self._palette[1]
 
     @outline.setter
-    def outline(self, color: int) -> None:
+    def outline(self, color: Optional[int]) -> None:
         if color is None:
             self._palette[1] = 0
             self._palette.make_transparent(1)

adafruit_display_shapes/rect.py

@@ -82,13 +82,13 @@ def __init__(
         super().__init__(self._bitmap, pixel_shader=self._palette, x=x, y=y)
 
     @property
-    def fill(self) -> int:
+    def fill(self) -> Optional[int]:
         """The fill of the rectangle. Can be a hex value for a color or ``None`` for
         transparent."""
         return self._palette[0]
 
     @fill.setter
-    def fill(self, color: int) -> None:
+    def fill(self, color: Optional[int]) -> None:
         if color is None:
             self._palette[0] = 0
             self._palette.make_transparent(0)
@@ -97,13 +97,13 @@ def fill(self, color: int) -> None:
             self._palette.make_opaque(0)
 
     @property
-    def outline(self) -> int:
+    def outline(self) -> Optional[int]:
         """The outline of the rectangle. Can be a hex value for a color or ``None``
         for no outline."""
         return self._palette[1]
 
     @outline.setter
-    def outline(self, color: int) -> None:
+    def outline(self, color: Optional[int]) -> None:
         if color is None:
             self._palette[1] = 0
             self._palette.make_transparent(1)

adafruit_display_shapes/roundrect.py

@@ -158,13 +158,13 @@ def _helper(
     # pylint: enable=invalid-name, too-many-locals, too-many-branches
 
     @property
-    def fill(self) -> int:
+    def fill(self) -> Optional[int]:
         """The fill of the rounded-corner rectangle. Can be a hex value for a color or ``None`` for
         transparent."""
         return self._palette[2]
 
     @fill.setter
-    def fill(self, color: int) -> None:
+    def fill(self, color: Optional[int]) -> None:
         if color is None:
             self._palette[2] = 0
             self._palette.make_transparent(2)
@@ -173,13 +173,13 @@ def fill(self, color: int) -> None:
             self._palette.make_opaque(2)
 
     @property
-    def outline(self) -> int:
+    def outline(self) -> Optional[int]:
         """The outline of the rounded-corner rectangle. Can be a hex value for a color or ``None``
         for no outline."""
         return self._palette[1]
 
     @outline.setter
-    def outline(self, color: int) -> None:
+    def outline(self, color: Optional[int]) -> None:
         if color is None:
             self._palette[1] = 0
             self._palette.make_transparent(1)

adafruit_display_shapes/sparkline.py

@@ -115,11 +115,11 @@ def add_value(self, value: float) -> None:
     # pylint: disable=no-else-return
     @staticmethod
     def _xintercept(
-        x_1: int,
+        x_1: float,
         y_1: float,
-        x_2: int,
+        x_2: float,
         y_2: float,
-        horizontal_y: int,
+        horizontal_y: float,
     ) -> Optional[
         int
     ]:  # finds intercept of the line and a horizontal line at horizontalY

adafruit_display_shapes/triangle.py

@@ -153,13 +153,13 @@ def _draw_filled(
     # pylint: enable=invalid-name, too-many-locals, too-many-branches
 
     @property
-    def fill(self) -> int:
+    def fill(self) -> Optional[int]:
         """The fill of the triangle. Can be a hex value for a color or
         ``None`` for transparent."""
         return self._palette[2]
 
     @fill.setter
-    def fill(self, color: int) -> None:
+    def fill(self, color: Optional[int]) -> None:
         if color is None:
             self._palette[2] = 0
             self._palette.make_transparent(2)