From 27fc86bfe4840dc03b8f04a192257fbdc32ae442 Mon Sep 17 00:00:00 2001
From: CoCo_Sol <solois.corentin@gmail.com>
Date: Sun, 31 Mar 2024 23:13:53 +0000
Subject: [PATCH] Change oraganization of ui's programs (#94)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-on: https://git.tipragot.fr/fish-cannard/border-wars/pulls/94
Reviewed-by: Raphaël <r.lauray@outlook.fr>
Co-authored-by: CoCo_Sol <solois.corentin@gmail.com>
Co-committed-by: CoCo_Sol <solois.corentin@gmail.com>
---
 crates/border-wars/src/lib.rs                 |  3 +--
 crates/border-wars/src/main.rs                |  2 ++
 crates/border-wars/src/scenes/mod.rs          |  5 ++---
 crates/border-wars/src/{ => ui}/hover.rs      |  0
 crates/border-wars/src/ui/mod.rs              | 19 +++++++++++++++++++
 .../src/{ => ui}/responsive_scale.rs          |  0
 6 files changed, 24 insertions(+), 5 deletions(-)
 rename crates/border-wars/src/{ => ui}/hover.rs (100%)
 create mode 100644 crates/border-wars/src/ui/mod.rs
 rename crates/border-wars/src/{ => ui}/responsive_scale.rs (100%)

diff --git a/crates/border-wars/src/lib.rs b/crates/border-wars/src/lib.rs
index 726dfd0..16b1b2d 100644
--- a/crates/border-wars/src/lib.rs
+++ b/crates/border-wars/src/lib.rs
@@ -6,11 +6,10 @@ use networking::PlayerRank;
 use serde::{Deserialize, Serialize};
 
 pub mod camera;
-pub mod hover;
 pub mod map;
 pub mod networking;
-pub mod responsive_scale;
 pub mod scenes;
+pub mod ui;
 
 /// The current scene of the game.
 #[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs
index ea58352..8019933 100644
--- a/crates/border-wars/src/main.rs
+++ b/crates/border-wars/src/main.rs
@@ -7,6 +7,7 @@ use border_wars::map::renderer::RendererPlugin;
 use border_wars::map::selected_tile::SelectTilePlugin;
 use border_wars::networking::NetworkingPlugin;
 use border_wars::scenes::ScenesPlugin;
+use border_wars::ui::UiPlugin;
 
 fn main() {
     App::new()
@@ -17,5 +18,6 @@ fn main() {
         .add_plugins(SelectTilePlugin)
         .add_plugins(NetworkingPlugin)
         .add_plugins(MapGenerationPlugin)
+        .add_plugins(UiPlugin)
         .run();
 }
diff --git a/crates/border-wars/src/scenes/mod.rs b/crates/border-wars/src/scenes/mod.rs
index da18601..2a788fd 100644
--- a/crates/border-wars/src/scenes/mod.rs
+++ b/crates/border-wars/src/scenes/mod.rs
@@ -3,7 +3,7 @@
 use bevy::prelude::*;
 use bevy_egui::EguiPlugin;
 
-use crate::{responsive_scale, CurrentScene};
+use crate::CurrentScene;
 
 pub mod lobby;
 pub mod menu;
@@ -16,7 +16,6 @@ impl Plugin for ScenesPlugin {
         app.add_plugins(EguiPlugin)
             .add_state::<CurrentScene>()
             .add_plugins(menu::MenuPlugin)
-            .add_plugins(lobby::LobbyPlugin)
-            .add_plugins(responsive_scale::ResponsiveScalingPlugin);
+            .add_plugins(lobby::LobbyPlugin);
     }
 }
diff --git a/crates/border-wars/src/hover.rs b/crates/border-wars/src/ui/hover.rs
similarity index 100%
rename from crates/border-wars/src/hover.rs
rename to crates/border-wars/src/ui/hover.rs
diff --git a/crates/border-wars/src/ui/mod.rs b/crates/border-wars/src/ui/mod.rs
new file mode 100644
index 0000000..9b6dd27
--- /dev/null
+++ b/crates/border-wars/src/ui/mod.rs
@@ -0,0 +1,19 @@
+//! The file that contains the UI logic.
+
+pub mod hover;
+pub mod responsive_scale;
+
+use bevy::prelude::*;
+
+use self::hover::HoverPlugin;
+use self::responsive_scale::ResponsiveScalingPlugin;
+
+/// The plugin for the UI.
+pub struct UiPlugin;
+
+impl Plugin for UiPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins(HoverPlugin)
+            .add_plugins(ResponsiveScalingPlugin);
+    }
+}
diff --git a/crates/border-wars/src/responsive_scale.rs b/crates/border-wars/src/ui/responsive_scale.rs
similarity index 100%
rename from crates/border-wars/src/responsive_scale.rs
rename to crates/border-wars/src/ui/responsive_scale.rs