Build joystick.kv in VirtualJoystickWidget (#4)

* Simpler - just keep joystick in res/

* remove unused import

* Build joystick.kv in VirtualJoystickWidget

* rm comment

* Allow forwarding command line args from terminal

entry.sh

@@ -3,6 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 $DIR/bootstrap.sh $DIR $DIR/venv
 
-$DIR/venv/bin/python $DIR/src/main.py --camera-port 50051 --canbus-port 50060
+$DIR/venv/bin/python $DIR/src/main.py $@ --camera-port 50051 --canbus-port 50060
 
 exit 0

libs/virtual_joystick/joystick.py

@@ -22,6 +22,7 @@
 
 from kivy.clock import Clock  # noqa: E402
 from kivy.input.providers.mouse import MouseMotionEvent  # noqa: E402
+from kivy.lang.builder import Builder  # noqa: E402
 from kivy.uix.widget import Widget  # noqa: E402
 
 
@@ -34,6 +35,10 @@ def __init__(self, **kwargs) -> None:
         # Schedule the drawing of the joystick at 30 hz
         Clock.schedule_interval(self.draw_joystick, 1 / 30)
 
+        # Build the .kv file for this VirtualJoystickWidget
+        # This is so it is included when your app imports the VirtualJoystickWidget
+        Builder.load_file(os.path.join(os.path.dirname(__file__), "res/joystick.kv"))
+
     def on_touch_down(self, touch: MouseMotionEvent) -> None:
         """Overwrite kivy method that handles initial press with mouse click or touchscreen.
 

src/main.py

@@ -18,7 +18,6 @@
 from typing import Optional
 
 import grpc
-import virtual_joystick
 from farm_ng.canbus import canbus_pb2
 from farm_ng.canbus.canbus_client import CanbusClient
 from farm_ng.canbus.packet import AmigaControlState
@@ -77,9 +76,6 @@ def __init__(
         self.async_tasks: List[asyncio.Task] = []
 
     def build(self):
-        # Build the imported ``VirtualJoystickWidget`` .kv file first
-        Builder.load_file(os.path.dirname(virtual_joystick.__file__) + "/joystick.kv")
-        # Then build the App's .kv file (which references the VirtualJoystickWidget)
         return Builder.load_file("res/main.kv")
 
     def on_exit_btn(self) -> None: