From a8b04bb72b211a8725bb2a92c8b03dddebe840b4 Mon Sep 17 00:00:00 2001
From: futile <git@futile.eu>
Date: Fri, 7 Nov 2025 00:34:42 +0000
Subject: [PATCH] move colour constants from `gui::colours` to
 `util::consts::colours`

---
 src/gui.rs         |  1 -
 src/gui/app.rs     |  7 +++++--
 src/gui/colours.rs | 16 ----------------
 src/util/consts.rs | 19 +++++++++++++++++++
 4 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 src/gui/colours.rs

diff --git a/src/gui.rs b/src/gui.rs
index c8804fa..8f775eb 100644
--- a/src/gui.rs
+++ b/src/gui.rs
@@ -1,5 +1,4 @@
 pub mod app;
-mod colours;
 mod debug;
 pub mod run;
 pub mod settings;
diff --git a/src/gui/app.rs b/src/gui/app.rs
index b2d7acc..16c9162 100644
--- a/src/gui/app.rs
+++ b/src/gui/app.rs
@@ -1,8 +1,11 @@
 use crate::{
     features,
-    gui::{colours, settings::Settings, tools, ui_ext::UiExt},
+    gui::{settings::Settings, tools, ui_ext::UiExt},
     util::{
-        consts::game::WINDOW_TITLE, persistent_state::PersistentState, system_info::SystemInfo, win,
+        consts::{colours, game::WINDOW_TITLE},
+        persistent_state::PersistentState,
+        system_info::SystemInfo,
+        win,
     },
 };
 use eframe::egui;
diff --git a/src/gui/colours.rs b/src/gui/colours.rs
deleted file mode 100644
index 56898c6..0000000
--- a/src/gui/colours.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use crate::features::game_networking::BlockedStatus;
-use eframe::egui;
-
-pub const RED: egui::Color32 = egui::Color32::from_rgb(255, 96, 96);
-pub const YELLOW: egui::Color32 = egui::Color32::from_rgb(255, 255, 96);
-pub const GREEN: egui::Color32 = egui::Color32::from_rgb(96, 255, 96);
-
-impl From<BlockedStatus> for egui::Color32 {
-    fn from(value: BlockedStatus) -> Self {
-        match value {
-            BlockedStatus::Blocked => RED,
-            BlockedStatus::Failed => YELLOW,
-            BlockedStatus::Unblocked => GREEN,
-        }
-    }
-}
diff --git a/src/util/consts.rs b/src/util/consts.rs
index 9bc5c0d..b8d0950 100644
--- a/src/util/consts.rs
+++ b/src/util/consts.rs
@@ -13,3 +13,22 @@ pub mod game {
     pub const EXE_LEGACY: &str = "GTA5.exe";
     pub const WINDOW_TITLE: &str = "Grand Theft Auto V";
 }
+
+pub mod colours {
+    use crate::features::game_networking::BlockedStatus;
+    use eframe::egui;
+
+    pub const RED: egui::Color32 = egui::Color32::from_rgb(255, 96, 96);
+    pub const YELLOW: egui::Color32 = egui::Color32::from_rgb(255, 255, 96);
+    pub const GREEN: egui::Color32 = egui::Color32::from_rgb(96, 255, 96);
+
+    impl From<BlockedStatus> for egui::Color32 {
+        fn from(value: BlockedStatus) -> Self {
+            match value {
+                BlockedStatus::Blocked => RED,
+                BlockedStatus::Failed => YELLOW,
+                BlockedStatus::Unblocked => GREEN,
+            }
+        }
+    }
+}