From 24dd18e732cf23963fea14d4e3b50d1c11f84f4a Mon Sep 17 00:00:00 2001 From: Jared VanFleet Date: Fri, 13 Aug 2021 08:53:34 -0500 Subject: [PATCH 1/7] Update for box around text Updated code to allow for background_color to be set for box around text in business card or custom. None = Transparent, Color number Hex = background box color. --- adafruit_pybadger/pybadger_base.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py index dc187d7..00d5d68 100644 --- a/adafruit_pybadger/pybadger_base.py +++ b/adafruit_pybadger/pybadger_base.py @@ -355,6 +355,7 @@ def _create_label_group( font, scale, height_adjustment, + background_color=None, color=0xFFFFFF, width_adjustment=2, line_spacing=0.75, @@ -365,7 +366,7 @@ def _create_label_group( font = load_font(font, text) create_label_group = displayio.Group(scale=scale) - create_label = self._label.Label(font, text=text, line_spacing=line_spacing) + create_label = self._label.Label(font, text=text, line_spacing=line_spacing, background_color=background_color) _, _, width, _ = create_label.bounding_box create_label.x = (self.display.width // (width_adjustment * scale)) - width // 2 create_label.y = int(self.display.height * (height_adjustment / scale)) @@ -447,6 +448,7 @@ def show_business_card( name_string=None, name_scale=1, name_font=terminalio.FONT, + background_color=None, email_string_one=None, email_scale_one=1, email_font_one=terminalio.FONT, @@ -491,6 +493,7 @@ def show_business_card( font=name_font, scale=name_scale, height_adjustment=0.73, + background_color=background_color, ) business_card_label_groups.append(name_group) if email_string_one: @@ -499,6 +502,7 @@ def show_business_card( font=email_font_one, scale=email_scale_one, height_adjustment=0.84, + background_color=background_color, ) business_card_label_groups.append(email_one_group) if email_string_two: @@ -507,6 +511,7 @@ def show_business_card( font=email_font_two, scale=email_scale_two, height_adjustment=0.91, + background_color=background_color, ) business_card_label_groups.append(email_two_group) From 1b8e81933b8739c77e0c900f0aa26cc2b11179de Mon Sep 17 00:00:00 2001 From: Jared VanFleet Date: Fri, 13 Aug 2021 09:03:28 -0500 Subject: [PATCH 2/7] Update pybadger_base font color Update to use font-color with background color in custom business card. --- adafruit_pybadger/pybadger_base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py index 00d5d68..bd41207 100644 --- a/adafruit_pybadger/pybadger_base.py +++ b/adafruit_pybadger/pybadger_base.py @@ -448,6 +448,7 @@ def show_business_card( name_string=None, name_scale=1, name_font=terminalio.FONT, + font_color=0xFFFFFF, background_color=None, email_string_one=None, email_scale_one=1, @@ -491,6 +492,7 @@ def show_business_card( name_group = self._create_label_group( text=name_string, font=name_font, + color=font_color, scale=name_scale, height_adjustment=0.73, background_color=background_color, @@ -500,6 +502,7 @@ def show_business_card( email_one_group = self._create_label_group( text=email_string_one, font=email_font_one, + color=font_color, scale=email_scale_one, height_adjustment=0.84, background_color=background_color, @@ -509,6 +512,7 @@ def show_business_card( email_two_group = self._create_label_group( text=email_string_two, font=email_font_two, + color=font_color, scale=email_scale_two, height_adjustment=0.91, background_color=background_color, From d7d1e73b04745738f38e4e5f16f2f12637e71661 Mon Sep 17 00:00:00 2001 From: Jared VanFleet Date: Fri, 13 Aug 2021 12:46:42 -0500 Subject: [PATCH 3/7] make black.py happy black check should succeed now. --- adafruit_pybadger/pybadger_base.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py index bd41207..6ec9b3a 100644 --- a/adafruit_pybadger/pybadger_base.py +++ b/adafruit_pybadger/pybadger_base.py @@ -366,7 +366,12 @@ def _create_label_group( font = load_font(font, text) create_label_group = displayio.Group(scale=scale) - create_label = self._label.Label(font, text=text, line_spacing=line_spacing, background_color=background_color) + create_label = self._label.Label( + font, + text=text, + line_spacing=line_spacing, + background_color=background_color, + ) _, _, width, _ = create_label.bounding_box create_label.x = (self.display.width // (width_adjustment * scale)) - width // 2 create_label.y = int(self.display.height * (height_adjustment / scale)) From 09b67e58c07949bc8c83e4eed8b4b26a82f79e81 Mon Sep 17 00:00:00 2001 From: Jared VanFleet Date: Fri, 13 Aug 2021 16:05:07 -0500 Subject: [PATCH 4/7] update pybadger for clearer text --- .vscode/settings.json | 3 +++ adafruit_pybadger/pybadger_base.py | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..500bc70 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.linting.pylintEnabled": true +} \ No newline at end of file diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py index 6ec9b3a..4646d3b 100644 --- a/adafruit_pybadger/pybadger_base.py +++ b/adafruit_pybadger/pybadger_base.py @@ -355,7 +355,7 @@ def _create_label_group( font, scale, height_adjustment, - background_color=None, + font_background_color=None, color=0xFFFFFF, width_adjustment=2, line_spacing=0.75, @@ -370,7 +370,7 @@ def _create_label_group( font, text=text, line_spacing=line_spacing, - background_color=background_color, + background_color=font_background_color, ) _, _, width, _ = create_label.bounding_box create_label.x = (self.display.width // (width_adjustment * scale)) - width // 2 @@ -454,7 +454,7 @@ def show_business_card( name_scale=1, name_font=terminalio.FONT, font_color=0xFFFFFF, - background_color=None, + font_background_color=None, email_string_one=None, email_scale_one=1, email_font_one=terminalio.FONT, @@ -500,7 +500,7 @@ def show_business_card( color=font_color, scale=name_scale, height_adjustment=0.73, - background_color=background_color, + background_color=font_background_color, ) business_card_label_groups.append(name_group) if email_string_one: @@ -510,7 +510,7 @@ def show_business_card( color=font_color, scale=email_scale_one, height_adjustment=0.84, - background_color=background_color, + background_color=font_background_color, ) business_card_label_groups.append(email_one_group) if email_string_two: @@ -520,7 +520,7 @@ def show_business_card( color=font_color, scale=email_scale_two, height_adjustment=0.91, - background_color=background_color, + background_color=font_background_color, ) business_card_label_groups.append(email_two_group) From b831795f8dcc55e49eb91f89ca2b7f4e029ff86d Mon Sep 17 00:00:00 2001 From: Jared VanFleet Date: Fri, 13 Aug 2021 16:08:07 -0500 Subject: [PATCH 5/7] revert made too many changes --- adafruit_pybadger/pybadger_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py index 4646d3b..ce4f130 100644 --- a/adafruit_pybadger/pybadger_base.py +++ b/adafruit_pybadger/pybadger_base.py @@ -355,7 +355,7 @@ def _create_label_group( font, scale, height_adjustment, - font_background_color=None, + background_color=None, color=0xFFFFFF, width_adjustment=2, line_spacing=0.75, From fdfecf1e3565f48b289dcc9a84746ad132bcaee1 Mon Sep 17 00:00:00 2001 From: Jared VanFleet Date: Fri, 13 Aug 2021 16:10:27 -0500 Subject: [PATCH 6/7] More error correction --- adafruit_pybadger/pybadger_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py index ce4f130..646249c 100644 --- a/adafruit_pybadger/pybadger_base.py +++ b/adafruit_pybadger/pybadger_base.py @@ -370,7 +370,7 @@ def _create_label_group( font, text=text, line_spacing=line_spacing, - background_color=font_background_color, + background_color=background_color, ) _, _, width, _ = create_label.bounding_box create_label.x = (self.display.width // (width_adjustment * scale)) - width // 2 From fa9247f5640ada4d69a964daa80bb8975c59210d Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 13 Aug 2021 16:41:50 -0500 Subject: [PATCH 7/7] remove .vscode and add it to gitignore --- .gitignore | 1 + .vscode/settings.json | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 9647e71..39dd71b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.mpy .idea +.vscode __pycache__ _build *.pyc diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 500bc70..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.linting.pylintEnabled": true -} \ No newline at end of file