Move library file into directory for packaging

Start refactor to base class

Author: hugodahl

adafruit_progressbar.py renamed to Adafruit_ProgressBar/adafruit_progressbar.py

@@ -22,13 +22,13 @@
 """
 
 # imports
-import displayio
+from adafruit_progressbar_base import ProgressBarBase
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/brentru/Adafruit_CircuitPython_ProgressBar.git"
 
 # pylint: disable=too-many-arguments, too-few-public-methods
-class ProgressBar(displayio.TileGrid):
+class ProgressBar(ProgressBarBase):
     """A dynamic progress bar widget.
 
     :param int x: The x-position of the top left corner.
@@ -57,11 +57,6 @@ def __init__(
         stroke=1,
     ):
         assert isinstance(progress, float), "Progress must be a floating point value."
-        self._bitmap = displayio.Bitmap(width, height, 3)
-        self._palette = displayio.Palette(3)
-        self._palette[0] = 0x0
-        self._palette[1] = outline_color
-        self._palette[2] = bar_color
 
         # _width and _height are already in use for blinka TileGrid
         self._bar_width = width
@@ -80,7 +75,15 @@ def __init__(
             for line in range(stroke):
                 self._bitmap[line, _h] = 1
                 self._bitmap[width - 1 - line, _h] = 1
-        super().__init__(self._bitmap, pixel_shader=self._palette, x=x, y=y)
+
+        super(ProgressBarBase, self).__init__(
+            (x, y),
+            (width, height),
+            self.progress,
+            self._palette[0],
+            self._palette[1],
+            self._palette[2],
+        )
 
     @property
     def progress(self):
@@ -147,3 +150,6 @@ def fill(self, color):
         else:
             self._palette[2] = color
             self._palette.make_opaque(0)
+
+    def render(self):
+        super().render()

Adafruit_ProgressBar/adafruit_progressbar_base.py

@@ -0,0 +1,90 @@
+# SPDX-FileCopyrightText: 2020 Brent Rubell for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+"""
+`adafruit_progressbar`
+================================================================================
+
+Dynamic progress bar widget for CircuitPython displays
+
+
+* Author(s): Brent Rubell and Hugo Dahl
+
+Implementation Notes
+--------------------
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://github.com/adafruit/circuitpython/releases
+
+"""
+
+# imports
+import displayio
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/brentru/Adafruit_CircuitPython_ProgressBar.git"
+
+
+class ProgressBarBase(displayio.TileGrid):
+    def __init__(
+        self,
+        position: (int, int),
+        size: (int, int),
+        start_value: float = 0.0,
+        bar_color=0x00FF00,
+        outline_color=0xFFFFFF,
+        fill_color=0x000000,
+    ):
+
+        self._size = size
+        self._position = position
+        self._progress = start_value
+        self._bitmap = displayio.Bitmap(self.width, self.height, 3)
+        self._palette = displayio.Palette(3)
+        self._palette[0] = fill_color
+        self._palette[1] = outline_color
+        self._palette[2] = bar_color
+
+        super(ProgressBarBase, self).__init__(
+            self._bitmap,
+            pixel_shader=self._palette,
+            x=self._position[0],
+            y=self._position[1],
+        )
+
+    _bitmap: displayio.Bitmap  # The bitmap used for the bar/value
+    _position: (int, int)  # The (x,y) coordinates of the top-left corner
+    _size: (int, int)  # The dimensions of the progress bar
+    _palette: displayio.Palette(3)  # The palette to be used
+    _progress: float  # The value to represent, between 0.0 and 100.0
+
+    @property.getter
+    def width(self):
+        return self._size[0]
+
+    @property.getter
+    def height(self):
+        return self._size[1]
+
+    @property.getter
+    def x(self):
+        return self._position[0]
+
+    @property.getter
+    def y(self):
+        return self._position[1]
+
+    @property
+    def progress(self):
+        return self._progress
+
+    @property.setter
+    def progress(self, value):
+        self._progress = value
+        self.render()
+
+    def render(self):
+        pass