From 4f3fbebe7fc7e7f95a554fd1eb462e0f54dfc43f Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Tue, 27 Feb 2024 02:05:40 -0600
Subject: [PATCH 01/46] kivymd testing

---
 Launcher.py      |  49 +++++++++++-----------
 data/client.kv   |  11 ++---
 kvui.py          | 106 ++++++++++++++++++++++++++---------------------
 requirements.txt |   1 +
 4 files changed, 89 insertions(+), 78 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 9e184bf1088d..8db7f4dbf2c4 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -1,5 +1,5 @@
 """
-Archipelago launcher for bundled app.
+Archipelago launcher for bundled MDApp.
 
 * if run with APBP as argument, launch corresponding client.
 * if run with executable as argument, run it passing argv[2:] as arguments
@@ -8,7 +8,7 @@
 Scroll down to components= to add components to the launcher as well as setup.py
 """
 
-
+import os
 import argparse
 import itertools
 import logging
@@ -154,21 +154,21 @@ def launch(exe, in_terminal=False):
                 subprocess.Popen([terminal, '-e', shlex.join(exe)])
                 return
         elif is_macos:
-            terminal = [which('open'), '-W', '-a', 'Terminal.app']
+            terminal = [which('open'), '-W', '-a', 'Terminal.MDApp']
             subprocess.Popen([*terminal, *exe])
             return
     subprocess.Popen(exe)
 
 
 def run_gui():
-    from kvui import App, ContainerLayout, GridLayout, Button, Label
+    from kvui import MDApp, MDFloatLayout, MDGridLayout, MDRectangleFlatIconButton, MDLabel
     from kivy.uix.image import AsyncImage
-    from kivy.uix.relativelayout import RelativeLayout
+    from kivymd.uix.relativelayout import MDRelativeLayout
 
-    class Launcher(App):
+    class Launcher(MDApp):
         base_title: str = "Archipelago Launcher"
-        container: ContainerLayout
-        grid: GridLayout
+        container: MDFloatLayout
+        grid: MDGridLayout
 
         _tools = {c.display_name: c for c in components if c.type == Type.TOOL}
         _clients = {c.display_name: c for c in components if c.type == Type.CLIENT}
@@ -182,14 +182,18 @@ def __init__(self, ctx=None):
             super().__init__()
 
         def build(self):
-            self.container = ContainerLayout()
-            self.grid = GridLayout(cols=2)
+            self.theme_cls.theme_style = "Dark"
+            self.theme_cls.primary_palette = "Green"
+            self.container = MDFloatLayout()
+            self.grid = MDGridLayout(cols=2)
             self.container.add_widget(self.grid)
-            self.grid.add_widget(Label(text="General"))
-            self.grid.add_widget(Label(text="Clients"))
+            self.grid.add_widget(MDLabel(text="General"))
+            self.grid.add_widget(MDLabel(text="Clients"))
             button_layout = self.grid  # make buttons fill the window
+            self.grid.padding = 10
+            self.grid.spacing = 5
 
-            def build_button(component: Component):
+            def build_button(component: Component, col=1):
                 """
                 Builds a button widget for a given component.
 
@@ -200,18 +204,13 @@ def build_button(component: Component):
                     None. The button is added to the parent grid layout.
 
                 """
-                button = Button(text=component.display_name)
+                button = MDRectangleFlatIconButton(text=component.display_name)
                 button.component = component
                 button.bind(on_release=self.component_action)
+                button.size_hint = (1, 1)
                 if component.icon != "icon":
-                    image = AsyncImage(source=icon_paths[component.icon],
-                                       size=(38, 38), size_hint=(None, 1), pos=(5, 0))
-                    box_layout = RelativeLayout()
-                    box_layout.add_widget(button)
-                    box_layout.add_widget(image)
-                    button_layout.add_widget(box_layout)
-                else:
-                    button_layout.add_widget(button)
+                    button.icon = icon_paths[component.icon]
+                button_layout.add_widget(button)
 
             for (tool, client) in itertools.zip_longest(itertools.chain(
                     self._tools.items(), self._miscs.items(), self._adjusters.items()), self._clients.items()):
@@ -219,12 +218,12 @@ def build_button(component: Component):
                 if tool:
                     build_button(tool[1])
                 else:
-                    button_layout.add_widget(Label())
+                    button_layout.add_widget(MDLabel())
                 # column 2
                 if client:
                     build_button(client[1])
                 else:
-                    button_layout.add_widget(Label())
+                    button_layout.add_widget(MDLabel())
 
             return self.container
 
@@ -250,7 +249,7 @@ def run_component(component: Component, *args):
     elif component.script_name:
         subprocess.run([*get_exe(component.script_name), *args])
     else:
-        logging.warning(f"Component {component} does not appear to be executable.")
+        logging.warning(f"Component {component} does not MDAppear to be executable.")
 
 
 def main(args: Optional[Union[argparse.Namespace, dict]] = None):
diff --git a/data/client.kv b/data/client.kv
index 3b48d216ddb3..879f85fe07b3 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -13,10 +13,10 @@
     plum: "AF99EF"  # typically progression item
     salmon: "FA8072"  # typically trap item
     white: "FFFFFF"  # not used, if you want to change the generic text color change color in Label
-<Label>:
+<MDLabel>:
     color: "FFFFFF"
-<TabbedPanel>:
-    tab_width: root.width / app.tab_count
+<MDTabs>:
+    fixed_tab_label_width: root.width / app.tab_count
 <TooltipLabel>:
     text_size: self.width, None
     size_hint_y: None
@@ -26,7 +26,7 @@
 <SelectableLabel>:
     canvas.before:
         Color:
-            rgba: (.0, 0.9, .1, .3) if self.selected else (0.2, 0.2, 0.2, 1)
+            rgba: (.0, 0.9, .1, .3) if self.selected else (0,0,0,0)
         Rectangle:
             size: self.size
             pos: self.pos
@@ -48,7 +48,7 @@
 <HintLabel>:
     canvas.before:
         Color:
-            rgba: (.0, 0.9, .1, .3) if self.selected else (0.2, 0.2, 0.2, 1) if self.striped else (0.18, 0.18, 0.18, 1)
+            rgba: (.0, 0.9, .1, .3) if self.selected else (0.4, 0.4, 0.4, 0.1) if self.striped else (0.0, 0.0, 0.0, 0)
         Rectangle:
             size: self.size
             pos: self.pos
@@ -112,6 +112,7 @@
 <ServerLabel>:
     text: "Server:"
     size_hint_x: None
+    halign: "center"
 <ContainerLayout>:
     size_hint_x: 1
     size_hint_y: 1
diff --git a/kvui.py b/kvui.py
index 22e179d5be94..74c992dba648 100644
--- a/kvui.py
+++ b/kvui.py
@@ -29,7 +29,6 @@
 Config.set("kivy", "exit_on_escape", "0")
 Config.set("graphics", "multisamples", "0")  # multisamples crash old intel drivers
 
-from kivy.app import App
 from kivy.core.window import Window
 from kivy.core.clipboard import Clipboard
 from kivy.core.text.markup import MarkupLabel
@@ -39,16 +38,7 @@
 from kivy.properties import BooleanProperty, ObjectProperty
 from kivy.metrics import dp
 from kivy.uix.widget import Widget
-from kivy.uix.button import Button
-from kivy.uix.gridlayout import GridLayout
 from kivy.uix.layout import Layout
-from kivy.uix.textinput import TextInput
-from kivy.uix.recycleview import RecycleView
-from kivy.uix.tabbedpanel import TabbedPanel, TabbedPanelItem
-from kivy.uix.boxlayout import BoxLayout
-from kivy.uix.floatlayout import FloatLayout
-from kivy.uix.label import Label
-from kivy.uix.progressbar import ProgressBar
 from kivy.utils import escape_markup
 from kivy.lang import Builder
 from kivy.uix.recycleview.views import RecycleDataViewBehavior
@@ -57,6 +47,17 @@
 from kivy.uix.recycleview.layout import LayoutSelectionBehavior
 from kivy.animation import Animation
 from kivy.uix.popup import Popup
+from kivymd.app import MDApp
+from kivymd.uix.gridlayout import MDGridLayout
+from kivymd.uix.floatlayout import MDFloatLayout
+from kivymd.uix.boxlayout import MDBoxLayout
+from kivymd.uix.tab.tab import MDTabs, MDTabsBase
+from kivymd.uix.button import MDRectangleFlatButton, MDRaisedButton
+from kivymd.uix.label import MDLabel
+from kivymd.uix.recycleview import MDRecycleView
+from kivymd.uix.recyclegridlayout import MDRecycleGridLayout
+from kivymd.uix.textfield.textfield import MDTextFieldRect
+from kivymd.uix.progressbar import MDProgressBar
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
 
@@ -110,7 +111,7 @@ def on_cursor_leave(self, *args):
 Factory.register("HoverBehavior", HoverBehavior)
 
 
-class ToolTip(Label):
+class ToolTip(MDLabel):
     pass
 
 
@@ -118,7 +119,7 @@ class ServerToolTip(ToolTip):
     pass
 
 
-class HovererableLabel(HoverBehavior, Label):
+class HovererableLabel(HoverBehavior, MDLabel):
     pass
 
 
@@ -131,11 +132,11 @@ def create_tooltip(self, text, x, y):
             # update
             self.tooltip.children[0].text = text
         else:
-            self.tooltip = FloatLayout()
+            self.tooltip = MDFloatLayout()
             tooltip_label = ToolTip(text=text)
             self.tooltip.add_widget(tooltip_label)
             fade_in_animation.start(self.tooltip)
-            App.get_running_app().root.add_widget(self.tooltip)
+            MDApp.get_running_app().root.add_widget(self.tooltip)
 
         # handle left-side boundary to not render off-screen
         x = max(x, 3 + self.tooltip.children[0].texture_size[0] / 2)
@@ -146,7 +147,7 @@ def create_tooltip(self, text, x, y):
 
     def remove_tooltip(self):
         if self.tooltip:
-            App.get_running_app().root.remove_widget(self.tooltip)
+            MDApp.get_running_app().root.remove_widget(self.tooltip)
             self.tooltip = None
 
     def on_mouse_pos(self, window, pos):
@@ -179,21 +180,21 @@ def on_leave(self):
 class ServerLabel(HovererableLabel):
     def __init__(self, *args, **kwargs):
         super(HovererableLabel, self).__init__(*args, **kwargs)
-        self.layout = FloatLayout()
+        self.layout = MDFloatLayout()
         self.popuplabel = ServerToolTip(text="Test")
         self.layout.add_widget(self.popuplabel)
 
     def on_enter(self):
         self.popuplabel.text = self.get_text()
-        App.get_running_app().root.add_widget(self.layout)
+        MDApp.get_running_app().root.add_widget(self.layout)
         fade_in_animation.start(self.layout)
 
     def on_leave(self):
-        App.get_running_app().root.remove_widget(self.layout)
+        MDApp.get_running_app().root.remove_widget(self.layout)
 
     @property
     def ctx(self) -> context_type:
-        return App.get_running_app().ctx
+        return MDApp.get_running_app().ctx
 
     def get_text(self):
         if self.ctx.server:
@@ -231,18 +232,18 @@ def get_text(self):
             return "No current server connection. \nPlease connect to an Archipelago server."
 
 
-class MainLayout(GridLayout):
+class MainLayout(MDGridLayout):
     pass
 
 
-class ContainerLayout(FloatLayout):
+class ContainerLayout(MDFloatLayout):
     pass
 
 
 class SelectableRecycleBoxLayout(FocusBehavior, LayoutSelectionBehavior,
                                  RecycleBoxLayout):
     """ Adds selection and focus behaviour to the view. """
-
+    pass
 
 class SelectableLabel(RecycleDataViewBehavior, TooltipLabel):
     """ Add selection support to the Label """
@@ -266,14 +267,14 @@ def on_touch_down(self, touch):
                 # Not a fan of the following few lines, but they work.
                 temp = MarkupLabel(text=self.text).markup
                 text = "".join(part for part in temp if not part.startswith(("[color", "[/color]", "[ref=", "[/ref]")))
-                cmdinput = App.get_running_app().textinput
+                cmdinput = MDApp.get_running_app().textinput
                 if not cmdinput.text and " did you mean " in text:
                     for question in ("Didn't find something that closely matches, did you mean ",
                                      "Too many close matches, did you mean "):
                         if text.startswith(question):
                             name = Utils.get_text_between(text, question,
                                                           "? (")
-                            cmdinput.text = f"!{App.get_running_app().last_autofillable_command} {name}"
+                            cmdinput.text = f"!{MDApp.get_running_app().last_autofillable_command} {name}"
                             break
                 elif not cmdinput.text and text.startswith("Missing: "):
                     cmdinput.text = text.replace("Missing: ", "!hint_location ")
@@ -286,7 +287,7 @@ def apply_selection(self, rv, index, is_selected):
         self.selected = is_selected
 
 
-class HintLabel(RecycleDataViewBehavior, BoxLayout):
+class HintLabel(RecycleDataViewBehavior, MDBoxLayout):
     selected = BooleanProperty(False)
     striped = BooleanProperty(False)
     index = None
@@ -345,14 +346,14 @@ def apply_selection(self, rv, index, is_selected):
             self.selected = is_selected
 
 
-class ConnectBarTextInput(TextInput):
+class ConnectBarTextInput(MDTextFieldRect):
     def insert_text(self, substring, from_undo=False):
         s = substring.replace("\n", "").replace("\r", "")
         return super(ConnectBarTextInput, self).insert_text(s, from_undo=from_undo)
 
 
 class MessageBox(Popup):
-    class MessageBoxLabel(Label):
+    class MessageBoxLabel(MDLabel):
         def __init__(self, **kwargs):
             super().__init__(**kwargs)
             self._label.refresh()
@@ -369,15 +370,17 @@ def __init__(self, title, text, error=False, **kwargs):
                          separator_color=separator_color, **kwargs)
         self.height += max(0, label.height - 18)
 
+class MDTab(MDTabsBase, MDBoxLayout):
+    pass
 
-class GameManager(App):
+class GameManager(MDApp):
     logging_pairs = [
         ("Client", "Archipelago"),
     ]
     base_title: str = "Archipelago Client"
     last_autofillable_command: str
 
-    main_area_container: GridLayout
+    main_area_container: MDGridLayout
     """ subclasses can add more columns beside the tabs """
 
     def __init__(self, ctx: context_type):
@@ -409,15 +412,17 @@ def intercept_say(text):
     @property
     def tab_count(self):
         if hasattr(self, "tabs"):
-            return max(1, len(self.tabs.tab_list))
+            return max(1, len(self.tabs.get_tab_list()))
         return 1
 
     def build(self) -> Layout:
+        self.theme_cls.theme_style = "Dark"
+        self.theme_cls.primary_palette = "Green"
         self.container = ContainerLayout()
 
         self.grid = MainLayout()
         self.grid.cols = 1
-        self.connect_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
+        self.connect_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
         # top part
         server_label = ServerLabel()
         self.connect_layout.add_widget(server_label)
@@ -431,46 +436,50 @@ def connect_bar_validate(sender):
 
         self.server_connect_bar.bind(on_text_validate=connect_bar_validate)
         self.connect_layout.add_widget(self.server_connect_bar)
-        self.server_connect_button = Button(text="Connect", size=(dp(100), dp(30)), size_hint_y=None, size_hint_x=None)
+        self.server_connect_button = MDRaisedButton(text="Connect", size=(dp(100), dp(30)), size_hint_y=None, size_hint_x=None)
         self.server_connect_button.bind(on_press=self.connect_button_action)
         self.connect_layout.add_widget(self.server_connect_button)
         self.grid.add_widget(self.connect_layout)
-        self.progressbar = ProgressBar(size_hint_y=None, height=3)
+        self.progressbar = MDProgressBar(size_hint_y=None, height=3)
         self.grid.add_widget(self.progressbar)
 
         # middle part
-        self.tabs = TabbedPanel(size_hint_y=1)
-        self.tabs.default_tab_text = "All"
+        self.tabs = MDTabs(size_hint=(1, 1), tab_hint_x=True)
+        self.tabs.default_tab = MDTab(title="All")
         self.log_panels["All"] = self.tabs.default_tab_content = UILog(*(logging.getLogger(logger_name)
                                                                          for logger_name, name in
                                                                          self.logging_pairs))
+        self.tabs.default_tab.add_widget(self.tabs.default_tab_content)
+        self.tabs.add_widget(self.tabs.default_tab)
 
         for logger_name, display_name in self.logging_pairs:
             bridge_logger = logging.getLogger(logger_name)
-            panel = TabbedPanelItem(text=display_name)
+            panel = MDTab(title=display_name)
             self.log_panels[display_name] = panel.content = UILog(bridge_logger)
+            panel.add_widget(panel.content)
             if len(self.logging_pairs) > 1:
                 # show Archipelago tab if other logging is present
                 self.tabs.add_widget(panel)
 
-        hint_panel = TabbedPanelItem(text="Hints")
+        hint_panel = MDTab(title="Hints")
         self.log_panels["Hints"] = hint_panel.content = HintLog(self.json_to_kivy_parser)
+        hint_panel.add_widget(hint_panel.content)
         self.tabs.add_widget(hint_panel)
 
         if len(self.logging_pairs) == 1:
-            self.tabs.default_tab_text = "Archipelago"
+            self.tabs.default_tab.title = "Archipelago"
 
-        self.main_area_container = GridLayout(size_hint_y=1, rows=1)
+        self.main_area_container = MDGridLayout(size_hint_y=1, rows=1)
         self.main_area_container.add_widget(self.tabs)
 
         self.grid.add_widget(self.main_area_container)
 
         # bottom part
-        bottom_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
-        info_button = Button(size=(dp(100), dp(30)), text="Command:", size_hint_x=None)
+        bottom_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
+        info_button = MDRaisedButton(size=(dp(100), dp(30)), text="Command:", size_hint_x=None)
         info_button.bind(on_release=self.command_button_action)
         bottom_layout.add_widget(info_button)
-        self.textinput = TextInput(size_hint_y=None, height=dp(30), multiline=False, write_tab=False)
+        self.textinput = MDTextFieldRect(size_hint_y=None, height=dp(30), multiline=False, write_tab=False)
         self.textinput.bind(on_text_validate=self.on_message)
         self.textinput.text_validate_unfocus = False
         bottom_layout.add_widget(self.textinput)
@@ -490,8 +499,9 @@ def connect_bar_validate(sender):
         return self.container
 
     def update_texts(self, dt):
-        if hasattr(self.tabs.content.children[0], "fix_heights"):
-            self.tabs.content.children[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
+        #if hasattr(self.tabs.content.children[0], "fix_heights"):
+            #self.tabs.content.children[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
+        # KIVYMDTODO: see if this bug exists in KivyMD
         if self.ctx.server:
             self.title = self.base_title + " " + Utils.__version__ + \
                          f" | Connected to: {self.ctx.server_address} " \
@@ -528,7 +538,7 @@ def on_stop(self):
 
         self.ctx.exit_event.set()
 
-    def on_message(self, textinput: TextInput):
+    def on_message(self, textinput: MDTextFieldRect):
         try:
             input_text = textinput.text.strip()
             textinput.text = ""
@@ -559,7 +569,7 @@ def update_address_bar(self, text: str):
 
     def enable_energy_link(self):
         if not hasattr(self, "energy_link_label"):
-            self.energy_link_label = Label(text="Energy Link: Standby",
+            self.energy_link_label = MDLabel(text="Energy Link: Standby",
                                            size_hint_x=None, width=150)
             self.connect_layout.add_widget(self.energy_link_label)
 
@@ -596,7 +606,7 @@ def handle(self, record: logging.LogRecord) -> None:
             self.on_log(self.format(record))
 
 
-class UILog(RecycleView):
+class UILog(MDRecycleView):
     messages: typing.ClassVar[int]  # comes from kv file
 
     def __init__(self, *loggers_to_handle, **kwargs):
@@ -624,7 +634,7 @@ def fix_heights(self):
                 element.height = element.texture_size[1]
 
 
-class HintLog(RecycleView):
+class HintLog(MDRecycleView):
     header = {
         "receiving": {"text": "[u]Receiving Player[/u]"},
         "item": {"text": "[u]Item[/u]"},
diff --git a/requirements.txt b/requirements.txt
index f604556809f1..7a19c3a223cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@ jellyfish>=1.0.3
 jinja2>=3.1.2
 schema>=0.7.5
 kivy>=2.3.0
+kivymd==1.2.0
 bsdiff4>=1.2.4
 platformdirs>=4.0.0
 certifi>=2023.11.17

From aa1ddb513312272f7ff33621ac1022776ca7fa68 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Tue, 27 Feb 2024 21:52:15 -0600
Subject: [PATCH 02/46] update kivymd to 2.0.1dev

---
 data/client.kv   | 17 +++--------
 kvui.py          | 78 +++++++++++++++++++++++++++++++-----------------
 requirements.txt |  6 +++-
 3 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/data/client.kv b/data/client.kv
index 879f85fe07b3..ba8314e5fb14 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -15,8 +15,6 @@
     white: "FFFFFF"  # not used, if you want to change the generic text color change color in Label
 <MDLabel>:
     color: "FFFFFF"
-<MDTabs>:
-    fixed_tab_label_width: root.width / app.tab_count
 <TooltipLabel>:
     text_size: self.width, None
     size_hint_y: None
@@ -39,11 +37,8 @@
     bar_width: dp(12)
     effect_cls: "ScrollEffect"
     SelectableRecycleBoxLayout:
-        default_size: None, dp(20)
-        default_size_hint: 1, None
-        size_hint_y: None
-        height: self.minimum_height
-        orientation: 'vertical'
+        cols: 1
+        orientation: 'tb-lr'
         spacing: dp(3)
 <HintLabel>:
     canvas.before:
@@ -103,16 +98,12 @@
     bar_width: dp(12)
     effect_cls: "ScrollEffect"
     SelectableRecycleBoxLayout:
-        default_size: None, dp(20)
-        default_size_hint: 1, None
-        size_hint_y: None
-        height: self.minimum_height
-        orientation: 'vertical'
+        cols: 1
+        orientation: 'tb-lr'
         spacing: dp(3)
 <ServerLabel>:
     text: "Server:"
     size_hint_x: None
-    halign: "center"
 <ContainerLayout>:
     size_hint_x: 1
     size_hint_y: 1
diff --git a/kvui.py b/kvui.py
index 74c992dba648..d63148f3d11d 100644
--- a/kvui.py
+++ b/kvui.py
@@ -3,6 +3,9 @@
 import sys
 import typing
 
+from kivymd.uix.divider import MDDivider
+from kivymd.uix.recyclegridlayout import MDRecycleGridLayout
+
 if sys.platform == "win32":
     import ctypes
 
@@ -51,13 +54,12 @@
 from kivymd.uix.gridlayout import MDGridLayout
 from kivymd.uix.floatlayout import MDFloatLayout
 from kivymd.uix.boxlayout import MDBoxLayout
-from kivymd.uix.tab.tab import MDTabs, MDTabsBase
-from kivymd.uix.button import MDRectangleFlatButton, MDRaisedButton
+from kivymd.uix.tab.tab import MDTabsPrimary, MDTabsItem, MDTabsItemText, MDTabsItemIcon, MDTabsCarousel
+from kivymd.uix.button import MDButton, MDButtonText
 from kivymd.uix.label import MDLabel
 from kivymd.uix.recycleview import MDRecycleView
-from kivymd.uix.recyclegridlayout import MDRecycleGridLayout
-from kivymd.uix.textfield.textfield import MDTextFieldRect
-from kivymd.uix.progressbar import MDProgressBar
+from kivymd.uix.textfield.textfield import MDTextField
+from kivymd.uix.progressindicator import MDLinearProgressIndicator
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
 
@@ -241,9 +243,10 @@ class ContainerLayout(MDFloatLayout):
 
 
 class SelectableRecycleBoxLayout(FocusBehavior, LayoutSelectionBehavior,
-                                 RecycleBoxLayout):
+                                 MDRecycleGridLayout):
     """ Adds selection and focus behaviour to the view. """
-    pass
+    adaptive_height = True
+
 
 class SelectableLabel(RecycleDataViewBehavior, TooltipLabel):
     """ Add selection support to the Label """
@@ -346,7 +349,7 @@ def apply_selection(self, rv, index, is_selected):
             self.selected = is_selected
 
 
-class ConnectBarTextInput(MDTextFieldRect):
+class ConnectBarTextInput(MDTextField):
     def insert_text(self, substring, from_undo=False):
         s = substring.replace("\n", "").replace("\r", "")
         return super(ConnectBarTextInput, self).insert_text(s, from_undo=from_undo)
@@ -370,8 +373,17 @@ def __init__(self, title, text, error=False, **kwargs):
                          separator_color=separator_color, **kwargs)
         self.height += max(0, label.height - 18)
 
-class MDTab(MDTabsBase, MDBoxLayout):
-    pass
+
+class ClientTabs(MDTabsPrimary):
+    carousel: MDTabsCarousel
+
+    def __init__(self, *args, **kwargs):
+        self.carousel = MDTabsCarousel()
+        super().__init__(MDDivider(), self.carousel, *args, **kwargs)
+
+    def on_tab_switch(self, *args) -> None:
+        pass
+
 
 class GameManager(MDApp):
     logging_pairs = [
@@ -412,9 +424,17 @@ def intercept_say(text):
     @property
     def tab_count(self):
         if hasattr(self, "tabs"):
-            return max(1, len(self.tabs.get_tab_list()))
+            return max(1, len(self.tabs.tab_list))
         return 1
 
+    def on_start(self):
+        def on_start(*args):
+            self.root.md_bg_color = self.theme_cls.backgroundColor
+        super().on_start()
+        Clock.schedule_once(on_start)
+        #self.tabs.add_widget(MDTabsItem(MDTabsItemText("TestTab")))
+        #self.tabs.carousel.add_widget(MDLabel(text="Label 1"))
+
     def build(self) -> Layout:
         self.theme_cls.theme_style = "Dark"
         self.theme_cls.primary_palette = "Green"
@@ -436,39 +456,40 @@ def connect_bar_validate(sender):
 
         self.server_connect_bar.bind(on_text_validate=connect_bar_validate)
         self.connect_layout.add_widget(self.server_connect_bar)
-        self.server_connect_button = MDRaisedButton(text="Connect", size=(dp(100), dp(30)), size_hint_y=None, size_hint_x=None)
+        self.server_connect_button = MDButton(MDButtonText(text="Connect"), style="filled", size=(dp(100), dp(30)),
+                                              size_hint_x=None, size_hint_y=None)
         self.server_connect_button.bind(on_press=self.connect_button_action)
         self.connect_layout.add_widget(self.server_connect_button)
         self.grid.add_widget(self.connect_layout)
-        self.progressbar = MDProgressBar(size_hint_y=None, height=3)
+        self.progressbar = MDLinearProgressIndicator(size_hint_y=None, height=3)
         self.grid.add_widget(self.progressbar)
 
         # middle part
-        self.tabs = MDTabs(size_hint=(1, 1), tab_hint_x=True)
-        self.tabs.default_tab = MDTab(title="All")
+        self.tabs = ClientTabs(allow_stretch=True, size_hint=(1, 1), pos_hint={"center_x": .5, "center_y": .5})
+        self.tabs.default_tab = MDTabsItem(MDTabsItemText(text="All" if len(self.logging_pairs) > 1 else "Archipelago"))
         self.log_panels["All"] = self.tabs.default_tab_content = UILog(*(logging.getLogger(logger_name)
-                                                                         for logger_name, name in
-                                                                         self.logging_pairs))
-        self.tabs.default_tab.add_widget(self.tabs.default_tab_content)
+                                                                             for logger_name, name in
+                                                                             self.logging_pairs))
+        self.tabs.carousel.add_widget(self.tabs.default_tab_content)
         self.tabs.add_widget(self.tabs.default_tab)
 
         for logger_name, display_name in self.logging_pairs:
             bridge_logger = logging.getLogger(logger_name)
-            panel = MDTab(title=display_name)
+            panel = MDTabsItem(MDTabsItemText(text=display_name))
+            grid = MDGridLayout(cols=1)
             self.log_panels[display_name] = panel.content = UILog(bridge_logger)
-            panel.add_widget(panel.content)
+            grid.add_widget(panel.content)
+            self.tabs.carousel.add_widget(grid)
             if len(self.logging_pairs) > 1:
                 # show Archipelago tab if other logging is present
                 self.tabs.add_widget(panel)
 
-        hint_panel = MDTab(title="Hints")
+        hint_panel = MDTabsItem(MDTabsItemText(text="Hints"))
         self.log_panels["Hints"] = hint_panel.content = HintLog(self.json_to_kivy_parser)
-        hint_panel.add_widget(hint_panel.content)
+        #self.tabs.carousel.add_widget(grid)
+        #self.tabs.carousel.add_widget(MDLabel(text="TEST", halign="center"))
         self.tabs.add_widget(hint_panel)
 
-        if len(self.logging_pairs) == 1:
-            self.tabs.default_tab.title = "Archipelago"
-
         self.main_area_container = MDGridLayout(size_hint_y=1, rows=1)
         self.main_area_container.add_widget(self.tabs)
 
@@ -476,10 +497,10 @@ def connect_bar_validate(sender):
 
         # bottom part
         bottom_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
-        info_button = MDRaisedButton(size=(dp(100), dp(30)), text="Command:", size_hint_x=None)
+        info_button = MDButton(MDButtonText(text="Command:"), style="filled", size=(dp(100), dp(30)), size_hint_x=None)
         info_button.bind(on_release=self.command_button_action)
         bottom_layout.add_widget(info_button)
-        self.textinput = MDTextFieldRect(size_hint_y=None, height=dp(30), multiline=False, write_tab=False)
+        self.textinput = MDTextField(size_hint_y=None, height=dp(30), multiline=False, write_tab=False)
         self.textinput.bind(on_text_validate=self.on_message)
         self.textinput.text_validate_unfocus = False
         bottom_layout.add_widget(self.textinput)
@@ -538,7 +559,7 @@ def on_stop(self):
 
         self.ctx.exit_event.set()
 
-    def on_message(self, textinput: MDTextFieldRect):
+    def on_message(self, textinput: MDTextField):
         try:
             input_text = textinput.text.strip()
             textinput.text = ""
@@ -608,6 +629,7 @@ def handle(self, record: logging.LogRecord) -> None:
 
 class UILog(MDRecycleView):
     messages: typing.ClassVar[int]  # comes from kv file
+    adaptive_height = True
 
     def __init__(self, *loggers_to_handle, **kwargs):
         super(UILog, self).__init__(**kwargs)
diff --git a/requirements.txt b/requirements.txt
index 7a19c3a223cb..b73dd4e4a05b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,11 @@ jellyfish>=1.0.3
 jinja2>=3.1.2
 schema>=0.7.5
 kivy>=2.3.0
-kivymd==1.2.0
+<<<<<<< HEAD
+kivymd @ git+https://github.com/kivymd/KivyMD@master
+kivymd>=2.0.1.dev0
+=======
+>>>>>>> parent of 4f3fbebe (kivymd testing)
 bsdiff4>=1.2.4
 platformdirs>=4.0.0
 certifi>=2023.11.17

From db95e9a53e0b7e6b445dbea65907ebb75465e8c3 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sat, 2 Mar 2024 02:30:15 -0600
Subject: [PATCH 03/46] attempt launcher changes, port scroll to main soon

---
 Launcher.py      | 33 +++++++++++--------
 data/client.kv   | 24 ++++++++------
 kvui.py          | 82 ++++++++++++++++++++++++++++++------------------
 requirements.txt |  3 --
 4 files changed, 87 insertions(+), 55 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 8db7f4dbf2c4..fa712a3f2966 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -161,7 +161,7 @@ def launch(exe, in_terminal=False):
 
 
 def run_gui():
-    from kvui import MDApp, MDFloatLayout, MDGridLayout, MDRectangleFlatIconButton, MDLabel
+    from kvui import MDApp, MDFloatLayout, MDGridLayout, MDButton, MDLabel, MDButtonText, MDButtonIcon, ScrollBox
     from kivy.uix.image import AsyncImage
     from kivymd.uix.relativelayout import MDRelativeLayout
 
@@ -187,9 +187,14 @@ def build(self):
             self.container = MDFloatLayout()
             self.grid = MDGridLayout(cols=2)
             self.container.add_widget(self.grid)
-            self.grid.add_widget(MDLabel(text="General"))
-            self.grid.add_widget(MDLabel(text="Clients"))
-            button_layout = self.grid  # make buttons fill the window
+            self.grid.add_widget(MDLabel(text="General", size_hint_y=None, height=40))
+            self.grid.add_widget(MDLabel(text="Clients", size_hint_y=None, height=40))
+            tool_layout = ScrollBox()
+            tool_layout.layout.orientation = "vertical"
+            self.grid.add_widget(tool_layout)
+            client_layout = ScrollBox()
+            client_layout.layout.orientation = "vertical"
+            self.grid.add_widget(client_layout)
             self.grid.padding = 10
             self.grid.spacing = 5
 
@@ -204,26 +209,28 @@ def build_button(component: Component, col=1):
                     None. The button is added to the parent grid layout.
 
                 """
-                button = MDRectangleFlatIconButton(text=component.display_name)
+                button = MDButton(MDButtonText(text=component.display_name),
+                                  style="elevated", size_hint_y=None, height=40)
                 button.component = component
                 button.bind(on_release=self.component_action)
                 button.size_hint = (1, 1)
                 if component.icon != "icon":
-                    button.icon = icon_paths[component.icon]
-                button_layout.add_widget(button)
+                    image = AsyncImage(source=icon_paths[component.icon],
+                                       size=(38, 38), size_hint=(None, 1), pos=(5, 0))
+                    box_layout = MDRelativeLayout()
+                    box_layout.add_widget(button)
+                    box_layout.add_widget(image)
+                    return box_layout
+                return button
 
             for (tool, client) in itertools.zip_longest(itertools.chain(
                     self._tools.items(), self._miscs.items(), self._adjusters.items()), self._clients.items()):
                 # column 1
                 if tool:
-                    build_button(tool[1])
-                else:
-                    button_layout.add_widget(MDLabel())
+                    tool_layout.layout.add_widget(build_button(tool[1]))
                 # column 2
                 if client:
-                    build_button(client[1])
-                else:
-                    button_layout.add_widget(MDLabel())
+                    client_layout.layout.add_widget(build_button(client[1]))
 
             return self.container
 
diff --git a/data/client.kv b/data/client.kv
index ba8314e5fb14..51f8ee2b1760 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -13,15 +13,15 @@
     plum: "AF99EF"  # typically progression item
     salmon: "FA8072"  # typically trap item
     white: "FFFFFF"  # not used, if you want to change the generic text color change color in Label
-<MDLabel>:
-    color: "FFFFFF"
+#<MDLabel>:
+#    color: "FFFFFF"
 <TooltipLabel>:
-    text_size: self.width, None
-    size_hint_y: None
-    height: self.texture_size[1]
+    adaptive_height: True
     font_size: dp(20)
     markup: True
+    halign: "left"
 <SelectableLabel>:
+    size_hint: 1, None
     canvas.before:
         Color:
             rgba: (.0, 0.9, .1, .3) if self.selected else (0,0,0,0)
@@ -37,8 +37,11 @@
     bar_width: dp(12)
     effect_cls: "ScrollEffect"
     SelectableRecycleBoxLayout:
-        cols: 1
-        orientation: 'tb-lr'
+        default_size: None, dp(20)
+        default_size_hint: 1, None
+        size_hint_y: None
+        height: self.minimum_height
+        orientation: 'vertical'
         spacing: dp(3)
 <HintLabel>:
     canvas.before:
@@ -98,8 +101,11 @@
     bar_width: dp(12)
     effect_cls: "ScrollEffect"
     SelectableRecycleBoxLayout:
-        cols: 1
-        orientation: 'tb-lr'
+        default_size: None, dp(20)
+        default_size_hint: 1, None
+        size_hint_y: None
+        height: self.minimum_height
+        orientation: 'vertical'
         spacing: dp(3)
 <ServerLabel>:
     text: "Server:"
diff --git a/kvui.py b/kvui.py
index d63148f3d11d..8ebcd4e7edb1 100644
--- a/kvui.py
+++ b/kvui.py
@@ -3,6 +3,7 @@
 import sys
 import typing
 
+from kivy.effects.scroll import ScrollEffect
 from kivymd.uix.divider import MDDivider
 from kivymd.uix.recyclegridlayout import MDRecycleGridLayout
 
@@ -39,7 +40,7 @@
 from kivy.clock import Clock
 from kivy.factory import Factory
 from kivy.properties import BooleanProperty, ObjectProperty
-from kivy.metrics import dp
+from kivy.metrics import dp, sp
 from kivy.uix.widget import Widget
 from kivy.uix.layout import Layout
 from kivy.utils import escape_markup
@@ -55,11 +56,12 @@
 from kivymd.uix.floatlayout import MDFloatLayout
 from kivymd.uix.boxlayout import MDBoxLayout
 from kivymd.uix.tab.tab import MDTabsPrimary, MDTabsItem, MDTabsItemText, MDTabsItemIcon, MDTabsCarousel
-from kivymd.uix.button import MDButton, MDButtonText
+from kivymd.uix.button import MDButton, MDButtonText, MDButtonIcon
 from kivymd.uix.label import MDLabel
 from kivymd.uix.recycleview import MDRecycleView
 from kivymd.uix.textfield.textfield import MDTextField
 from kivymd.uix.progressindicator import MDLinearProgressIndicator
+from kivymd.uix.scrollview import MDScrollView
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
 
@@ -121,6 +123,17 @@ class ServerToolTip(ToolTip):
     pass
 
 
+class ScrollBox(MDScrollView):
+    layout: MDBoxLayout
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.layout = MDBoxLayout(size_hint_y=None)
+        self.layout.bind(minimum_height=self.layout.setter("height"))
+        self.add_widget(self.layout)
+        self.effect_cls = ScrollEffect
+
+
 class HovererableLabel(HoverBehavior, MDLabel):
     pass
 
@@ -243,9 +256,8 @@ class ContainerLayout(MDFloatLayout):
 
 
 class SelectableRecycleBoxLayout(FocusBehavior, LayoutSelectionBehavior,
-                                 MDRecycleGridLayout):
+                                 RecycleBoxLayout):
     """ Adds selection and focus behaviour to the view. """
-    adaptive_height = True
 
 
 class SelectableLabel(RecycleDataViewBehavior, TooltipLabel):
@@ -259,6 +271,11 @@ def refresh_view_attrs(self, rv, index, data):
         return super(SelectableLabel, self).refresh_view_attrs(
             rv, index, data)
 
+    def on_size(self, instance_label, size: list) -> None:
+        super().on_size(instance_label, size)
+        if self.parent:
+            self.width = self.parent.width
+
     def on_touch_down(self, touch):
         """ Add selection on touch down """
         if super(SelectableLabel, self).on_touch_down(touch):
@@ -290,6 +307,7 @@ def apply_selection(self, rv, index, is_selected):
         self.selected = is_selected
 
 
+
 class HintLabel(RecycleDataViewBehavior, MDBoxLayout):
     selected = BooleanProperty(False)
     striped = BooleanProperty(False)
@@ -373,16 +391,17 @@ def __init__(self, title, text, error=False, **kwargs):
                          separator_color=separator_color, **kwargs)
         self.height += max(0, label.height - 18)
 
-
 class ClientTabs(MDTabsPrimary):
     carousel: MDTabsCarousel
 
     def __init__(self, *args, **kwargs):
         self.carousel = MDTabsCarousel()
-        super().__init__(MDDivider(), self.carousel, *args, **kwargs)
+        super().__init__(*args, MDDivider(size_hint_y=None, height=dp(4)), self.carousel, **kwargs)
+        self.size_hint_y = 1
 
-    def on_tab_switch(self, *args) -> None:
-        pass
+    def on_size(self, *args) -> None:
+        super().on_size(*args)
+        print(args)
 
 
 class GameManager(MDApp):
@@ -436,19 +455,20 @@ def on_start(*args):
         #self.tabs.carousel.add_widget(MDLabel(text="Label 1"))
 
     def build(self) -> Layout:
-        self.theme_cls.theme_style = "Dark"
+        self.theme_cls.theme_style = "Light"
         self.theme_cls.primary_palette = "Green"
         self.container = ContainerLayout()
 
         self.grid = MainLayout()
         self.grid.cols = 1
-        self.connect_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
+        self.connect_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(70),
+                                          spacing=5, padding=(5, 10))
         # top part
         server_label = ServerLabel()
         self.connect_layout.add_widget(server_label)
         self.server_connect_bar = ConnectBarTextInput(text=self.ctx.suggested_address or "archipelago.gg:",
-                                                      size_hint_y=None,
-                                                      height=dp(30), multiline=False, write_tab=False)
+                                                      size_hint_y=None, role="medium",
+                                                      height=dp(70), multiline=False, write_tab=False)
 
         def connect_bar_validate(sender):
             if not self.ctx.server:
@@ -456,37 +476,36 @@ def connect_bar_validate(sender):
 
         self.server_connect_bar.bind(on_text_validate=connect_bar_validate)
         self.connect_layout.add_widget(self.server_connect_bar)
-        self.server_connect_button = MDButton(MDButtonText(text="Connect"), style="filled", size=(dp(100), dp(30)),
-                                              size_hint_x=None, size_hint_y=None)
+        self.server_connect_button = MDButton(MDButtonText(text="Connect"), style="filled", size=(dp(100), dp(70)),
+                                              size_hint_x=None, size_hint_y=None, radius=5, pos_hint={"center_y": 0.5})
         self.server_connect_button.bind(on_press=self.connect_button_action)
+        self.server_connect_button.height = self.server_connect_bar.height
         self.connect_layout.add_widget(self.server_connect_button)
         self.grid.add_widget(self.connect_layout)
         self.progressbar = MDLinearProgressIndicator(size_hint_y=None, height=3)
         self.grid.add_widget(self.progressbar)
 
         # middle part
-        self.tabs = ClientTabs(allow_stretch=True, size_hint=(1, 1), pos_hint={"center_x": .5, "center_y": .5})
-        self.tabs.default_tab = MDTabsItem(MDTabsItemText(text="All" if len(self.logging_pairs) > 1 else "Archipelago"))
+        self.tabs = ClientTabs()
+        self.tabs.add_widget(MDTabsItem(MDTabsItemText(text="All" if len(self.logging_pairs) > 1 else "Archipelago")))
         self.log_panels["All"] = self.tabs.default_tab_content = UILog(*(logging.getLogger(logger_name)
                                                                              for logger_name, name in
                                                                              self.logging_pairs))
         self.tabs.carousel.add_widget(self.tabs.default_tab_content)
-        self.tabs.add_widget(self.tabs.default_tab)
 
         for logger_name, display_name in self.logging_pairs:
             bridge_logger = logging.getLogger(logger_name)
-            panel = MDTabsItem(MDTabsItemText(text=display_name))
-            grid = MDGridLayout(cols=1)
-            self.log_panels[display_name] = panel.content = UILog(bridge_logger)
-            grid.add_widget(panel.content)
-            self.tabs.carousel.add_widget(grid)
+            self.log_panels[display_name] = UILog(bridge_logger)
             if len(self.logging_pairs) > 1:
+                panel = MDTabsItem(MDTabsItemText(text=display_name))
+                panel.content = self.log_panels[display_name]
                 # show Archipelago tab if other logging is present
+                self.tabs.carousel.add_widget(panel.content)
                 self.tabs.add_widget(panel)
 
         hint_panel = MDTabsItem(MDTabsItemText(text="Hints"))
         self.log_panels["Hints"] = hint_panel.content = HintLog(self.json_to_kivy_parser)
-        #self.tabs.carousel.add_widget(grid)
+        self.tabs.carousel.add_widget(hint_panel.content)
         #self.tabs.carousel.add_widget(MDLabel(text="TEST", halign="center"))
         self.tabs.add_widget(hint_panel)
 
@@ -496,12 +515,14 @@ def connect_bar_validate(sender):
         self.grid.add_widget(self.main_area_container)
 
         # bottom part
-        bottom_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
-        info_button = MDButton(MDButtonText(text="Command:"), style="filled", size=(dp(100), dp(30)), size_hint_x=None)
+        bottom_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(70), spacing=5, padding=(5, 10))
+        info_button = MDButton(MDButtonText(text="Command:"), radius=5, style="filled", size=(dp(100), dp(70)),
+                               size_hint_x=None, size_hint_y=None, pos_hint={"center_y": 0.5})
         info_button.bind(on_release=self.command_button_action)
         bottom_layout.add_widget(info_button)
-        self.textinput = MDTextField(size_hint_y=None, height=dp(30), multiline=False, write_tab=False)
+        self.textinput = MDTextField(size_hint_y=None, multiline=False, write_tab=False, role="medium")
         self.textinput.bind(on_text_validate=self.on_message)
+        info_button.height = self.textinput.height
         self.textinput.text_validate_unfocus = False
         bottom_layout.add_widget(self.textinput)
         self.grid.add_widget(bottom_layout)
@@ -520,19 +541,19 @@ def connect_bar_validate(sender):
         return self.container
 
     def update_texts(self, dt):
-        #if hasattr(self.tabs.content.children[0], "fix_heights"):
-            #self.tabs.content.children[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
+        if hasattr(self.tabs.carousel.slides[0], "fix_heights"):
+            self.tabs.carousel.slides[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
         # KIVYMDTODO: see if this bug exists in KivyMD
         if self.ctx.server:
             self.title = self.base_title + " " + Utils.__version__ + \
                          f" | Connected to: {self.ctx.server_address} " \
                          f"{'.'.join(str(e) for e in self.ctx.server_version)}"
-            self.server_connect_button.text = "Disconnect"
+            self.server_connect_button._button_text.text = "Disconnect"
             self.server_connect_bar.readonly = True
             self.progressbar.max = len(self.ctx.checked_locations) + len(self.ctx.missing_locations)
             self.progressbar.value = len(self.ctx.checked_locations)
         else:
-            self.server_connect_button.text = "Connect"
+            self.server_connect_button._button_text.text = "Connect"
             self.server_connect_bar.readonly = False
             self.title = self.base_title + " " + Utils.__version__
             self.progressbar.value = 0
@@ -631,6 +652,7 @@ class UILog(MDRecycleView):
     messages: typing.ClassVar[int]  # comes from kv file
     adaptive_height = True
 
+
     def __init__(self, *loggers_to_handle, **kwargs):
         super(UILog, self).__init__(**kwargs)
         self.data = []
diff --git a/requirements.txt b/requirements.txt
index b73dd4e4a05b..89b3d757ce45 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,11 +5,8 @@ jellyfish>=1.0.3
 jinja2>=3.1.2
 schema>=0.7.5
 kivy>=2.3.0
-<<<<<<< HEAD
 kivymd @ git+https://github.com/kivymd/KivyMD@master
 kivymd>=2.0.1.dev0
-=======
->>>>>>> parent of 4f3fbebe (kivymd testing)
 bsdiff4>=1.2.4
 platformdirs>=4.0.0
 certifi>=2023.11.17

From 5ab41c3f99d34d8dc343ed03cacd81fd9dfb9850 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sat, 2 Mar 2024 03:14:29 -0600
Subject: [PATCH 04/46] icons are actually showing now

---
 Launcher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Launcher.py b/Launcher.py
index fa712a3f2966..9290a7dc82cd 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -217,7 +217,7 @@ def build_button(component: Component, col=1):
                 if component.icon != "icon":
                     image = AsyncImage(source=icon_paths[component.icon],
                                        size=(38, 38), size_hint=(None, 1), pos=(5, 0))
-                    box_layout = MDRelativeLayout()
+                    box_layout = MDRelativeLayout(size_hint_y=None, height=40)
                     box_layout.add_widget(button)
                     box_layout.add_widget(image)
                     return box_layout

From 3672fd14731e94908213112dc8d6422f02973be2 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun, 2 Jun 2024 14:03:24 -0500
Subject: [PATCH 05/46] slight launcher cleanup, still work to do there

---
 Launcher.py | 2 +-
 kvui.py     | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 053eadc02481..35f5805f760b 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -209,7 +209,7 @@ def build_button(component: Component, col=1):
                     None. The button is added to the parent grid layout.
 
                 """
-                button = MDButton(MDButtonText(text=component.display_name),
+                button = MDButton(MDButtonText(text=component.display_name, pos=(15, 0)),
                                   style="elevated", size_hint_y=None, height=40)
                 button.component = component
                 button.bind(on_release=self.component_action)
diff --git a/kvui.py b/kvui.py
index ad4f8eabbc2d..338e0d461aa8 100644
--- a/kvui.py
+++ b/kvui.py
@@ -4,9 +4,7 @@
 import typing
 import re
 
-from kivy.effects.scroll import ScrollEffect
 from kivymd.uix.divider import MDDivider
-from kivymd.uix.recyclegridlayout import MDRecycleGridLayout
 
 if sys.platform == "win32":
     import ctypes
@@ -135,9 +133,8 @@ def __init__(self, *args, **kwargs):
         self.layout = MDBoxLayout(size_hint_y=None)
         self.layout.bind(minimum_height=self.layout.setter("height"))
         self.add_widget(self.layout)
-        self.effect_cls = ScrollEffect
         self.bar_width = dp(12)
-        self.scroll_type = ["content", "bars"]
+        self.scroll_type = ["bars"]
 
 
 class HovererableLabel(HoverBehavior, MDLabel):

From 9a979ba59ade0e26a52b4b2c845ff30dc322b6fa Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Tue, 4 Jun 2024 04:06:05 -0500
Subject: [PATCH 06/46] load theme through kv, finally get images in icons

---
 Launcher.py    | 21 ++++++++++++---------
 data/client.kv |  3 +++
 kvui.py        | 46 +++++++++++++++++++++++++++++++---------------
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 35f5805f760b..c42e4ab230ed 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -23,6 +23,7 @@
 
 import Utils
 import settings
+from kvui import ImageIcon
 from worlds.LauncherComponents import Component, components, Type, SuffixIdentifier, icon_paths
 
 if __name__ == "__main__":
@@ -191,9 +192,11 @@ def build(self):
             self.grid.add_widget(MDLabel(text="Clients", size_hint_y=None, height=40))
             tool_layout = ScrollBox()
             tool_layout.layout.orientation = "vertical"
+            tool_layout.layout.spacing = 10
             self.grid.add_widget(tool_layout)
             client_layout = ScrollBox()
             client_layout.layout.orientation = "vertical"
+            client_layout.layout.spacing = 10
             self.grid.add_widget(client_layout)
             self.grid.padding = 10
             self.grid.spacing = 5
@@ -209,18 +212,18 @@ def build_button(component: Component, col=1):
                     None. The button is added to the parent grid layout.
 
                 """
-                button = MDButton(MDButtonText(text=component.display_name, pos=(15, 0)),
-                                  style="elevated", size_hint_y=None, height=40)
+                if component.icon != "icon":
+                    image = ImageIcon(source=icon_paths[component.icon],
+                                      size=(38, 38), size_hint=(None, 1), pos=(5, 0))
+                    button = MDButton(image, MDButtonText(text=component.display_name, pos=(15, 0)),
+                                      style="elevated", size_hint_y=None, height=40)
+                else:
+                    button = MDButton(MDButtonText(text=component.display_name, pos=(15, 0)),
+                                      style="elevated", size_hint_y=None, height=40)
                 button.component = component
                 button.bind(on_release=self.component_action)
                 button.size_hint = (1, 1)
-                if component.icon != "icon":
-                    image = AsyncImage(source=icon_paths[component.icon],
-                                       size=(38, 38), size_hint=(None, 1), pos=(5, 0))
-                    box_layout = MDRelativeLayout(size_hint_y=None, height=40)
-                    box_layout.add_widget(button)
-                    box_layout.add_widget(image)
-                    return box_layout
+
                 return button
 
             for (tool, client) in itertools.zip_longest(itertools.chain(
diff --git a/data/client.kv b/data/client.kv
index 517a23d2c2fa..26566c95ae2b 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -13,6 +13,9 @@
     plum: "AF99EF"  # typically progression item
     salmon: "FA8072"  # typically trap item
     white: "FFFFFF"  # not used, if you want to change the generic text color change color in Label
+    # KivyMD theming parameters
+    theme_style: "Dark" # Light/Dark
+    primary_palette: "Green" # Many options
 #<MDLabel>:
 #    color: "FFFFFF"
 <TooltipLabel>:
diff --git a/kvui.py b/kvui.py
index 338e0d461aa8..b23128e811a2 100644
--- a/kvui.py
+++ b/kvui.py
@@ -4,6 +4,9 @@
 import typing
 import re
 
+from kivy.uix.image import AsyncImage
+from kivy.uix.relativelayout import RelativeLayout
+from kivymd.uix.behaviors import CommonElevationBehavior
 from kivymd.uix.divider import MDDivider
 
 if sys.platform == "win32":
@@ -57,7 +60,7 @@
 from kivymd.uix.boxlayout import MDBoxLayout
 from kivymd.uix.tab.tab import MDTabsPrimary, MDTabsItem, MDTabsItemText, MDTabsItemIcon, MDTabsCarousel
 from kivymd.uix.button import MDButton, MDButtonText, MDButtonIcon
-from kivymd.uix.label import MDLabel
+from kivymd.uix.label import MDLabel, MDIcon
 from kivymd.uix.recycleview import MDRecycleView
 from kivymd.uix.textfield.textfield import MDTextField
 from kivymd.uix.progressindicator import MDLinearProgressIndicator
@@ -78,6 +81,28 @@
 remove_between_brackets = re.compile(r"\[.*?]")
 
 
+class ImageIcon(MDButtonIcon, AsyncImage):
+    def __init__(self, *args, **kwargs):
+        super().__init__(args, kwargs)
+        self.image = AsyncImage(**kwargs)
+        self.add_widget(self.image)
+
+    def add_widget(self, widget, index=0, canvas=None):
+        return super(MDIcon, self).add_widget(widget)
+
+
+class ScrollBox(MDScrollView):
+    layout: MDBoxLayout
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.layout = MDBoxLayout(size_hint_y=None)
+        self.layout.bind(minimum_height=self.layout.setter("height"))
+        self.add_widget(self.layout)
+        self.bar_width = dp(12)
+        self.scroll_type = ["bars"]
+
+
 # I was surprised to find this didn't already exist in kivy :(
 class HoverBehavior(object):
     """originally from https://stackoverflow.com/a/605348110"""
@@ -125,18 +150,6 @@ class ServerToolTip(ToolTip):
     pass
 
 
-class ScrollBox(MDScrollView):
-    layout: MDBoxLayout
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.layout = MDBoxLayout(size_hint_y=None)
-        self.layout.bind(minimum_height=self.layout.setter("height"))
-        self.add_widget(self.layout)
-        self.bar_width = dp(12)
-        self.scroll_type = ["bars"]
-
-
 class HovererableLabel(HoverBehavior, MDLabel):
     pass
 
@@ -405,6 +418,7 @@ def __init__(self, title, text, error=False, **kwargs):
                          separator_color=separator_color, **kwargs)
         self.height += max(0, label.height - 18)
 
+
 class ClientTabs(MDTabsPrimary):
     carousel: MDTabsCarousel
 
@@ -469,8 +483,8 @@ def on_start(*args):
         #self.tabs.carousel.add_widget(MDLabel(text="Label 1"))
 
     def build(self) -> Layout:
-        self.theme_cls.theme_style = "Light"
-        self.theme_cls.primary_palette = "Green"
+        self.theme_cls.theme_style = self.json_to_kivy_parser.theme_style
+        self.theme_cls.primary_palette = self.json_to_kivy_parser.primary_palette
         self.container = ContainerLayout()
 
         self.grid = MainLayout()
@@ -773,6 +787,8 @@ def __init__(self, *args, **kwargs):
         for name, code in color_codes.items():
             color_codes[name] = getattr(colors, name, code)
         self.color_codes = color_codes
+        self.theme_style = colors.theme_style
+        self.primary_palette = colors.primary_palette
         super().__init__(*args, **kwargs)
 
     def __call__(self, *args, **kwargs):

From 6cb0cbe4b4888e599d5186d305068ebbaec681d0 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 4 Jul 2024 19:14:19 -0500
Subject: [PATCH 07/46] test

---
 requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 9537d82bb8ab..aeeed313cac6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ jinja2>=3.1.4
 schema>=0.7.7
 kivy>=2.3.0
 kivymd @ git+https://github.com/kivymd/KivyMD@master
-kivymd>=2.0.1.dev0
 bsdiff4>=1.2.4
 platformdirs>=4.2.2
 certifi>=2024.6.2

From 367a6e81002a657116bfdc00a00748dce11a5467 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 4 Jul 2024 19:37:06 -0500
Subject: [PATCH 08/46] test 2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index aeeed313cac6..7ef89f129bfc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ jellyfish>=1.0.3
 jinja2>=3.1.4
 schema>=0.7.7
 kivy>=2.3.0
-kivymd @ git+https://github.com/kivymd/KivyMD@master
+kivymd>=2.0.1.dev0
 bsdiff4>=1.2.4
 platformdirs>=4.2.2
 certifi>=2024.6.2

From 7db16f0c4c7516f8e3ee58f397ff895f7fdc1b6d Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 4 Jul 2024 19:58:45 -0500
Subject: [PATCH 09/46] found the problem

---
 Launcher.py      | 4 ++--
 requirements.txt | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 9d94a22e4201..90bb991260d2 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -23,7 +23,6 @@
 
 import Utils
 import settings
-from kvui import ImageIcon
 from worlds.LauncherComponents import Component, components, Type, SuffixIdentifier, icon_paths
 
 if __name__ == "__main__":
@@ -165,7 +164,8 @@ def launch(exe, in_terminal=False):
 
 
 def run_gui():
-    from kvui import MDApp, MDFloatLayout, MDGridLayout, MDButton, MDLabel, MDButtonText, MDButtonIcon, ScrollBox, ContainerLayout
+    from kvui import (MDApp, MDFloatLayout, MDGridLayout, MDButton, MDLabel, MDButtonText, MDButtonIcon, ScrollBox,
+                      ContainerLayout, ImageIcon)
     from kivy.core.window import Window
     from kivy.uix.image import AsyncImage
     from kivymd.uix.relativelayout import MDRelativeLayout
diff --git a/requirements.txt b/requirements.txt
index 7ef89f129bfc..9537d82bb8ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@ jellyfish>=1.0.3
 jinja2>=3.1.4
 schema>=0.7.7
 kivy>=2.3.0
+kivymd @ git+https://github.com/kivymd/KivyMD@master
 kivymd>=2.0.1.dev0
 bsdiff4>=1.2.4
 platformdirs>=4.2.2

From 84e5ca6ea90b8a53e7e6bb16d3a0c7969f8a3529 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 4 Jul 2024 20:07:35 -0500
Subject: [PATCH 10/46] fix launcher from merge

---
 Launcher.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 90bb991260d2..0e8e613c5d41 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -242,14 +242,14 @@ def build(self):
             self.container.add_widget(self.grid)
             self.grid.add_widget(MDLabel(text="General", size_hint_y=None, height=40))
             self.grid.add_widget(MDLabel(text="Clients", size_hint_y=None, height=40))
-            tool_layout = ScrollBox()
-            tool_layout.layout.orientation = "vertical"
-            tool_layout.layout.spacing = 10
-            self.grid.add_widget(tool_layout)
-            client_layout = ScrollBox()
-            client_layout.layout.orientation = "vertical"
-            client_layout.layout.spacing = 10
-            self.grid.add_widget(client_layout)
+            self._tool_layout = ScrollBox()
+            self._tool_layout.layout.orientation = "vertical"
+            self._tool_layout.layout.spacing = 10
+            self.grid.add_widget(self._tool_layout)
+            self._client_layout = ScrollBox()
+            self._client_layout.layout.orientation = "vertical"
+            self._client_layout.layout.spacing = 10
+            self.grid.add_widget(self._client_layout)
             self.grid.padding = 10
             self.grid.spacing = 5
 

From b5e7d13360877f68e9b4d1f79b845c709c374d7e Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun, 25 Aug 2024 00:40:15 -0500
Subject: [PATCH 11/46] tooltips

---
 kvui.py | 75 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/kvui.py b/kvui.py
index 7a67efe2cdae..f9d52ea93efe 100644
--- a/kvui.py
+++ b/kvui.py
@@ -45,8 +45,7 @@
 from kivy.clock import Clock
 from kivy.factory import Factory
 from kivy.properties import BooleanProperty, ObjectProperty
-from kivy.metrics import dp, sp
-from kivy.effects.scroll import ScrollEffect
+from kivy.metrics import dp
 from kivy.uix.widget import Widget
 from kivy.uix.layout import Layout
 from kivy.utils import escape_markup
@@ -61,13 +60,14 @@
 from kivymd.uix.gridlayout import MDGridLayout
 from kivymd.uix.floatlayout import MDFloatLayout
 from kivymd.uix.boxlayout import MDBoxLayout
-from kivymd.uix.tab.tab import MDTabsPrimary, MDTabsItem, MDTabsItemText, MDTabsItemIcon, MDTabsCarousel
+from kivymd.uix.tab.tab import MDTabsPrimary, MDTabsItem, MDTabsItemText, MDTabsCarousel
 from kivymd.uix.button import MDButton, MDButtonText, MDButtonIcon
 from kivymd.uix.label import MDLabel, MDIcon
 from kivymd.uix.recycleview import MDRecycleView
 from kivymd.uix.textfield.textfield import MDTextField
 from kivymd.uix.progressindicator import MDLinearProgressIndicator
 from kivymd.uix.scrollview import MDScrollView
+from kivymd.uix.tooltip import MDTooltip, MDTooltipPlain
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
 
@@ -145,7 +145,7 @@ def on_cursor_leave(self, *args):
 Factory.register("HoverBehavior", HoverBehavior)
 
 
-class ToolTip(MDLabel):
+class ToolTip(MDTooltipPlain):
     pass
 
 
@@ -157,32 +157,47 @@ class HovererableLabel(HoverBehavior, MDLabel):
     pass
 
 
-class TooltipLabel(HovererableLabel):
-    tooltip = None
+class TooltipLabel(HovererableLabel, MDTooltip):
+    tooltip_display_delay = 0.1
 
     def create_tooltip(self, text, x, y):
         text = text.replace("<br>", "\n").replace("&amp;", "&").replace("&bl;", "[").replace("&br;", "]")
-        if self.tooltip:
+        # position float layout
+        center_x, center_y = self.to_window(self.center_x, self.center_y)
+        self.shift_y = y - center_y
+        shift_x = center_x - x
+        if shift_x > 0:
+            self.shift_left = shift_x
+        else:
+            self.shift_right = shift_x
+
+        if self._tooltip:
             # update
-            self.tooltip.children[0].text = text
+            self._tooltip.text = text
         else:
-            self.tooltip = MDFloatLayout()
-            tooltip_label = ToolTip(text=text)
-            self.tooltip.add_widget(tooltip_label)
-            fade_in_animation.start(self.tooltip)
-            MDApp.get_running_app().root.add_widget(self.tooltip)
+            self._tooltip = ToolTip(text=text, pos_hint={})
+            self.display_tooltip()
 
-        # handle left-side boundary to not render off-screen
-        x = max(x, 3 + self.tooltip.children[0].texture_size[0] / 2)
+    def display_tooltip(self, *args) -> None:
+        """Reimpl because of KivyMD bug"""
+        from kivymd.material_resources import DEVICE_TYPE
 
-        # position float layout
-        self.tooltip.x = x - self.tooltip.width / 2
-        self.tooltip.y = y - self.tooltip.height / 2 + 48
+        if not self._tooltip or self._tooltip.parent:
+            return
 
-    def remove_tooltip(self):
-        if self.tooltip:
-            MDApp.get_running_app().root.remove_widget(self.tooltip)
-            self.tooltip = None
+        def passthrough(instance, value):
+            pass
+
+        Window.add_widget(self._tooltip)
+        x, y = self.adjust_tooltip_position()
+        self._tooltip.x, self._tooltip.y = x, y
+
+        if DEVICE_TYPE == "desktop":
+            Clock.schedule_once(
+                self.animation_tooltip_show, self.tooltip_display_delay
+            )
+        else:
+            Clock.schedule_once(self.animation_tooltip_show, 0)
 
     def on_mouse_pos(self, window, pos):
         if not self.get_root_window():
@@ -209,22 +224,22 @@ def on_enter(self):
 
     def on_leave(self):
         self.remove_tooltip()
+        self._tooltip = None
+
 
+class ServerLabel(HovererableLabel, MDTooltip):
+    tooltip_display_delay = 0.1
 
-class ServerLabel(HovererableLabel):
     def __init__(self, *args, **kwargs):
         super(HovererableLabel, self).__init__(*args, **kwargs)
-        self.layout = MDFloatLayout()
-        self.popuplabel = ServerToolTip(text="Test")
-        self.layout.add_widget(self.popuplabel)
+        self._tooltip = ServerToolTip(text="Test")
 
     def on_enter(self):
-        self.popuplabel.text = self.get_text()
-        MDApp.get_running_app().root.add_widget(self.layout)
-        fade_in_animation.start(self.layout)
+        self._tooltip.text = self.get_text()
+        self.display_tooltip()
 
     def on_leave(self):
-        MDApp.get_running_app().root.remove_widget(self.layout)
+        self.animation_tooltip_dismiss()
 
     @property
     def ctx(self) -> context_type:

From 224fa633587ac7df68df96812e5dcfc9f7b78626 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun, 25 Aug 2024 00:46:37 -0500
Subject: [PATCH 12/46] cleanup

---
 kvui.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/kvui.py b/kvui.py
index f9d52ea93efe..e71c3138ec61 100644
--- a/kvui.py
+++ b/kvui.py
@@ -185,9 +185,6 @@ def display_tooltip(self, *args) -> None:
         if not self._tooltip or self._tooltip.parent:
             return
 
-        def passthrough(instance, value):
-            pass
-
         Window.add_widget(self._tooltip)
         x, y = self.adjust_tooltip_position()
         self._tooltip.x, self._tooltip.y = x, y
@@ -490,16 +487,13 @@ def __init__(self, title, text, error=False, **kwargs):
 
 class ClientTabs(MDTabsPrimary):
     carousel: MDTabsCarousel
+    lock_swiping = True
 
     def __init__(self, *args, **kwargs):
-        self.carousel = MDTabsCarousel()
+        self.carousel = MDTabsCarousel(lock_swiping=True)
         super().__init__(*args, MDDivider(size_hint_y=None, height=dp(4)), self.carousel, **kwargs)
         self.size_hint_y = 1
 
-    def on_size(self, *args) -> None:
-        super().on_size(*args)
-        print(args)
-
 
 class GameManager(MDApp):
     logging_pairs = [

From 35e580a5141d510b513fd844a77c41b58c11b44a Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Mon, 26 Aug 2024 00:18:04 -0500
Subject: [PATCH 13/46] fix launcher background, remove unnecessary

---
 Launcher.py |  7 ++++---
 kvui.py     | 18 ------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 80202d723b69..a42580b9feb3 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -235,13 +235,14 @@ def build_button(component: Component, col=1):
                     self._client_layout.layout.add_widget(build_button(client[1]))
 
         def build(self):
-            self.theme_cls.theme_style = "Dark"
+            self.theme_cls.theme_style = "Light"
             self.theme_cls.primary_palette = "Green"
             self.container = MDFloatLayout()
+            self.container.md_bg_color = self.theme_cls.backgroundColor
             self.grid = MDGridLayout(cols=2)
             self.container.add_widget(self.grid)
-            self.grid.add_widget(MDLabel(text="General", size_hint_y=None, height=40))
-            self.grid.add_widget(MDLabel(text="Clients", size_hint_y=None, height=40))
+            self.grid.add_widget(MDLabel(text="General", size_hint_y=None, height=40, color=self.theme_cls.primaryColor))
+            self.grid.add_widget(MDLabel(text="Clients", size_hint_y=None, height=40, color=self.theme_cls.primaryColor))
             self._tool_layout = ScrollBox()
             self._tool_layout.layout.orientation = "vertical"
             self._tool_layout.layout.spacing = 10
diff --git a/kvui.py b/kvui.py
index e71c3138ec61..13f3c160efa0 100644
--- a/kvui.py
+++ b/kvui.py
@@ -178,24 +178,6 @@ def create_tooltip(self, text, x, y):
             self._tooltip = ToolTip(text=text, pos_hint={})
             self.display_tooltip()
 
-    def display_tooltip(self, *args) -> None:
-        """Reimpl because of KivyMD bug"""
-        from kivymd.material_resources import DEVICE_TYPE
-
-        if not self._tooltip or self._tooltip.parent:
-            return
-
-        Window.add_widget(self._tooltip)
-        x, y = self.adjust_tooltip_position()
-        self._tooltip.x, self._tooltip.y = x, y
-
-        if DEVICE_TYPE == "desktop":
-            Clock.schedule_once(
-                self.animation_tooltip_show, self.tooltip_display_delay
-            )
-        else:
-            Clock.schedule_once(self.animation_tooltip_show, 0)
-
     def on_mouse_pos(self, window, pos):
         if not self.get_root_window():
             return  # Abort if not displayed

From fb52ffa3c2b8fed6eeb82c208dccc893b8af1acb Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:04:00 -0500
Subject: [PATCH 14/46] launcher overhaul

---
 Launcher.py                  | 195 ++++++++++++++++++++++++++---------
 worlds/AutoSNIClient.py      |   3 +-
 worlds/LauncherComponents.py |   9 +-
 3 files changed, 155 insertions(+), 52 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index a42580b9feb3..257d0f73f420 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -165,106 +165,201 @@ def launch(exe, in_terminal=False):
 
 def run_gui():
     from kvui import (MDApp, MDFloatLayout, MDGridLayout, MDButton, MDLabel, MDButtonText, MDButtonIcon, ScrollBox,
-                      ContainerLayout, ImageIcon)
+                      ContainerLayout, Widget, MDBoxLayout)
     from kivy.core.window import Window
+    from kivy.metrics import dp
     from kivy.uix.image import AsyncImage
+    from kivymd.uix.button import MDIconButton
+    from kivymd.uix.card import MDCard
+    from kivymd.uix.menu import MDDropdownMenu
+    from kivymd.uix.navigationdrawer import MDNavigationDrawerDivider
     from kivymd.uix.relativelayout import MDRelativeLayout
+    from kivymd.uix.screen import MDScreen
+    from kivymd.uix.snackbar import MDSnackbar, MDSnackbarText
 
     class Launcher(MDApp):
         base_title: str = "Archipelago Launcher"
         container: ContainerLayout
+        navigation: MDBoxLayout
         grid: MDGridLayout
-        _tool_layout: Optional[ScrollBox] = None
-        _client_layout: Optional[ScrollBox] = None
+        button_layout: Optional[ScrollBox] = None
 
         def __init__(self, ctx=None):
             self.title = self.base_title
             self.ctx = ctx
             self.icon = r"data/icon.png"
+            self.favorites = []
+            persistent = Utils.persistent_load()
+            if "launcher" in persistent:
+                if "favorites" in persistent["launcher"]:
+                    self.favorites.extend(persistent["launcher"]["favorites"])
             super().__init__()
 
-        def _refresh_components(self) -> None:
+        def _refresh_components(self, type_filter: Optional[Sequence[Union[str, Type]]] = None) -> None:
+            if not type_filter:
+                type_filter = [Type.CLIENT, Type.ADJUSTER, Type.TOOL, Type.MISC]
+            favorites = "favorites" in type_filter
 
-            def build_button(component: Component, col=1):
+            def build_card(component: Component) -> Widget:
                 """
-                Builds a button widget for a given component.
+                Builds a card widget for a given component.
 
                 Args:
                     component (Component): The component associated with the button.
 
                 Returns:
-                    None. The button is added to the parent grid layout.
+                    The created Card Widget.
 
                 """
-                if component.icon != "icon":
-                    image = ImageIcon(source=icon_paths[component.icon],
-                                      size=(38, 38), size_hint=(None, 1), pos=(5, 0))
-                    button = MDButton(image, MDButtonText(text=component.display_name, pos=(15, 0)),
-                                      style="elevated", size_hint_y=None, height=40)
-                else:
-                    button = MDButton(MDButtonText(text=component.display_name, pos=(15, 0)),
-                                      style="elevated", size_hint_y=None, height=40)
+                button_card = MDCard(style="filled", padding="4dp", size_hint=(1, None), height=dp(75))
+                button_layout = MDRelativeLayout()
+                button_card.add_widget(button_layout)
+
+                source = icon_paths[component.icon]
+                image = AsyncImage(source=source, size=(40, 40), size_hint_y=None,
+                                   pos_hint={"center_x": 0.1, "center_y": 0.5})
+
+                button_layout.add_widget(image)
+                button_layout.add_widget(MDLabel(text=component.display_name,
+                                                 pos_hint={"center_x": 0.5,
+                                                           "center_y": 0.85 if component.description else 0.65},
+                                                 halign="center", font_style="Title", role="medium",
+                                                 theme_text_color="Custom", text_color=self.theme_cls.primaryColor))
+                if component.description:
+                    button_layout.add_widget(MDLabel(text=component.description,
+                                                     pos_hint={"center_x": 0.5, "center_y": 0.35}, halign="center",
+                                                     role="small", theme_text_color="Custom",
+                                                     text_color=self.theme_cls.primaryColor))
+
+                favorite_button = MDIconButton(icon="star" if component.display_name in self.favorites
+                                               else "star-outline",
+                                               style="standard", pos_hint={"center_x": 0.85, "center_y": 0.8},
+                                               theme_text_color="Custom", text_color=self.theme_cls.primaryColor)
+                favorite_button.component = component
+
+                def set_favorite(caller):
+                    if caller.component.display_name in self.favorites:
+                        self.favorites.remove(caller.component.display_name)
+                        caller.icon = "star-outline"
+                    else:
+                        self.favorites.append(caller.component.display_name)
+                        caller.icon = "star"
+
+                favorite_button.bind(on_release=set_favorite)
+                button_layout.add_widget(favorite_button)
+                context_button = MDIconButton(icon="menu", style="standard",
+                                              pos_hint={"center_x": 0.95, "center_y": 0.8}, theme_text_color="Custom",
+                                              text_color=self.theme_cls.primaryColor)
+
+                def open_menu(caller):
+                    menu_items = [
+                        {
+                            "text": "Add shortcut on desktop"
+                        }
+                    ]
+                    MDDropdownMenu(caller=caller, items=menu_items).open()
+                context_button.bind(on_release=open_menu)
+                button_layout.add_widget(context_button)
+
+                button = MDButton(MDButtonText(text="Open"), pos_hint={"center_x": 0.9, "center_y": 0.25},
+                                  size_hint_y=None,  height=dp(25))
                 button.component = component
                 button.bind(on_release=self.component_action)
-                button.size_hint = (1, 1)
+                button_layout.add_widget(button)
 
-                return button
+                return button_card
 
             # clear before repopulating
-            assert self._tool_layout and self._client_layout, "must call `build` first"
-            tool_children = reversed(self._tool_layout.layout.children)
+            assert self.button_layout, "must call `build` first"
+            tool_children = reversed(self.button_layout.layout.children)
             for child in tool_children:
-                self._tool_layout.layout.remove_widget(child)
-            client_children = reversed(self._client_layout.layout.children)
-            for child in client_children:
-                self._client_layout.layout.remove_widget(child)
+                self.button_layout.layout.remove_widget(child)
 
             _tools = {c.display_name: c for c in components if c.type == Type.TOOL}
             _clients = {c.display_name: c for c in components if c.type == Type.CLIENT}
             _adjusters = {c.display_name: c for c in components if c.type == Type.ADJUSTER}
             _miscs = {c.display_name: c for c in components if c.type == Type.MISC}
 
-            for (tool, client) in itertools.zip_longest(itertools.chain(
-                _tools.items(), _miscs.items(), _adjusters.items()
-            ), _clients.items()):
-                # column 1
-                if tool:
-                    self._tool_layout.layout.add_widget(build_button(tool[1]))
-                # column 2
-                if client:
-                    self._client_layout.layout.add_widget(build_button(client[1]))
+            for (name, component) in itertools.chain(
+                    _tools.items(), _miscs.items(), _adjusters.items(), _clients.items()):
+                if component.type in type_filter or favorites and component.display_name in self.favorites:
+                    self.button_layout.layout.add_widget(build_card(component))
 
         def build(self):
-            self.theme_cls.theme_style = "Light"
+            self.theme_cls.theme_style = "Dark"
             self.theme_cls.primary_palette = "Green"
-            self.container = MDFloatLayout()
-            self.container.md_bg_color = self.theme_cls.backgroundColor
+            self.top_screen = MDFloatLayout()
+            self.top_screen.md_bg_color = self.theme_cls.backgroundColor
+            #drawer_button = MDIconButton(icon="menu", theme_text_color="Custom", text_color=self.theme_cls.primaryColor)
+            #drawer_button.pos_hint = {"center_x": 0.05, "center_y": 0.95}
+            #self.screen.add_widget(drawer_button)
             self.grid = MDGridLayout(cols=2)
-            self.container.add_widget(self.grid)
-            self.grid.add_widget(MDLabel(text="General", size_hint_y=None, height=40, color=self.theme_cls.primaryColor))
-            self.grid.add_widget(MDLabel(text="Clients", size_hint_y=None, height=40, color=self.theme_cls.primaryColor))
-            self._tool_layout = ScrollBox()
-            self._tool_layout.layout.orientation = "vertical"
-            self._tool_layout.layout.spacing = 10
-            self.grid.add_widget(self._tool_layout)
-            self._client_layout = ScrollBox()
-            self._client_layout.layout.orientation = "vertical"
-            self._client_layout.layout.spacing = 10
-            self.grid.add_widget(self._client_layout)
+            self.navigation = MDGridLayout(cols=1, size_hint_x=0.25, width=dp(50))
+            self.top_screen.add_widget(self.grid)
+            self.grid.add_widget(self.navigation)
+            self.button_layout = ScrollBox()
+            self.button_layout.layout.orientation = "vertical"
+            self.button_layout.layout.spacing = 10
+            self.grid.add_widget(self.button_layout)
             self.grid.padding = 10
             self.grid.spacing = 5
-
             self._refresh_components()
 
+            # handle navigation drawer
+            #menu = MDNavigationDrawerMenu(MDNavigationDrawerLabel(text="Components"))
+            #self.drawer = MDNavigationDrawer(menu, radius=(0, dp(16), dp(16), 0), drawer_type="modal")
+
+            #drawer_button.bind(on_release=toggle_drawer)
+            #self.drawer.menu = menu
+            menu_icons = {
+                "Client": "controller",
+                "Tool": "desktop-classic",
+                "Adjuster": "wrench",
+                "Misc": "dots-horizontal-circle-outline"
+            }
+
+            def filter_clients(caller):
+                self._refresh_components(caller.type)
+
+            all_item = MDButton(
+                MDButtonIcon(icon="asterisk"),
+                MDButtonText(text="All"),
+                style="text"
+            )
+            all_item.type = (Type.CLIENT, Type.TOOL, Type.ADJUSTER, Type.MISC)
+            all_item.bind(on_release=filter_clients)
+            self.navigation.add_widget(all_item)
+            for type in (Type.CLIENT, Type.TOOL, Type.ADJUSTER, Type.MISC):
+                name = str(type).rsplit(".")[1].title()
+                item = MDButton(
+                    MDButtonIcon(icon=menu_icons[name]),
+                    MDButtonText(text=name),
+                    style="text"
+                )
+                item.type = (type,)
+                item.bind(on_release=filter_clients)
+                self.navigation.add_widget(item)
+            favorite_item = MDButton(
+                MDButtonIcon(icon="star"),
+                MDButtonText(text="Favorites"),
+                style="text"
+            )
+            favorite_item.type = ("favorites",)
+            favorite_item.bind(on_release=filter_clients)
+            self.navigation.add_widget(favorite_item)
+            self.navigation.add_widget(MDNavigationDrawerDivider())
+
             global refresh_components
             refresh_components = self._refresh_components
 
             Window.bind(on_drop_file=self._on_drop_file)
 
-            return self.container
+            return self.top_screen
 
         @staticmethod
         def component_action(button):
+            MDSnackbar(MDSnackbarText(text="Opening in a new window..."), y=dp(24), pos_hint={"center_x": 0.5},
+                       size_hint_x=0.5).open()
             if button.component.func:
                 button.component.func()
             else:
@@ -284,6 +379,10 @@ def _stop(self, *largs):
             self.root_window.close()
             super()._stop(*largs)
 
+        def on_stop(self):
+            Utils.persistent_store("launcher", "favorites", self.favorites)
+            super().on_stop()
+
     Launcher().run()
 
     # avoiding Launcher reference leak
diff --git a/worlds/AutoSNIClient.py b/worlds/AutoSNIClient.py
index 2b984d9c8846..32014f09a183 100644
--- a/worlds/AutoSNIClient.py
+++ b/worlds/AutoSNIClient.py
@@ -10,7 +10,8 @@
 if TYPE_CHECKING:
     from SNIClient import SNIContext
 
-component = Component('SNI Client', 'SNIClient', component_type=Type.CLIENT, file_identifier=SuffixIdentifier(".apsoe"))
+component = Component('SNI Client', 'SNIClient', component_type=Type.CLIENT, file_identifier=SuffixIdentifier(".apsoe"),
+                      description="A client for connecting to SNES consoles via Super Nintendo Interface.")
 components.append(component)
 
 
diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index d127bbea36ed..d16a3b133ac3 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -19,6 +19,7 @@ class Type(Enum):
 
 class Component:
     display_name: str
+    description: str
     type: Type
     script_name: Optional[str]
     frozen_name: Optional[str]
@@ -27,10 +28,12 @@ class Component:
     func: Optional[Callable]
     file_identifier: Optional[Callable[[str], bool]]
 
-    def __init__(self, display_name: str, script_name: Optional[str] = None, frozen_name: Optional[str] = None,
-                 cli: bool = False, icon: str = 'icon', component_type: Optional[Type] = None,
-                 func: Optional[Callable] = None, file_identifier: Optional[Callable[[str], bool]] = None):
+    def __init__(self, display_name: str, script_name: Optional[str] = None,
+                 frozen_name: Optional[str] = None, cli: bool = False, icon: str = 'icon',
+                 component_type: Optional[Type] = None, func: Optional[Callable] = None,
+                 file_identifier: Optional[Callable[[str], bool]] = None, description: Optional[str] = None,):
         self.display_name = display_name
+        self.description = description if description else ""
         self.script_name = script_name
         self.frozen_name = frozen_name or f'Archipelago{script_name}' if script_name else None
         self.icon = icon

From 7a0b34630ab86575800b47989f5da6b0b3c5889d Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Mon, 9 Sep 2024 01:28:15 -0500
Subject: [PATCH 15/46] Update Launcher.py

---
 Launcher.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 30966c28eefd..eeacdfff2bfe 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -124,10 +124,10 @@ def handle_uri(path: str, launch_args: Tuple[str, ...]) -> None:
         elif component.display_name == "Text Client":
             text_client_component = component
 
-    from kvui import App, Button, BoxLayout, Label, Clock, Window
+    from kvui import MDApp, MDButton, MDBoxLayout, MDLabel, Clock, Window
 
-    class Popup(App):
-        timer_label: Label
+    class Popup(MDApp):
+        timer_label: MDLabel
         remaining_time: Optional[int]
 
         def __init__(self):
@@ -136,26 +136,26 @@ def __init__(self):
             super().__init__()
 
         def build(self):
-            layout = BoxLayout(orientation="vertical")
+            layout = MDBoxLayout(orientation="vertical")
 
             if client_component is None:
                 self.remaining_time = 7
                 label_text = (f"A game client able to parse URIs was not detected for {game}.\n"
                               f"Launching Text Client in 7 seconds...")
-                self.timer_label = Label(text=label_text)
+                self.timer_label = MDLabel(text=label_text)
                 layout.add_widget(self.timer_label)
                 Clock.schedule_interval(self.update_label, 1)
             else:
-                layout.add_widget(Label(text="Select client to open and connect with."))
-                button_row = BoxLayout(orientation="horizontal", size_hint=(1, 0.4))
+                layout.add_widget(MDLabel(text="Select client to open and connect with."))
+                button_row = MDBoxLayout(orientation="horizontal", size_hint=(1, 0.4))
 
-                text_client_button = Button(
+                text_client_button = MDButton(
                     text=text_client_component.display_name,
                     on_release=lambda *args: run_component(text_client_component, *launch_args)
                 )
                 button_row.add_widget(text_client_button)
 
-                game_client_button = Button(
+                game_client_button = MDButton(
                     text=client_component.display_name,
                     on_release=lambda *args: run_component(client_component, *launch_args)
                 )
@@ -176,7 +176,7 @@ def update_label(self, dt):
                 # our timer is finished so launch text client and close down
                 run_component(text_client_component, *launch_args)
                 Clock.unschedule(self.update_label)
-                App.get_running_app().stop()
+                MDApp.get_running_app().stop()
                 Window.close()
 
     Popup().run()

From 018df155caabd4b48b8748a4a7191c4830737cd0 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:45:38 -0500
Subject: [PATCH 16/46] frozen build works, launcher shortcuts

---
 Launcher.py      | 26 ++++++++++++++++++++------
 kvui.py          |  9 +++------
 requirements.txt |  1 +
 setup.py         |  5 +++--
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index eeacdfff2bfe..b297e8f00659 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -21,6 +21,7 @@
 from os.path import isfile
 from shutil import which
 from typing import Callable, Optional, Sequence, Tuple, Union
+from pyshortcuts import make_shortcut
 
 import Utils
 import settings
@@ -234,6 +235,15 @@ def launch(exe, in_terminal=False):
             return
     subprocess.Popen(exe)
 
+def create_shortcut(button, component: Component):
+    script = sys.argv[0]
+    wkdir = Utils.local_path()
+
+    script = f"{script} \"{component.display_name}\""
+    make_shortcut(script, name=f"Archipelago {component.display_name}", icon=local_path("data", "icon.ico"),
+                  startmenu=False, terminal=False, working_dir=wkdir)
+    button.menu.dismiss()
+
 
 refresh_components: Optional[Callable[[], None]] = None
 
@@ -327,12 +337,16 @@ def set_favorite(caller):
                                               text_color=self.theme_cls.primaryColor)
 
                 def open_menu(caller):
-                    menu_items = [
-                        {
-                            "text": "Add shortcut on desktop"
-                        }
-                    ]
-                    MDDropdownMenu(caller=caller, items=menu_items).open()
+                    caller.menu.open()
+
+                menu_items = [
+                    {
+                        "text": "Add shortcut on desktop",
+                        "leading_icon": "laptop",
+                        "on_release": lambda: create_shortcut(context_button, component)
+                    }
+                ]
+                context_button.menu = MDDropdownMenu(caller=context_button, items=menu_items)
                 context_button.bind(on_release=open_menu)
                 button_layout.add_widget(context_button)
 
diff --git a/kvui.py b/kvui.py
index 13f3c160efa0..18608d51df04 100644
--- a/kvui.py
+++ b/kvui.py
@@ -7,11 +7,6 @@
 
 assert "kivy" not in sys.modules, "kvui should be imported before kivy for frozen compatibility"
 
-from kivy.uix.image import AsyncImage
-from kivy.uix.relativelayout import RelativeLayout
-from kivymd.uix.behaviors import CommonElevationBehavior
-from kivymd.uix.divider import MDDivider
-
 if sys.platform == "win32":
     import ctypes
 
@@ -32,12 +27,14 @@
 if Utils.is_frozen():
     os.environ["KIVY_DATA_DIR"] = Utils.local_path("data")
 
+
 from kivy.config import Config
 
 Config.set("input", "mouse", "mouse,disable_multitouch")
 Config.set("kivy", "exit_on_escape", "0")
 Config.set("graphics", "multisamples", "0")  # multisamples crash old intel drivers
-
+from kivy.uix.image import AsyncImage
+from kivymd.uix.divider import MDDivider
 from kivy.core.window import Window
 from kivy.core.clipboard import Clipboard
 from kivy.core.text.markup import MarkupLabel
diff --git a/requirements.txt b/requirements.txt
index 0d373448f394..57f2030cf02c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,3 +14,4 @@ cython>=3.0.11
 cymem>=2.0.8
 orjson>=3.10.7
 typing_extensions>=4.12.2
+pyshortcuts>=1.9.1
diff --git a/setup.py b/setup.py
index 0c9ee2c29302..05d30a2dd488 100644
--- a/setup.py
+++ b/setup.py
@@ -617,12 +617,13 @@ def find_lib(lib, arch, libc):
     ext_modules=cythonize("_speedups.pyx"),
     options={
         "build_exe": {
-            "packages": ["worlds", "kivy", "cymem", "websockets"],
+            "packages": ["worlds", "kivy", "cymem", "websockets", "kivymd"],
             "includes": [],
             "excludes": ["numpy", "Cython", "PySide2", "PIL",
                          "pandas"],
+            "zip_includes": [],
             "zip_include_packages": ["*"],
-            "zip_exclude_packages": ["worlds", "sc2", "orjson"],  # TODO: remove orjson here once we drop py3.8 support
+            "zip_exclude_packages": ["worlds", "sc2", "orjson", "kivymd"],  # TODO: remove orjson here once we drop py3.8 support
             "include_files": [],  # broken in cx 6.14.0, we use more special sauce now
             "include_msvcr": False,
             "replace_paths": ["*."],

From 2b11d578201db4efe0ca46fa9c5ba86a32b47421 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:46:12 -0500
Subject: [PATCH 17/46] lazy import to mask log message

---
 Launcher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Launcher.py b/Launcher.py
index b297e8f00659..7c7b96873270 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -21,7 +21,6 @@
 from os.path import isfile
 from shutil import which
 from typing import Callable, Optional, Sequence, Tuple, Union
-from pyshortcuts import make_shortcut
 
 import Utils
 import settings
@@ -236,6 +235,7 @@ def launch(exe, in_terminal=False):
     subprocess.Popen(exe)
 
 def create_shortcut(button, component: Component):
+    from pyshortcuts import make_shortcut
     script = sys.argv[0]
     wkdir = Utils.local_path()
 

From 49e426eebb0f4d676d6805ca8b3170750484a8aa Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:10:25 -0500
Subject: [PATCH 18/46] ladx client

---
 LinksAwakeningClient.py | 16 ++++------------
 kvui.py                 | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/LinksAwakeningClient.py b/LinksAwakeningClient.py
index a51645feac92..16088a6dca15 100644
--- a/LinksAwakeningClient.py
+++ b/LinksAwakeningClient.py
@@ -474,9 +474,7 @@ def __init__(self, server_address: typing.Optional[str], password: typing.Option
 
     def run_gui(self) -> None:
         import webbrowser
-        import kvui
-        from kvui import Button, GameManager
-        from kivy.uix.image import Image
+        from kvui import GameManager, ImageButton
 
         class LADXManager(GameManager):
             logging_pairs = [
@@ -489,16 +487,10 @@ def build(self):
                 b = super().build()
 
                 if self.ctx.magpie_enabled:
-                    button = Button(text="", size=(30, 30), size_hint_x=None,
-                                    on_press=lambda _: webbrowser.open('https://magpietracker.us/?enable_autotracker=1'))
-                    image = Image(size=(16, 16), texture=magpie_logo())
-                    button.add_widget(image)
-
-                    def set_center(_, center):
-                        image.center = center
-                    button.bind(center=set_center)
-
+                    button = ImageButton(texture=magpie_logo(), fit_mode="cover", image_size=(32, 32), size_hint_x=None,
+                                on_press=lambda _: webbrowser.open('https://magpietracker.us/?enable_autotracker=1'))
                     self.connect_layout.add_widget(button)
+
                 return b
 
         self.ui = LADXManager(self)
diff --git a/kvui.py b/kvui.py
index 18608d51df04..28ece434509c 100644
--- a/kvui.py
+++ b/kvui.py
@@ -58,7 +58,7 @@
 from kivymd.uix.floatlayout import MDFloatLayout
 from kivymd.uix.boxlayout import MDBoxLayout
 from kivymd.uix.tab.tab import MDTabsPrimary, MDTabsItem, MDTabsItemText, MDTabsCarousel
-from kivymd.uix.button import MDButton, MDButtonText, MDButtonIcon
+from kivymd.uix.button import MDButton, MDButtonText, MDButtonIcon, MDIconButton
 from kivymd.uix.label import MDLabel, MDIcon
 from kivymd.uix.recycleview import MDRecycleView
 from kivymd.uix.textfield.textfield import MDTextField
@@ -90,6 +90,23 @@ def __init__(self, *args, **kwargs):
     def add_widget(self, widget, index=0, canvas=None):
         return super(MDIcon, self).add_widget(widget)
 
+class ImageButton(MDIconButton):
+    def __init__(self, **kwargs):
+        image_args = dict()
+        for kwarg in ("fit_mode", "image_size", "color", "source", "texture"):
+            val = kwargs.pop(kwarg, "None")
+            if val != "None":
+                image_args[kwarg.replace("image_", "")] = val
+        super().__init__()
+        self.image = AsyncImage(**image_args)
+        def set_center(button, center):
+            self.image.center_x = self.center_x
+            self.image.center_y = self.center_y
+        self.bind(center=set_center)
+        self.add_widget(self.image)
+
+    def add_widget(self, widget, index=0, canvas=None):
+        return super(MDIcon, self).add_widget(widget)
 
 class ScrollBox(MDScrollView):
     layout: MDBoxLayout

From 83abe78257c2a50e9a45e3ca09cab9ed73f64321 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:27:03 -0500
Subject: [PATCH 19/46] hopefully Wargroove

---
 WargrooveClient.py            | 48 ++++++++++++++++-------------------
 worlds/wargroove/Wargroove.kv |  1 +
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/WargrooveClient.py b/WargrooveClient.py
index 39da044d659c..865c3973349c 100644
--- a/WargrooveClient.py
+++ b/WargrooveClient.py
@@ -214,38 +214,33 @@ def on_package(self, cmd: str, args: dict):
     def run_gui(self):
         """Import kivy UI system and start running it as self.ui_task."""
         from kvui import GameManager, HoverBehavior, ServerToolTip
-        from kivy.uix.tabbedpanel import TabbedPanelItem
         from kivy.lang import Builder
-        from kivy.uix.button import Button
-        from kivy.uix.togglebutton import ToggleButton
-        from kivy.uix.boxlayout import BoxLayout
-        from kivy.uix.gridlayout import GridLayout
-        from kivy.uix.image import AsyncImage, Image
-        from kivy.uix.stacklayout import StackLayout
-        from kivy.uix.label import Label
-        from kivy.properties import ColorProperty
-        from kivy.uix.image import Image
+        from kivymd.uix.behaviors.toggle_behavior import MDToggleButtonBehavior
+        from kivymd.uix.button import MDButton, MDButtonText
+        from kivymd.uix.boxlayout import MDBoxLayout
+        from kivymd.uix.label import MDLabel
+        from kivymd.uix.tab import MDTabsItem, MDTabsItemText
         import pkgutil
 
-        class TrackerLayout(BoxLayout):
+        class TrackerLayout(MDBoxLayout):
             pass
 
-        class CommanderSelect(BoxLayout):
+        class CommanderSelect(MDBoxLayout):
             pass
 
-        class CommanderButton(ToggleButton):
+        class CommanderButton(MDButton, MDToggleButtonBehavior):
             pass
 
-        class FactionBox(BoxLayout):
+        class FactionBox(MDBoxLayout):
             pass
 
-        class CommanderGroup(BoxLayout):
+        class CommanderGroup(MDBoxLayout):
             pass
 
-        class ItemTracker(BoxLayout):
+        class ItemTracker(MDBoxLayout):
             pass
 
-        class ItemLabel(Label):
+        class ItemLabel(MDLabel):
             pass
 
         class WargrooveManager(GameManager):
@@ -256,8 +251,8 @@ class WargrooveManager(GameManager):
             base_title = "Archipelago Wargroove Client"
             ctx: WargrooveContext
             unit_tracker: ItemTracker
-            trigger_tracker: BoxLayout
-            boost_tracker: BoxLayout
+            trigger_tracker: MDBoxLayout
+            boost_tracker: MDBoxLayout
             commander_buttons: Dict[int, List[CommanderButton]]
             tracker_items = {
                 "Swordsman": ItemData(None, "Unit", False),
@@ -267,9 +262,10 @@ class WargrooveManager(GameManager):
 
             def build(self):
                 container = super().build()
-                panel = TabbedPanelItem(text="Wargroove")
+                panel = MDTabsItem(MDTabsItemText(text="Wargroove"))
                 panel.content = self.build_tracker()
                 self.tabs.add_widget(panel)
+                self.tabs.carousel.add_widget(panel.content)
                 return container
 
             def build_tracker(self) -> TrackerLayout:
@@ -283,21 +279,21 @@ def build_tracker(self) -> TrackerLayout:
                         commander_group = CommanderGroup()
                         commander_buttons = []
                         for commander in commanders:
-                            commander_button = CommanderButton(text=commander.name, group="commanders")
+                            commander_button = CommanderButton(MDButtonText(commander.name), group="commanders")
                             if faction == "Starter":
                                 commander_button.disabled = False
                             commander_button.bind(on_press=lambda instance: self.ctx.set_commander(instance.text))
                             commander_buttons.append(commander_button)
                             commander_group.add_widget(commander_button)
                         self.commander_buttons[faction] = commander_buttons
-                        faction_box.add_widget(Label(text=faction, size_hint_x=None, pos_hint={'left': 1}, size_hint_y=None, height=10))
+                        faction_box.add_widget(MDLabel(text=faction, size_hint_x=None, pos_hint={'left': 1}, size_hint_y=None, height=10))
                         faction_box.add_widget(commander_group)
                         commander_select.add_widget(faction_box)
                     item_tracker = ItemTracker(padding=[0,20])
-                    self.unit_tracker = BoxLayout(orientation="vertical")
-                    other_tracker = BoxLayout(orientation="vertical")
-                    self.trigger_tracker = BoxLayout(orientation="vertical")
-                    self.boost_tracker = BoxLayout(orientation="vertical")
+                    self.unit_tracker = MDBoxLayout(orientation="vertical")
+                    other_tracker = MDBoxLayout(orientation="vertical")
+                    self.trigger_tracker = MDBoxLayout(orientation="vertical")
+                    self.boost_tracker = MDBoxLayout(orientation="vertical")
                     other_tracker.add_widget(self.trigger_tracker)
                     other_tracker.add_widget(self.boost_tracker)
                     item_tracker.add_widget(self.unit_tracker)
diff --git a/worlds/wargroove/Wargroove.kv b/worlds/wargroove/Wargroove.kv
index 9609684a4254..49d7d512e8fc 100644
--- a/worlds/wargroove/Wargroove.kv
+++ b/worlds/wargroove/Wargroove.kv
@@ -7,6 +7,7 @@
     orientation: 'horizontal'
 
 <CommanderButton>:
+    style: "elevated"
     text_size: self.size
     size_hint: (None, 0.8)
     width: 100

From 2643f9eec287733cdfd2599d3ebd7a1e9a56a6cb Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:05:01 -0500
Subject: [PATCH 20/46] fix button issue

---
 WargrooveClient.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WargrooveClient.py b/WargrooveClient.py
index 865c3973349c..d9b46ee11fba 100644
--- a/WargrooveClient.py
+++ b/WargrooveClient.py
@@ -279,7 +279,10 @@ def build_tracker(self) -> TrackerLayout:
                         commander_group = CommanderGroup()
                         commander_buttons = []
                         for commander in commanders:
-                            commander_button = CommanderButton(MDButtonText(commander.name), group="commanders")
+                            commander_button = CommanderButton(MDButtonText(commander.name),
+                                                               background_normal=self.theme_cls.surfaceContainerLowColor,
+                                                               background_down=self.theme_cls.primaryColor,
+                                                               group="commanders")
                             if faction == "Starter":
                                 commander_button.disabled = False
                             commander_button.bind(on_press=lambda instance: self.ctx.set_commander(instance.text))

From 1c793ae11a500cf5dcf423277b909f56401cb94e Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:52:54 -0500
Subject: [PATCH 21/46] reimplement almost all of toggle button

---
 kvui.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/kvui.py b/kvui.py
index 28ece434509c..d629342acc9b 100644
--- a/kvui.py
+++ b/kvui.py
@@ -119,6 +119,45 @@ def __init__(self, *args, **kwargs):
         self.bar_width = dp(12)
         self.scroll_type = ["bars"]
 
+#thanks kivymd
+class ToggleButton(MDButton):
+    state: typing.Literal["normal", "down"]
+
+    def __init__(self, *args, **kwargs):
+        super(ToggleButton, self).__init__(*args, **kwargs)
+        self.bind(state=self._update_bg)
+
+    def _do_press(self):
+        pass
+
+    def _do_release(self, *args) -> None:
+        if self.state == "down":
+            self.state = "normal"
+        else:
+            self.state = "down"
+
+    def _update_bg(self, _, state: str):
+        if self.theme_bg_color == "Primary":
+            self.theme_bg_color = "Custom"
+
+        if state == "down":
+            self.md_bg_color = self.theme_cls.primaryColor
+            for child in self.children:
+                if child.theme_text_color == "Primary":
+                    child.theme_text_color = "Custom"
+                if child.theme_icon_color == "Primary":
+                    child.theme_icon_color = "Custom"
+                child.text_color = self.theme_cls.onPrimaryColor
+                child.icon_color = self.theme_cls.onPrimaryColor
+        else:
+            self.md_bg_color = self.theme_cls.surfaceContainerLowestColor
+            for child in self.children:
+                if child.theme_text_color == "Primary":
+                    child.theme_text_color = "Custom"
+                if child.theme_icon_color == "Primary":
+                    child.theme_icon_color = "Custom"
+                child.text_color = self.theme_cls.primaryColor
+                child.icon_color = self.theme_cls.primaryColor
 
 # I was surprised to find this didn't already exist in kivy :(
 class HoverBehavior(object):

From 398eb5cedc8b4d54b5918f3e1d9e4746b302ba46 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:55:57 -0500
Subject: [PATCH 22/46] huh kivy did the work for me

---
 WargrooveClient.py | 12 ++++--------
 kvui.py            | 15 ++-------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/WargrooveClient.py b/WargrooveClient.py
index d9b46ee11fba..1e964f4d658b 100644
--- a/WargrooveClient.py
+++ b/WargrooveClient.py
@@ -213,10 +213,9 @@ def on_package(self, cmd: str, args: dict):
 
     def run_gui(self):
         """Import kivy UI system and start running it as self.ui_task."""
-        from kvui import GameManager, HoverBehavior, ServerToolTip
+        from kvui import GameManager, HoverBehavior, ServerToolTip, ToggleButton
         from kivy.lang import Builder
-        from kivymd.uix.behaviors.toggle_behavior import MDToggleButtonBehavior
-        from kivymd.uix.button import MDButton, MDButtonText
+        from kivymd.uix.button import MDButtonText
         from kivymd.uix.boxlayout import MDBoxLayout
         from kivymd.uix.label import MDLabel
         from kivymd.uix.tab import MDTabsItem, MDTabsItemText
@@ -228,7 +227,7 @@ class TrackerLayout(MDBoxLayout):
         class CommanderSelect(MDBoxLayout):
             pass
 
-        class CommanderButton(MDButton, MDToggleButtonBehavior):
+        class CommanderButton(ToggleButton):
             pass
 
         class FactionBox(MDBoxLayout):
@@ -279,10 +278,7 @@ def build_tracker(self) -> TrackerLayout:
                         commander_group = CommanderGroup()
                         commander_buttons = []
                         for commander in commanders:
-                            commander_button = CommanderButton(MDButtonText(commander.name),
-                                                               background_normal=self.theme_cls.surfaceContainerLowColor,
-                                                               background_down=self.theme_cls.primaryColor,
-                                                               group="commanders")
+                            commander_button = CommanderButton(MDButtonText(commander.name), group="commanders")
                             if faction == "Starter":
                                 commander_button.disabled = False
                             commander_button.bind(on_press=lambda instance: self.ctx.set_commander(instance.text))
diff --git a/kvui.py b/kvui.py
index d629342acc9b..b7e9d573d028 100644
--- a/kvui.py
+++ b/kvui.py
@@ -48,7 +48,7 @@
 from kivy.utils import escape_markup
 from kivy.lang import Builder
 from kivy.uix.recycleview.views import RecycleDataViewBehavior
-from kivy.uix.behaviors import FocusBehavior
+from kivy.uix.behaviors import FocusBehavior, ToggleButtonBehavior
 from kivy.uix.recycleboxlayout import RecycleBoxLayout
 from kivy.uix.recycleview.layout import LayoutSelectionBehavior
 from kivy.animation import Animation
@@ -120,22 +120,11 @@ def __init__(self, *args, **kwargs):
         self.scroll_type = ["bars"]
 
 #thanks kivymd
-class ToggleButton(MDButton):
-    state: typing.Literal["normal", "down"]
-
+class ToggleButton(MDButton, ToggleButtonBehavior):
     def __init__(self, *args, **kwargs):
         super(ToggleButton, self).__init__(*args, **kwargs)
         self.bind(state=self._update_bg)
 
-    def _do_press(self):
-        pass
-
-    def _do_release(self, *args) -> None:
-        if self.state == "down":
-            self.state = "normal"
-        else:
-            self.state = "down"
-
     def _update_bg(self, _, state: str):
         if self.theme_bg_color == "Primary":
             self.theme_bg_color = "Custom"

From ded7c38ad5e662e323c57dc9df27e5ed944af3b0 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 21:17:01 -0500
Subject: [PATCH 23/46] Update kvui.py

---
 kvui.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kvui.py b/kvui.py
index b7e9d573d028..f3610f3d8719 100644
--- a/kvui.py
+++ b/kvui.py
@@ -119,13 +119,16 @@ def __init__(self, *args, **kwargs):
         self.bar_width = dp(12)
         self.scroll_type = ["bars"]
 
-#thanks kivymd
+
+# thanks kivymd
 class ToggleButton(MDButton, ToggleButtonBehavior):
     def __init__(self, *args, **kwargs):
         super(ToggleButton, self).__init__(*args, **kwargs)
         self.bind(state=self._update_bg)
 
     def _update_bg(self, _, state: str):
+        if self.disabled:
+            return
         if self.theme_bg_color == "Primary":
             self.theme_bg_color = "Custom"
 

From 51cacded3d1bbee6df17cc2399f42765dde956e9 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 21:19:35 -0500
Subject: [PATCH 24/46] revert WG changes other than tabs

---
 WargrooveClient.py            | 38 +++++++++++++++++------------------
 worlds/wargroove/Wargroove.kv |  1 -
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/WargrooveClient.py b/WargrooveClient.py
index 1e964f4d658b..d9fc255eae5e 100644
--- a/WargrooveClient.py
+++ b/WargrooveClient.py
@@ -213,33 +213,33 @@ def on_package(self, cmd: str, args: dict):
 
     def run_gui(self):
         """Import kivy UI system and start running it as self.ui_task."""
-        from kvui import GameManager, HoverBehavior, ServerToolTip, ToggleButton
-        from kivy.lang import Builder
-        from kivymd.uix.button import MDButtonText
-        from kivymd.uix.boxlayout import MDBoxLayout
-        from kivymd.uix.label import MDLabel
+        from kvui import GameManager, HoverBehavior, ServerToolTip
         from kivymd.uix.tab import MDTabsItem, MDTabsItemText
+        from kivy.lang import Builder
+        from kivy.uix.togglebutton import ToggleButton
+        from kivy.uix.boxlayout import BoxLayout
+        from kivy.uix.label import Label
         import pkgutil
 
-        class TrackerLayout(MDBoxLayout):
+        class TrackerLayout(BoxLayout):
             pass
 
-        class CommanderSelect(MDBoxLayout):
+        class CommanderSelect(BoxLayout):
             pass
 
         class CommanderButton(ToggleButton):
             pass
 
-        class FactionBox(MDBoxLayout):
+        class FactionBox(BoxLayout):
             pass
 
-        class CommanderGroup(MDBoxLayout):
+        class CommanderGroup(BoxLayout):
             pass
 
-        class ItemTracker(MDBoxLayout):
+        class ItemTracker(BoxLayout):
             pass
 
-        class ItemLabel(MDLabel):
+        class ItemLabel(Label):
             pass
 
         class WargrooveManager(GameManager):
@@ -250,8 +250,8 @@ class WargrooveManager(GameManager):
             base_title = "Archipelago Wargroove Client"
             ctx: WargrooveContext
             unit_tracker: ItemTracker
-            trigger_tracker: MDBoxLayout
-            boost_tracker: MDBoxLayout
+            trigger_tracker: BoxLayout
+            boost_tracker: BoxLayout
             commander_buttons: Dict[int, List[CommanderButton]]
             tracker_items = {
                 "Swordsman": ItemData(None, "Unit", False),
@@ -278,21 +278,21 @@ def build_tracker(self) -> TrackerLayout:
                         commander_group = CommanderGroup()
                         commander_buttons = []
                         for commander in commanders:
-                            commander_button = CommanderButton(MDButtonText(commander.name), group="commanders")
+                            commander_button = CommanderButton(text=commander.name, group="commanders")
                             if faction == "Starter":
                                 commander_button.disabled = False
                             commander_button.bind(on_press=lambda instance: self.ctx.set_commander(instance.text))
                             commander_buttons.append(commander_button)
                             commander_group.add_widget(commander_button)
                         self.commander_buttons[faction] = commander_buttons
-                        faction_box.add_widget(MDLabel(text=faction, size_hint_x=None, pos_hint={'left': 1}, size_hint_y=None, height=10))
+                        faction_box.add_widget(Label(text=faction, size_hint_x=None, pos_hint={'left': 1}, size_hint_y=None, height=10))
                         faction_box.add_widget(commander_group)
                         commander_select.add_widget(faction_box)
                     item_tracker = ItemTracker(padding=[0,20])
-                    self.unit_tracker = MDBoxLayout(orientation="vertical")
-                    other_tracker = MDBoxLayout(orientation="vertical")
-                    self.trigger_tracker = MDBoxLayout(orientation="vertical")
-                    self.boost_tracker = MDBoxLayout(orientation="vertical")
+                    self.unit_tracker = BoxLayout(orientation="vertical")
+                    other_tracker = BoxLayout(orientation="vertical")
+                    self.trigger_tracker = BoxLayout(orientation="vertical")
+                    self.boost_tracker = BoxLayout(orientation="vertical")
                     other_tracker.add_widget(self.trigger_tracker)
                     other_tracker.add_widget(self.boost_tracker)
                     item_tracker.add_widget(self.unit_tracker)
diff --git a/worlds/wargroove/Wargroove.kv b/worlds/wargroove/Wargroove.kv
index 49d7d512e8fc..9609684a4254 100644
--- a/worlds/wargroove/Wargroove.kv
+++ b/worlds/wargroove/Wargroove.kv
@@ -7,7 +7,6 @@
     orientation: 'horizontal'
 
 <CommanderButton>:
-    style: "elevated"
     text_size: self.size
     size_hint: (None, 0.8)
     width: 100

From 3778ee75f73cc8592cea869c6b38ad63d095d048 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 21:39:54 -0500
Subject: [PATCH 25/46] sc2

---
 worlds/sc2/ClientGui.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/worlds/sc2/ClientGui.py b/worlds/sc2/ClientGui.py
index 22e444efe7c9..653309fdac7a 100644
--- a/worlds/sc2/ClientGui.py
+++ b/worlds/sc2/ClientGui.py
@@ -4,7 +4,7 @@
 from kvui import GameManager, HoverBehavior, ServerToolTip
 from kivy.app import App
 from kivy.clock import Clock
-from kivy.uix.tabbedpanel import TabbedPanelItem
+from kivymd.uix.tab import MDTabsItem, MDTabsItemText
 from kivy.uix.gridlayout import GridLayout
 from kivy.lang import Builder
 from kivy.uix.label import Label
@@ -97,12 +97,13 @@ def clear_tooltip(self) -> None:
     def build(self):
         container = super().build()
 
-        panel = TabbedPanelItem(text="Starcraft 2 Launcher")
+        panel = MDTabsItem(MDTabsItemText(text="Starcraft 2 Launcher"))
         panel.content = CampaignScroll()
         self.campaign_panel = MultiCampaignLayout()
         panel.content.add_widget(self.campaign_panel)
 
         self.tabs.add_widget(panel)
+        self.tabs.carousel.add_widget(panel.content)
 
         Clock.schedule_interval(self.build_mission_table, 0.5)
 

From ef10d917931085b01b6a3341698e47809726eb5f Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:27:14 -0500
Subject: [PATCH 26/46] common client cleanup

---
 kvui.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kvui.py b/kvui.py
index f3610f3d8719..6d0883c8902b 100644
--- a/kvui.py
+++ b/kvui.py
@@ -90,6 +90,7 @@ def __init__(self, *args, **kwargs):
     def add_widget(self, widget, index=0, canvas=None):
         return super(MDIcon, self).add_widget(widget)
 
+
 class ImageButton(MDIconButton):
     def __init__(self, **kwargs):
         image_args = dict()
@@ -108,6 +109,7 @@ def set_center(button, center):
     def add_widget(self, widget, index=0, canvas=None):
         return super(MDIcon, self).add_widget(widget)
 
+
 class ScrollBox(MDScrollView):
     layout: MDBoxLayout
 
@@ -582,7 +584,7 @@ def build(self) -> Layout:
         self.connect_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(70),
                                           spacing=5, padding=(5, 10))
         # top part
-        server_label = ServerLabel()
+        server_label = ServerLabel(halign="center")
         self.connect_layout.add_widget(server_label)
         self.server_connect_bar = ConnectBarTextInput(text=self.ctx.suggested_address or "archipelago.gg:",
                                                       size_hint_y=None, role="medium",
@@ -595,7 +597,7 @@ def connect_bar_validate(sender):
         self.server_connect_bar.bind(on_text_validate=connect_bar_validate)
         self.connect_layout.add_widget(self.server_connect_bar)
         self.server_connect_button = MDButton(MDButtonText(text="Connect"), style="filled", size=(dp(100), dp(70)),
-                                              size_hint_x=None, size_hint_y=None, radius=5, pos_hint={"center_y": 0.5})
+                                              size_hint_x=None, size_hint_y=None, radius=5, pos_hint={"center_y": 0.55})
         self.server_connect_button.bind(on_press=self.connect_button_action)
         self.server_connect_button.height = self.server_connect_bar.height
         self.connect_layout.add_widget(self.server_connect_button)
@@ -635,7 +637,7 @@ def connect_bar_validate(sender):
         # bottom part
         bottom_layout = MDBoxLayout(orientation="horizontal", size_hint_y=None, height=dp(70), spacing=5, padding=(5, 10))
         info_button = MDButton(MDButtonText(text="Command:"), radius=5, style="filled", size=(dp(100), dp(70)),
-                               size_hint_x=None, size_hint_y=None, pos_hint={"center_y": 0.5})
+                               size_hint_x=None, size_hint_y=None, pos_hint={"center_y": 0.575})
         info_button.bind(on_release=self.command_button_action)
         bottom_layout.add_widget(info_button)
         self.textinput = CommandPromptTextInput(size_hint_y=None, height=dp(30), multiline=False, write_tab=False)

From a7fe259c26802587cfe03d9b1558568ab0d0f8c0 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:29:02 -0500
Subject: [PATCH 27/46] actually make launcher reflect color

---
 Launcher.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 7c7b96873270..71837f8136dd 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -375,13 +375,12 @@ def open_menu(caller):
                     self.button_layout.layout.add_widget(build_card(component))
 
         def build(self):
-            self.theme_cls.theme_style = "Dark"
-            self.theme_cls.primary_palette = "Green"
+            from kvui import KivyJSONtoTextParser
+            text_colors = KivyJSONtoTextParser.TextColors()
+            self.theme_cls.theme_style = getattr(text_colors, "theme_style", "Dark")
+            self.theme_cls.primary_palette = getattr(text_colors, "primary_palette", "Green")
             self.top_screen = MDFloatLayout()
             self.top_screen.md_bg_color = self.theme_cls.backgroundColor
-            #drawer_button = MDIconButton(icon="menu", theme_text_color="Custom", text_color=self.theme_cls.primaryColor)
-            #drawer_button.pos_hint = {"center_x": 0.05, "center_y": 0.95}
-            #self.screen.add_widget(drawer_button)
             self.grid = MDGridLayout(cols=2)
             self.navigation = MDGridLayout(cols=1, size_hint_x=0.25, width=dp(50))
             self.top_screen.add_widget(self.grid)
@@ -394,12 +393,7 @@ def build(self):
             self.grid.spacing = 5
             self._refresh_components()
 
-            # handle navigation drawer
-            #menu = MDNavigationDrawerMenu(MDNavigationDrawerLabel(text="Components"))
-            #self.drawer = MDNavigationDrawer(menu, radius=(0, dp(16), dp(16), 0), drawer_type="modal")
-
-            #drawer_button.bind(on_release=toggle_drawer)
-            #self.drawer.menu = menu
+            # handle menu
             menu_icons = {
                 "Client": "controller",
                 "Tool": "desktop-classic",

From 238be83495b6a68599929f87df7b6d443ac1af59 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:30:55 -0500
Subject: [PATCH 28/46] lmao

---
 Launcher.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 71837f8136dd..d7ed44a8878b 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -229,7 +229,7 @@ def launch(exe, in_terminal=False):
                 subprocess.Popen([terminal, '-e', shlex.join(exe)])
                 return
         elif is_macos:
-            terminal = [which('open'), '-W', '-a', 'Terminal.MDApp']
+            terminal = [which('open'), '-W', '-a', 'Terminal.app']
             subprocess.Popen([*terminal, *exe])
             return
     subprocess.Popen(exe)
@@ -482,7 +482,7 @@ def run_component(component: Component, *args):
     elif component.script_name:
         subprocess.run([*get_exe(component.script_name), *args])
     else:
-        logging.warning(f"Component {component} does not MDAppear to be executable.")
+        logging.warning(f"Component {component} does not appear to be executable.")
 
 
 def main(args: Optional[Union[argparse.Namespace, dict]] = None):

From fd022fb57cecae689093b39160b62b9b180c3dca Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:41:08 -0500
Subject: [PATCH 29/46] unused bits, align EL

---
 kvui.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/kvui.py b/kvui.py
index 6d0883c8902b..17f0631e6ea4 100644
--- a/kvui.py
+++ b/kvui.py
@@ -571,8 +571,6 @@ def on_start(*args):
             self.root.md_bg_color = self.theme_cls.backgroundColor
         super().on_start()
         Clock.schedule_once(on_start)
-        #self.tabs.add_widget(MDTabsItem(MDTabsItemText("TestTab")))
-        #self.tabs.carousel.add_widget(MDLabel(text="Label 1"))
 
     def build(self) -> Layout:
         self.theme_cls.theme_style = self.json_to_kivy_parser.theme_style
@@ -626,7 +624,6 @@ def connect_bar_validate(sender):
         hint_panel = MDTabsItem(MDTabsItemText(text="Hints"))
         self.log_panels["Hints"] = hint_panel.content = HintLog(self.json_to_kivy_parser)
         self.tabs.carousel.add_widget(hint_panel.content)
-        #self.tabs.carousel.add_widget(MDLabel(text="TEST", halign="center"))
         self.tabs.add_widget(hint_panel)
 
         self.main_area_container = MDGridLayout(size_hint_y=1, rows=1)
@@ -737,7 +734,7 @@ def update_address_bar(self, text: str):
     def enable_energy_link(self):
         if not hasattr(self, "energy_link_label"):
             self.energy_link_label = MDLabel(text="Energy Link: Standby",
-                                           size_hint_x=None, width=150)
+                                           size_hint_x=None, width=150, halign="center")
             self.connect_layout.add_widget(self.energy_link_label)
 
     def set_new_energy_link_value(self):
@@ -777,7 +774,6 @@ class UILog(MDRecycleView):
     messages: typing.ClassVar[int]  # comes from kv file
     adaptive_height = True
 
-
     def __init__(self, *loggers_to_handle, **kwargs):
         super(UILog, self).__init__(**kwargs)
         self.data = []

From 3e4754299123ad5e911d02dbcbccb6c052844d64 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sat, 14 Sep 2024 01:11:25 -0500
Subject: [PATCH 30/46] trim docstring

---
 Launcher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Launcher.py b/Launcher.py
index d7ed44a8878b..b5c024e3fd6f 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -1,5 +1,5 @@
 """
-Archipelago launcher for bundled MDApp.
+Archipelago Launcher
 
 * if run with APBP as argument, launch corresponding client.
 * if run with executable as argument, run it passing argv[2:] as arguments

From 7437924df9e324368c983eaa2120931d8608df66 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sat, 14 Sep 2024 01:37:32 -0500
Subject: [PATCH 31/46] text and message coloring

---
 data/client.kv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/client.kv b/data/client.kv
index 5c97082f34a3..e5282a9162e3 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -18,7 +18,7 @@
     theme_style: "Dark" # Light/Dark
     primary_palette: "Green" # Many options
 <MDLabel>:
-    color: "FFFFFF"
+    color: self.theme_cls.primaryColor
 <TooltipLabel>:
     adaptive_height: True
     font_size: dp(20)
@@ -28,7 +28,7 @@
     size_hint: 1, None
     canvas.before:
         Color:
-            rgba: (.0, 0.9, .1, .3) if self.selected else (0,0,0,0)
+            rgba: (.0, 0.9, .1, .3) if self.selected else self.theme_cls.surfaceContainerLowColor
         Rectangle:
             size: self.size
             pos: self.pos
@@ -50,7 +50,7 @@
 <HintLabel>:
     canvas.before:
         Color:
-            rgba: (.0, 0.9, .1, .3) if self.selected else (0.4, 0.4, 0.4, 0.1) if self.striped else (0.0, 0.0, 0.0, 0)
+            rgba: (.0, 0.9, .1, .3) if self.selected else self.theme_cls.surfaceContainerHighColor if self.striped else self.theme_cls.surfaceContainerLowColor
         Rectangle:
             size: self.size
             pos: self.pos

From 4869573b24e07013e76efd62cd2a9cf4e3ba3333 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 19 Sep 2024 02:20:59 -0500
Subject: [PATCH 32/46] add remove tab helper function

---
 kvui.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kvui.py b/kvui.py
index 17f0631e6ea4..38907b3ea665 100644
--- a/kvui.py
+++ b/kvui.py
@@ -523,6 +523,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, MDDivider(size_hint_y=None, height=dp(4)), self.carousel, **kwargs)
         self.size_hint_y = 1
 
+    def remove_tab(self, tab, content=None):
+        if content is None:
+            content = tab.content
+        self.ids.container.remove_widget(tab)
+        self.carousel.remove_widget(content)
+        self.on_size(self, self.size)
 
 class GameManager(MDApp):
     logging_pairs = [

From 896a0bb2b81897cff1f332c7c1e86dc0b0e69002 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 19 Sep 2024 02:24:04 -0500
Subject: [PATCH 33/46] update size on add_widget for clienttabs

---
 kvui.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kvui.py b/kvui.py
index 38907b3ea665..e5dfd3e1b7e2 100644
--- a/kvui.py
+++ b/kvui.py
@@ -523,6 +523,10 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, MDDivider(size_hint_y=None, height=dp(4)), self.carousel, **kwargs)
         self.size_hint_y = 1
 
+    def add_widget(self, widget, *args, **kwargs):
+        super().add_widget(widget, args, kwargs)
+        self.on_size(self, self.size)
+
     def remove_tab(self, tab, content=None):
         if content is None:
             content = tab.content

From 6b5f2c00bb6f46c2e6fae317c4a672eae5dec6f1 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:57:52 -0500
Subject: [PATCH 34/46] remove add_widget override

whoops
---
 kvui.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kvui.py b/kvui.py
index e5dfd3e1b7e2..68635054374e 100644
--- a/kvui.py
+++ b/kvui.py
@@ -523,10 +523,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, MDDivider(size_hint_y=None, height=dp(4)), self.carousel, **kwargs)
         self.size_hint_y = 1
 
-    def add_widget(self, widget, *args, **kwargs):
-        super().add_widget(widget, args, kwargs)
-        self.on_size(self, self.size)
-
     def remove_tab(self, tab, content=None):
         if content is None:
             content = tab.content
@@ -534,6 +530,7 @@ def remove_tab(self, tab, content=None):
         self.carousel.remove_widget(content)
         self.on_size(self, self.size)
 
+
 class GameManager(MDApp):
     logging_pairs = [
         ("Client", "Archipelago"),

From 9c285a062e0a9957b63ce7635a367a25c390b45b Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Fri, 27 Sep 2024 19:16:17 -0500
Subject: [PATCH 35/46] Update kvui.py

---
 kvui.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kvui.py b/kvui.py
index 37be87bd13a4..e6dde8128eae 100644
--- a/kvui.py
+++ b/kvui.py
@@ -665,9 +665,10 @@ def connect_bar_validate(sender):
     def add_client_tab(self, title: str, content: Widget) -> Widget:
         """Adds a new tab to the client window with a given title, and provides a given Widget as its content.
          Returns the new tab widget, with the provided content being placed on the tab as content."""
-        new_tab = TabbedPanelItem(text=title)
+        new_tab = MDTabsItem(MDTabsItemText(text=title))
         new_tab.content = content
         self.tabs.add_widget(new_tab)
+        self.tabs.carousel.add_widget(new_tab.content)
         return new_tab
 
     def update_texts(self, dt):

From 05aead31a7ca6176036e2701346669cb29384194 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 27 Nov 2024 19:00:55 -0600
Subject: [PATCH 36/46] pin kivymd

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 57f2030cf02c..0370e6444cb4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ jellyfish>=1.1.0
 jinja2>=3.1.4
 schema>=0.7.7
 kivy>=2.3.0
-kivymd @ git+https://github.com/kivymd/KivyMD@master
+kivymd @ git+https://github.com/kivymd/KivyMD@5ff9d0d
 kivymd>=2.0.1.dev0
 bsdiff4>=1.2.4
 platformdirs>=4.2.2

From 795d55c6b4c574eb6faf86ce6525c82befe78688 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 27 Nov 2024 21:41:00 -0600
Subject: [PATCH 37/46] init work for popup

---
 Launcher.py | 106 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 31 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index ec4d3ac99f4c..091b3e0f79f3 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -20,7 +20,8 @@
 import webbrowser
 from os.path import isfile
 from shutil import which
-from typing import Callable, Optional, Sequence, Tuple, Union
+from typing import Callable, Optional, Sequence, Tuple, Union, Any
+
 
 if __name__ == "__main__":
     import ModuleUpdate
@@ -114,7 +115,7 @@ def handle_uri(path: str, launch_args: Tuple[str, ...]) -> None:
     url = urllib.parse.urlparse(path)
     queries = urllib.parse.parse_qs(url.query)
     launch_args = (path, *launch_args)
-    client_component = None
+    client_component = []
     text_client_component = None
     if "game" in queries:
         game = queries["game"][0]
@@ -122,11 +123,15 @@ def handle_uri(path: str, launch_args: Tuple[str, ...]) -> None:
         game = "Archipelago"
     for component in components:
         if component.supports_uri and component.game_name == game:
-            client_component = component
+            client_component.append(component)
         elif component.display_name == "Text Client":
             text_client_component = component
 
-    from kvui import MDApp, MDButton, MDBoxLayout, MDLabel, Clock, Window
+    from kvui import MDApp, MDButton, MDButtonText, MDBoxLayout, MDLabel, Clock, Window
+    from kivymd.uix.dialog import (MDDialog, MDDialogIcon, MDDialogHeadlineText,
+                                   MDDialogContentContainer, MDDialogSupportingText)
+    from kivymd.uix.list import MDListItem, MDListItemLeadingIcon, MDListItemSupportingText
+    from kivymd.uix.divider import MDDivider
 
     class Popup(MDApp):
         timer_label: MDLabel
@@ -152,13 +157,13 @@ def build(self):
                 button_row = MDBoxLayout(orientation="horizontal", size_hint=(1, 0.4))
 
                 text_client_button = MDButton(
-                    text=text_client_component.display_name,
+                    MDButtonText(text_client_component.display_name),
                     on_release=lambda *args: run_component(text_client_component, *launch_args)
                 )
                 button_row.add_widget(text_client_button)
 
                 game_client_button = MDButton(
-                    text=client_component.display_name,
+                    MDButtonText(client_component.display_name),
                     on_release=lambda *args: run_component(client_component, *launch_args)
                 )
                 button_row.add_widget(game_client_button)
@@ -167,26 +172,58 @@ def build(self):
 
             return layout
 
-        def update_label(self, dt):
-            if self.remaining_time > 1:
+        def _stop(self, *largs):
+            # see run_gui Launcher _stop comment for details
+            self.root_window.close()
+            super()._stop(*largs)
+
+    # Popup().run()
+
+    if not client_component:
+        popup_text = MDDialogSupportingText(text=(f"A game client able to parse URIs was not detected for {game}.\n"
+                              f"Launching Text Client in 7 seconds..."))
+        popup_text.remaining_time = 7
+
+        def update_label(dt):
+            if popup_text.remaining_time > 1:
                 # countdown the timer and string replace the number
-                self.remaining_time -= 1
-                self.timer_label.text = self.timer_label.text.replace(
-                    str(self.remaining_time + 1), str(self.remaining_time)
+                popup_text.remaining_time -= 1
+                popup_text.text = popup_text.text.replace(
+                    str(popup_text.remaining_time + 1), str(popup_text.remaining_time)
                 )
             else:
                 # our timer is finished so launch text client and close down
                 run_component(text_client_component, *launch_args)
-                Clock.unschedule(self.update_label)
+                Clock.unschedule(update_label)
                 MDApp.get_running_app().stop()
                 Window.close()
 
-        def _stop(self, *largs):
-            # see run_gui Launcher _stop comment for details
-            self.root_window.close()
-            super()._stop(*largs)
+        Clock.schedule_interval(update_label, 1)
+
+        component_buttons = []
+    else:
+        popup_text = MDDialogSupportingText(text="Select client to open and connect with."),
+        component_buttons = [MDDivider()]
+        for component in [text_client_component, *client_component]:
+            component_buttons.append(MDButton(
+                MDButtonText(text=component.display_name),
+                on_release= lambda *args, comp=component: run_component(comp, *launch_args),
+                style="text"
+            ))
+        component_buttons.append(MDDivider())
 
-    Popup().run()
+    MDDialog(
+        # Headline
+        MDDialogHeadlineText(text="Connect to Multiworld"),
+        # Text
+        popup_text,
+        # Content
+        MDDialogContentContainer(
+            *component_buttons,
+            orientation="vertical"
+        ),
+
+    ).open()
 
 
 def identify(path: Union[None, str]) -> Tuple[Union[None, str], Union[None, Component]]:
@@ -255,7 +292,7 @@ def create_shortcut(button, component: Component):
 refresh_components: Optional[Callable[[], None]] = None
 
 
-def run_gui():
+def run_gui(path: str, args: Any):
     from kvui import (MDApp, MDFloatLayout, MDGridLayout, MDButton, MDLabel, MDButtonText, MDButtonIcon, ScrollBox,
                       ContainerLayout, Widget, MDBoxLayout)
     from kivy.core.window import Window
@@ -276,11 +313,13 @@ class Launcher(MDApp):
         grid: MDGridLayout
         button_layout: Optional[ScrollBox] = None
 
-        def __init__(self, ctx=None):
+        def __init__(self, ctx=None, path=None, args=None):
             self.title = self.base_title + " " + Utils.__version__
             self.ctx = ctx
             self.icon = r"data/icon.png"
             self.favorites = []
+            self.launch_uri = path
+            self.launch_args = args
             persistent = Utils.persistent_load()
             if "launcher" in persistent:
                 if "favorites" in persistent["launcher"]:
@@ -395,6 +434,7 @@ def build(self):
             self.button_layout = ScrollBox()
             self.button_layout.layout.orientation = "vertical"
             self.button_layout.layout.spacing = 10
+            self.button_layout.scroll_wheel_distance = 40
             self.grid.add_widget(self.button_layout)
             self.grid.padding = 10
             self.grid.spacing = 5
@@ -446,6 +486,12 @@ def filter_clients(caller):
 
             return self.top_screen
 
+        def on_start(self):
+            if self.launch_uri:
+                handle_uri(self.launch_uri, self.launch_args)
+                self.launch_uri = None
+                self.launch_args = None
+
         @staticmethod
         def component_action(button):
             MDSnackbar(MDSnackbarText(text="Opening in a new window..."), y=dp(24), pos_hint={"center_x": 0.5},
@@ -473,7 +519,7 @@ def on_stop(self):
             Utils.persistent_store("launcher", "favorites", self.favorites)
             super().on_stop()
 
-    Launcher().run()
+    Launcher(path=path, args=args).run()
 
     # avoiding Launcher reference leak
     # and don't try to do something with widgets after window closed
@@ -500,16 +546,14 @@ def main(args: Optional[Union[argparse.Namespace, dict]] = None):
 
     path = args.get("Patch|Game|Component|url", None)
     if path is not None:
-        if path.startswith("archipelago://"):
-            handle_uri(path, args.get("args", ()))
-            return
-        file, component = identify(path)
-        if file:
-            args['file'] = file
-        if component:
-            args['component'] = component
-        if not component:
-            logging.warning(f"Could not identify Component responsible for {path}")
+        if not path.startswith("archipelago://"):
+            file, component = identify(path)
+            if file:
+                args['file'] = file
+            if component:
+                args['component'] = component
+            if not component:
+                logging.warning(f"Could not identify Component responsible for {path}")
 
     if args["update_settings"]:
         update_settings()
@@ -518,7 +562,7 @@ def main(args: Optional[Union[argparse.Namespace, dict]] = None):
     elif "component" in args:
         run_component(args["component"], *args["args"])
     elif not args["update_settings"]:
-        run_gui()
+        run_gui(path, args.get("args", ()))
 
 
 if __name__ == '__main__':

From 70a5035a66f2d9ec0480a728fe70f3b15470aae6 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 27 Nov 2024 21:50:29 -0600
Subject: [PATCH 38/46] Update Launcher.py

---
 Launcher.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 091b3e0f79f3..fc3a2aa05fdd 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -180,8 +180,8 @@ def _stop(self, *largs):
     # Popup().run()
 
     if not client_component:
-        popup_text = MDDialogSupportingText(text=(f"A game client able to parse URIs was not detected for {game}.\n"
-                              f"Launching Text Client in 7 seconds..."))
+        popup_text = MDDialogSupportingText(text=f"A game client able to parse URIs was not detected for {game}.\n"
+                              f"Launching Text Client in 7 seconds...")
         popup_text.remaining_time = 7
 
         def update_label(dt):
@@ -202,7 +202,7 @@ def update_label(dt):
 
         component_buttons = []
     else:
-        popup_text = MDDialogSupportingText(text="Select client to open and connect with."),
+        popup_text = MDDialogSupportingText(text="Select client to open and connect with.")
         component_buttons = [MDDivider()]
         for component in [text_client_component, *client_component]:
             component_buttons.append(MDButton(

From 137559cb9a366a5b852e61e47f8ae868c495df39 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 27 Nov 2024 21:58:04 -0600
Subject: [PATCH 39/46] cleanup

---
 Launcher.py | 54 +++--------------------------------------------------
 1 file changed, 3 insertions(+), 51 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index fc3a2aa05fdd..a2d75a7e840e 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -127,58 +127,10 @@ def handle_uri(path: str, launch_args: Tuple[str, ...]) -> None:
         elif component.display_name == "Text Client":
             text_client_component = component
 
-    from kvui import MDApp, MDButton, MDButtonText, MDBoxLayout, MDLabel, Clock, Window
-    from kivymd.uix.dialog import (MDDialog, MDDialogIcon, MDDialogHeadlineText,
-                                   MDDialogContentContainer, MDDialogSupportingText)
-    from kivymd.uix.list import MDListItem, MDListItemLeadingIcon, MDListItemSupportingText
+    from kvui import MDApp, MDButton, MDButtonText, Clock, Window
+    from kivymd.uix.dialog import MDDialog, MDDialogHeadlineText, MDDialogContentContainer, MDDialogSupportingText
     from kivymd.uix.divider import MDDivider
 
-    class Popup(MDApp):
-        timer_label: MDLabel
-        remaining_time: Optional[int]
-
-        def __init__(self):
-            self.title = "Connect to Multiworld"
-            self.icon = r"data/icon.png"
-            super().__init__()
-
-        def build(self):
-            layout = MDBoxLayout(orientation="vertical")
-
-            if client_component is None:
-                self.remaining_time = 7
-                label_text = (f"A game client able to parse URIs was not detected for {game}.\n"
-                              f"Launching Text Client in 7 seconds...")
-                self.timer_label = MDLabel(text=label_text)
-                layout.add_widget(self.timer_label)
-                Clock.schedule_interval(self.update_label, 1)
-            else:
-                layout.add_widget(MDLabel(text="Select client to open and connect with."))
-                button_row = MDBoxLayout(orientation="horizontal", size_hint=(1, 0.4))
-
-                text_client_button = MDButton(
-                    MDButtonText(text_client_component.display_name),
-                    on_release=lambda *args: run_component(text_client_component, *launch_args)
-                )
-                button_row.add_widget(text_client_button)
-
-                game_client_button = MDButton(
-                    MDButtonText(client_component.display_name),
-                    on_release=lambda *args: run_component(client_component, *launch_args)
-                )
-                button_row.add_widget(game_client_button)
-
-                layout.add_widget(button_row)
-
-            return layout
-
-        def _stop(self, *largs):
-            # see run_gui Launcher _stop comment for details
-            self.root_window.close()
-            super()._stop(*largs)
-
-    # Popup().run()
-
     if not client_component:
         popup_text = MDDialogSupportingText(text=f"A game client able to parse URIs was not detected for {game}.\n"
                               f"Launching Text Client in 7 seconds...")
@@ -189,7 +141,7 @@ def update_label(dt):
                 # countdown the timer and string replace the number
                 popup_text.remaining_time -= 1
                 popup_text.text = popup_text.text.replace(
-                    str(popup_text.remaining_time + 1), str(popup_text.remaining_time)
+                    f"{popup_text.remaining_time + 1} seconds", f"{popup_text.remaining_time} seconds"
                 )
             else:
                 # our timer is finished so launch text client and close down

From d8da0eefad3ef9f0e01b5214c2f55dfc39a4da2a Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 27 Nov 2024 22:29:09 -0600
Subject: [PATCH 40/46] Update Launcher.py

---
 Launcher.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index a2d75a7e840e..7cc0bc67f0b0 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -140,9 +140,8 @@ def update_label(dt):
             if popup_text.remaining_time > 1:
                 # countdown the timer and string replace the number
                 popup_text.remaining_time -= 1
-                popup_text.text = popup_text.text.replace(
-                    f"{popup_text.remaining_time + 1} seconds", f"{popup_text.remaining_time} seconds"
-                )
+                popup_text.text = f"A game client able to parse URIs was not detected for {game}.\n"\
+                              f"Launching Text Client in {popup_text.remaining_time} seconds..."
             else:
                 # our timer is finished so launch text client and close down
                 run_component(text_client_component, *launch_args)

From ca161842eacb9a33588bb0ff3730e94177a88168 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 27 Nov 2024 23:25:31 -0600
Subject: [PATCH 41/46] remove fix_heights for good

---
 kvui.py | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/kvui.py b/kvui.py
index 29715fedd3c1..6c3efc6a465d 100644
--- a/kvui.py
+++ b/kvui.py
@@ -331,6 +331,10 @@ def refresh_view_attrs(self, rv, index, data):
         return super(SelectableLabel, self).refresh_view_attrs(
             rv, index, data)
 
+    def refresh_view_layout(self, rv, index, layout, viewport):
+        super(SelectableLabel, self).refresh_view_layout(rv, index, layout, viewport)
+        self.height = self.texture_size[1]
+
     def on_size(self, instance_label, size: list) -> None:
         super().on_size(instance_label, size)
         if self.parent:
@@ -390,9 +394,12 @@ def refresh_view_attrs(self, rv, index, data):
         self.location_text = data["location"]["text"]
         self.entrance_text = data["entrance"]["text"]
         self.found_text = data["found"]["text"]
-        self.height = self.minimum_height
         return super(HintLabel, self).refresh_view_attrs(rv, index, data)
 
+    def refresh_view_layout(self, rv, index, layout, viewport):
+        super(HintLabel, self).refresh_view_layout(rv, index, layout, viewport)
+        self.set_height(self, 0)
+
     def on_touch_down(self, touch):
         """ Add selection on touch down """
         if super(HintLabel, self).on_touch_down(touch):
@@ -672,9 +679,6 @@ def add_client_tab(self, title: str, content: Widget) -> Widget:
         return new_tab
 
     def update_texts(self, dt):
-        if hasattr(self.tabs.carousel.slides[0], "fix_heights"):
-            self.tabs.carousel.slides[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
-        # KIVYMDTODO: see if this bug exists in KivyMD
         if self.ctx.server:
             self.title = self.base_title + " " + Utils.__version__ + \
                          f" | Connected to: {self.ctx.server_address} " \
@@ -806,12 +810,6 @@ def clean_old(self):
         if len(self.data) > self.messages:
             self.data.pop(0)
 
-    def fix_heights(self):
-        """Workaround fix for divergent texture and layout heights"""
-        for element in self.children[0].children:
-            if element.height != element.texture_size[1]:
-                element.height = element.texture_size[1]
-
 
 class HintLog(MDRecycleView):
     header = {
@@ -823,7 +821,7 @@ class HintLog(MDRecycleView):
         "found": {"text": "[u]Status[/u]"},
         "striped": True,
     }
-
+    data: typing.List[typing.Any]
     sort_key: str = ""
     reversed: bool = False
 
@@ -867,12 +865,6 @@ def refresh_hints(self, hints):
     def hint_sorter(element: dict) -> str:
         return ""
 
-    def fix_heights(self):
-        """Workaround fix for divergent texture and layout heights"""
-        for element in self.children[0].children:
-            max_height = max(child.texture_size[1] for child in element.children)
-            element.height = max_height
-
 
 class E(ExceptionHandler):
     logger = logging.getLogger("Client")

From 5b0495576b4ee6339f90cf3fd4b9b82d801b969f Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 27 Nov 2024 23:41:31 -0600
Subject: [PATCH 42/46] re-enable content scroll

---
 Launcher.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Launcher.py b/Launcher.py
index 7cc0bc67f0b0..876debd8f867 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -386,6 +386,8 @@ def build(self):
             self.button_layout.layout.orientation = "vertical"
             self.button_layout.layout.spacing = 10
             self.button_layout.scroll_wheel_distance = 40
+            self.button_layout.do_scroll_x = False
+            self.button_layout.scroll_type = ["content", "bars"]
             self.grid.add_widget(self.button_layout)
             self.grid.padding = 10
             self.grid.spacing = 5

From d8b49fca4823505bd4ba1cdc7cf5e7737990d8b1 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 4 Dec 2024 21:53:40 -0600
Subject: [PATCH 43/46] Update kvui.py

---
 kvui.py | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/kvui.py b/kvui.py
index ea4cc9f7856a..e44e7f28f132 100644
--- a/kvui.py
+++ b/kvui.py
@@ -59,6 +59,8 @@
 from kivymd.uix.floatlayout import MDFloatLayout
 from kivymd.uix.boxlayout import MDBoxLayout
 from kivymd.uix.tab.tab import MDTabsPrimary, MDTabsItem, MDTabsItemText, MDTabsCarousel
+from kivymd.uix.menu import MDDropdownMenu
+from kivymd.uix.dropdownitem import MDDropDownItem, MDDropDownItemText
 from kivymd.uix.button import MDButton, MDButtonText, MDButtonIcon, MDIconButton
 from kivymd.uix.label import MDLabel, MDIcon
 from kivymd.uix.recycleview import MDRecycleView
@@ -368,13 +370,17 @@ def apply_selection(self, rv, index, is_selected):
         """ Respond to the selection of items in the view. """
         self.selected = is_selected
 
-
+status_icons = {
+    HintStatus.HINT_NO_PRIORITY: "information",
+    HintStatus.HINT_PRIORITY: "exclamation-thick",
+    HintStatus.HINT_AVOID: "alert"
+}
 
 class HintLabel(RecycleDataViewBehavior, MDBoxLayout):
     selected = BooleanProperty(False)
     striped = BooleanProperty(False)
     index = None
-    dropdown: DropDown
+    dropdown: MDDropdownMenu
 
     def __init__(self):
         super(HintLabel, self).__init__()
@@ -385,29 +391,28 @@ def __init__(self):
         self.entrance_text = ""
         self.status_text = ""
         self.hint = {}
-        for child in self.children:
-            child.bind(texture_size=self.set_height)
-
 
         ctx = MDApp.get_running_app().ctx
-        self.dropdown = DropDown()
+        menu_items = []
+
+        for status in (HintStatus.HINT_NO_PRIORITY, HintStatus.HINT_PRIORITY, HintStatus.HINT_AVOID):
+            name = status_names[status]
+            status_button = MDDropDownItem(MDDropDownItemText(text=name), size_hint_y=None, height=dp(50))
+            status_button.status = status
+            menu_items.append({
+                "text": name,
+                "leading_icon": status_icons[status],
+                "on_release": lambda x=status: select(self, x)
+            })
 
-        def set_value(button):
-            self.dropdown.select(button.status)
+        self.dropdown = MDDropdownMenu(caller=self.ids["status"], items=menu_items)
 
         def select(instance, data):
             ctx.update_hint(self.hint["location"],
                             self.hint["finding_player"],
                             data)
 
-        for status in (HintStatus.HINT_NO_PRIORITY, HintStatus.HINT_PRIORITY, HintStatus.HINT_AVOID):
-            name = status_names[status]
-            status_button = Button(text=name, size_hint_y=None, height=dp(50))
-            status_button.status = status
-            status_button.bind(on_release=set_value)
-            self.dropdown.add_widget(status_button)
-
-        self.dropdown.bind(on_select=select)
+        self.dropdown.bind(on_release=self.dropdown.dismiss)
 
     def set_height(self, instance, value):
         self.height = max([child.texture_size[1] for child in self.children])
@@ -426,7 +431,6 @@ def refresh_view_attrs(self, rv, index, data):
 
     def refresh_view_layout(self, rv, index, layout, viewport):
         super(HintLabel, self).refresh_view_layout(rv, index, layout, viewport)
-        self.set_height(self, 0)
 
     def on_touch_down(self, touch):
         """ Add selection on touch down """
@@ -441,7 +445,7 @@ def on_touch_down(self, touch):
                     ctx = MDApp.get_running_app().ctx
                     if ctx.slot == self.hint["receiving_player"]:  # If this player owns this hint
                         # open a dropdown
-                        self.dropdown.open(self.ids["status"])
+                        self.dropdown.open()
                 elif self.selected:
                     self.parent.clear_selection()
                 else:

From 9e6e1946966bd9f280f0d1f17154dfa9f3653d67 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 4 Dec 2024 21:55:13 -0600
Subject: [PATCH 44/46] revert fix_heights removal for now

---
 kvui.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/kvui.py b/kvui.py
index e44e7f28f132..f7a995baf6ce 100644
--- a/kvui.py
+++ b/kvui.py
@@ -337,10 +337,6 @@ def refresh_view_attrs(self, rv, index, data):
         return super(SelectableLabel, self).refresh_view_attrs(
             rv, index, data)
 
-    def refresh_view_layout(self, rv, index, layout, viewport):
-        super(SelectableLabel, self).refresh_view_layout(rv, index, layout, viewport)
-        self.height = self.texture_size[1]
-
     def on_size(self, instance_label, size: list) -> None:
         super().on_size(instance_label, size)
         if self.parent:
@@ -427,11 +423,9 @@ def refresh_view_attrs(self, rv, index, data):
         self.entrance_text = data["entrance"]["text"]
         self.status_text = data["status"]["text"]
         self.hint = data["status"]["hint"]
+        self.height = self.minimum_height
         return super(HintLabel, self).refresh_view_attrs(rv, index, data)
 
-    def refresh_view_layout(self, rv, index, layout, viewport):
-        super(HintLabel, self).refresh_view_layout(rv, index, layout, viewport)
-
     def on_touch_down(self, touch):
         """ Add selection on touch down """
         if super(HintLabel, self).on_touch_down(touch):
@@ -717,6 +711,9 @@ def add_client_tab(self, title: str, content: Widget) -> Widget:
         return new_tab
 
     def update_texts(self, dt):
+        if hasattr(self.tabs.carousel.slides[0], "fix_heights"):
+            self.tabs.carousel.slides[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
+        # KIVYMDTODO: see if this bug exists in KivyMD
         if self.ctx.server:
             self.title = self.base_title + " " + Utils.__version__ + \
                          f" | Connected to: {self.ctx.server_address} " \
@@ -848,6 +845,12 @@ def clean_old(self):
         if len(self.data) > self.messages:
             self.data.pop(0)
 
+    def fix_heights(self):
+        """Workaround fix for divergent texture and layout heights"""
+        for element in self.children[0].children:
+            if element.height != element.texture_size[1]:
+                element.height = element.texture_size[1]
+
 
 
 status_names: typing.Dict[HintStatus, str] = {
@@ -966,6 +969,12 @@ def load_override(filename: str, default_load=_original_image_loader_load, **kwa
 
 ImageLoader.load = load_override
 
+    def fix_heights(self):
+        """Workaround fix for divergent texture and layout heights"""
+        for element in self.children[0].children:
+            max_height = max(child.texture_size[1] for child in element.children)
+            element.height = max_height
+
 
 class E(ExceptionHandler):
     logger = logging.getLogger("Client")

From 039af0f7936cbc6bba6dd83c6370911daf5074c2 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Wed, 4 Dec 2024 21:56:56 -0600
Subject: [PATCH 45/46] broken lol

---
 kvui.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kvui.py b/kvui.py
index f7a995baf6ce..8ccf259776aa 100644
--- a/kvui.py
+++ b/kvui.py
@@ -935,6 +935,12 @@ def refresh_hints(self, hints):
     def hint_sorter(element: dict) -> str:
         return element["status"]["hint"]["status"]  # By status by default
 
+    def fix_heights(self):
+        """Workaround fix for divergent texture and layout heights"""
+        for element in self.children[0].children:
+            max_height = max(child.texture_size[1] for child in element.children)
+            element.height = max_height
+
 
 class ApAsyncImage(AsyncImage):
     def is_uri(self, filename: str) -> bool:
@@ -969,12 +975,6 @@ def load_override(filename: str, default_load=_original_image_loader_load, **kwa
 
 ImageLoader.load = load_override
 
-    def fix_heights(self):
-        """Workaround fix for divergent texture and layout heights"""
-        for element in self.children[0].children:
-            max_height = max(child.texture_size[1] for child in element.children)
-            element.height = max_height
-
 
 class E(ExceptionHandler):
     logger = logging.getLogger("Client")

From 4d11f13078c3719264f6e87b99c4cdd78d13b1f2 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 5 Dec 2024 13:00:47 -0600
Subject: [PATCH 46/46] proper fix_heights fix

---
 kvui.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kvui.py b/kvui.py
index 8ccf259776aa..9e92371341f7 100644
--- a/kvui.py
+++ b/kvui.py
@@ -410,7 +410,7 @@ def select(instance, data):
 
         self.dropdown.bind(on_release=self.dropdown.dismiss)
 
-    def set_height(self, instance, value):
+    def set_height(self, _, _2):
         self.height = max([child.texture_size[1] for child in self.children])
 
     def refresh_view_attrs(self, rv, index, data):
@@ -423,7 +423,6 @@ def refresh_view_attrs(self, rv, index, data):
         self.entrance_text = data["entrance"]["text"]
         self.status_text = data["status"]["text"]
         self.hint = data["status"]["hint"]
-        self.height = self.minimum_height
         return super(HintLabel, self).refresh_view_attrs(rv, index, data)
 
     def on_touch_down(self, touch):
@@ -711,9 +710,9 @@ def add_client_tab(self, title: str, content: Widget) -> Widget:
         return new_tab
 
     def update_texts(self, dt):
-        if hasattr(self.tabs.carousel.slides[0], "fix_heights"):
-            self.tabs.carousel.slides[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
-        # KIVYMDTODO: see if this bug exists in KivyMD
+        for slide in self.tabs.carousel.slides:
+            if hasattr(slide, "fix_heights"):
+                slide.fix_heights()  # TODO: remove this when Kivy fixes this upstream
         if self.ctx.server:
             self.title = self.base_title + " " + Utils.__version__ + \
                          f" | Connected to: {self.ctx.server_address} " \