Skip to content

Commit bca9d76

Browse files
authored
Merge pull request #1 from rhooper/clue-adaptation
merge badge changes into clue adaptation
2 parents 0aada9e + 07f6d9f commit bca9d76

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

adafruit_pybadger/pybadger_base.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -215,35 +215,40 @@ def show_business_card(self, *, image_name=None, name_string=None, name_scale=1,
215215
``terminalio.FONT``.
216216
217217
"""
218-
business_card_splash = displayio.Group(max_size=30)
219-
self.display.show(business_card_splash)
220-
with open(image_name, "rb") as file_name:
221-
on_disk_bitmap = displayio.OnDiskBitmap(file_name)
222-
face_image = displayio.TileGrid(on_disk_bitmap, pixel_shader=displayio.ColorConverter())
223-
business_card_splash.append(face_image)
224-
try:
225-
self.display.refresh(target_frames_per_second=60)
226-
except AttributeError:
227-
self.display.wait_for_frame()
228-
218+
business_card_label_groups = []
229219
if name_string:
230220
name_group = self._create_label_group(text=name_string,
231221
font=name_font,
232222
scale=name_scale,
233223
height_adjustment=0.73)
234-
business_card_splash.append(name_group)
224+
business_card_label_groups.append(name_group)
235225
if email_string_one:
236226
email_one_group = self._create_label_group(text=email_string_one,
237227
font=email_font_one,
238228
scale=email_scale_one,
239229
height_adjustment=0.84)
240-
business_card_splash.append(email_one_group)
230+
business_card_label_groups.append(email_one_group)
241231
if email_string_two:
242232
email_two_group = self._create_label_group(text=email_string_two,
243233
font=email_font_two,
244234
scale=email_scale_two,
245235
height_adjustment=0.91)
246-
business_card_splash.append(email_two_group)
236+
business_card_label_groups.append(email_two_group)
237+
238+
business_card_splash = displayio.Group(max_size=4)
239+
self.display.show(business_card_splash)
240+
with open(image_name, "rb") as file_name:
241+
on_disk_bitmap = displayio.OnDiskBitmap(file_name)
242+
face_image = displayio.TileGrid(on_disk_bitmap, pixel_shader=displayio.ColorConverter())
243+
business_card_splash.append(face_image)
244+
for group in business_card_label_groups:
245+
business_card_splash.append(group)
246+
try:
247+
# Refresh display in CircuitPython 5
248+
self.display.refresh()
249+
except AttributeError:
250+
# Refresh display in CircuitPython 4
251+
self.display.wait_for_frame()
247252

248253
# pylint: disable=too-many-locals
249254
def show_badge(self, *, background_color=0xFF0000, foreground_color=0xFFFFFF,

0 commit comments

Comments
 (0)