Merge branch 'adafruit_master' into directional_label

# Conflicts:
#	adafruit_display_text/__init__.py

Author: jposada202020

adafruit_display_text/__init__.py

@@ -5,7 +5,6 @@
 """
 Display Text module helper functions
 """
-
 try:
     from typing import Tuple
 except ImportError:
@@ -297,12 +296,12 @@ def background_color(self) -> int:
         """Color of the background as an RGB hex number."""
         return self._background_color
 
-    def _set_background_color(self, new_color: int) -> None:
+    def _set_background_color(self, new_color):
         # subclasses should override this
         pass
 
     @background_color.setter
-    def background_color(self, new_color: int):
+    def background_color(self, new_color: int) -> None:
         self._set_background_color(new_color)
 
     @property

adafruit_display_text/label.py

@@ -78,7 +78,7 @@ def __init__(self, font, **kwargs) -> None:
         super().__init__(font, **kwargs)
 
         max_glyphs = kwargs.get("max_glyphs", None)
-        text = kwargs.get("text", None)
+        text = kwargs.get("text", "")
 
         if not max_glyphs and not text:
             raise RuntimeError("Please provide a max size, or initial text")

examples/display_text_label_align_baseline_comparison.py

@@ -15,7 +15,7 @@
 
 # Font definition. You can choose any two fonts available in your system
 MEDIUM_FONT = bitmap_font.load_font("LeagueSpartan-Bold-16.bdf")
-BIG_FONT = bitmap_font.load_font("IBMPlexMono-Medium-24_jep.bdf")
+BIG_FONT = bitmap_font.load_font("LibreBodoniv2002-Bold-27.bdf")
 
 TEXT_RIGHT = "MG"
 TEXT_LEFT = "32.47"
@@ -40,7 +40,7 @@
     text=TEXT_RIGHT,
     color=0x000000,
     background_color=0x999999,
-    x=80,
+    x=90,
     y=50,
     base_alignment=False,
 )
@@ -63,7 +63,7 @@
     text=TEXT_RIGHT,
     color=0x000000,
     background_color=0x999999,
-    x=80,
+    x=90,
     y=100,
     base_alignment=True,
 )