Merge pull request #3087 from FoamyGuy/magtag_updates

Change deprecated splash usage to root_group

Author: FoamyGuy

FunHouse_Fume_Extractor/code.py

@@ -56,7 +56,7 @@
 group = displayio.Group()
 #  adding start-up bitmap to group
 group.append(tile_grid)
-funhouse.splash.append(group)
+funhouse.graphics.root_group.append(group)
 #  text for fume data
 fume_text = funhouse.add_text(
     text="    ",
@@ -74,7 +74,7 @@
     text_font="fonts/Arial-Bold-24.pcf",
 )
 #  showing graphics
-funhouse.display.root_group = funhouse.splash
+funhouse.display.root_group = funhouse.graphics.root_group
 
 #  state machines
 run = False #  state if main code is running

FunHouse_HA_Companion/code.py

@@ -65,10 +65,10 @@
 )
 
 # Now display the splash to draw all labels at once
-funhouse.display.root_group = funhouse.splash
+funhouse.display.root_group = funhouse.graphics.root_group
 
 status = Circle(229, 10, 10, fill=0xFF0000, outline=0x880000)
-funhouse.splash.append(status)
+funhouse.graphics.root_group.append(status)
 
 def connected(client, _userdata, _result, _payload):
     status.fill = 0x00FF00

FunHouse_LIFX/code.py

@@ -77,7 +77,7 @@ def set_label_color(conditional, index, on_color):
     text=trip_time, text_scale=2, text_position=(30, 25), text_color=0x606060
 )
 
-funhouse.display.root_group = funhouse.splash
+funhouse.display.root_group = funhouse.graphics.root_group
 
 # Turn on the light
 print("Turning on light...")

FunHouse_Mailslot/code.py

@@ -31,7 +31,7 @@
 )
 reset_label = funhouse.add_text(text="reset", text_position=(3, 70), text_color=GRAY)
 
-funhouse.display.root_group = funhouse.splash
+funhouse.display.root_group = funhouse.graphics.root_group
 
 
 def send_io_data(mail_value):

FunHouse_Motion_Outlet/code.py

@@ -82,10 +82,10 @@ def timeleft():
     text_color=0xFFFF00,
     text_font="fonts/Arial-Bold-24.pcf",
 )
-funhouse.display.root_group = funhouse.splash
+funhouse.display.root_group = funhouse.graphics.root_group
 
 status = Circle(229, 10, 10, fill=0xFF0000, outline=0x880000)
-funhouse.splash.append(status)
+funhouse.graphics.root_group.append(status)
 
 # Initialize a new MQTT Client object
 if USE_MQTT:

FunHouse_Pet_Bowl_Sensor/code.py

@@ -77,10 +77,10 @@ def bowl_level_display(level):
     text_color=0xFFFF00,
     text_font="fonts/Arial-Bold-24.pcf",
 )
-funhouse.display.root_group = funhouse.splash
+funhouse.display.root_group = funhouse.graphics.root_group
 
 status = Circle(229, 10, 10, fill=0xFF0000, outline=0x880000)
-funhouse.splash.append(status)
+funhouse.graphics.root_group.append(status)
 
 # Initialize a new MQTT Client object
 funhouse.network.init_mqtt(

MagTag/MagTag_Covid_Vaccination/code.py

@@ -65,8 +65,8 @@
     BAR_X, 95, BAR_WIDTH, BAR_HEIGHT, 1.0, bar_color=0x999999, outline_color=0x000000
 )
 
-magtag.graphics.splash.append(progress_bar)
-magtag.graphics.splash.append(progress_bar_1)
+magtag.graphics.root_group.append(progress_bar)
+magtag.graphics.root_group.append(progress_bar_1)
 magtag.graphics.set_background("/bmps/background.bmp")
 
 

MagTag/MagTag_Flashcards/chapters/code.py

@@ -40,7 +40,7 @@
 
 # Add button labels at the bottom of the screen
 BUTTON_TEXT_IDX = list_len
-magtag.graphics.splash.append(Rect(0, magtag.graphics.display.height - 14,
+magtag.graphics.root_group.append(Rect(0, magtag.graphics.display.height - 14,
                                    magtag.graphics.display.width,
                                    magtag.graphics.display.height, fill=0x0))
 magtag.add_text(

MagTag/MagTag_Google_Calendar/authenticator.py

@@ -32,7 +32,7 @@
 display = graphics.display
 
 background = Rect(0, 0, 296, 128, fill=0xFFFFFF)
-graphics.splash.append(background)
+graphics.root_group.append(background)
 
 label_overview_text = Label(
     font_large,
@@ -42,18 +42,18 @@
     color=0x000000,
     text="Authorize this device with Google:",
 )
-graphics.splash.append(label_overview_text)
+graphics.root_group.append(label_overview_text)
 
 label_verification_url = Label(font_small, x=0, y=40, line_spacing=0.75, color=0x000000)
-graphics.splash.append(label_verification_url)
+graphics.root_group.append(label_verification_url)
 
 label_user_code = Label(font_small, x=0, y=80, color=0x000000, line_spacing=0.75)
-graphics.splash.append(label_user_code)
+graphics.root_group.append(label_user_code)
 
 label_qr_code = Label(
     font_small, x=0, y=100, color=0x000000, text="Or scan the QR code:"
 )
-graphics.splash.append(label_qr_code)
+graphics.root_group.append(label_qr_code)
 
 # Set scope(s) of access required by the API you're using
 scopes = ["https://www.googleapis.com/auth/calendar.readonly"]
@@ -85,7 +85,7 @@
 label_user_code.text = "2. Enter code: %s" % google_auth.user_code
 
 graphics.qrcode(google_auth.verification_url.encode(), qr_size=2, x=240, y=70)
-graphics.display.root_group = graphics.splash
+graphics.display.root_group = graphics.root_group
 display.refresh()
 
 # Poll Google's authorization server
@@ -98,9 +98,9 @@
 print(f'google_access_token="{google_auth.access_token}"')
 print(f'google_refresh_token="{google_auth.refresh_token}"')
 
-graphics.splash.pop()
-graphics.splash.pop()
-graphics.splash.pop()
+graphics.root_group.pop()
+graphics.root_group.pop()
+graphics.root_group.pop()
 
 label_overview_text.text = "Successfully Authenticated!"
 label_verification_url.text = (

MagTag/MagTag_Google_Calendar/code.py

@@ -205,7 +205,7 @@ def display_calendar_events(resp_events):
 
 # Add the header
 line_header = Line(0, 30, 320, 30, color=0x000000)
-magtag.splash.append(line_header)
+magtag.graphics.root_group.append(line_header)
 
 label_header = magtag.add_text(
     text_font="fonts/Arial-18.pcf",