chore: project structure

Cargo.toml

@@ -1,9 +1,8 @@
 [workspace]
 resolver = "2"
 members = [
-    "crates/source_gui",
-    "crates/rune_ui",
     "crates/app",
+    "crates/gui",
     "crates/lcu",
 ]
 

crates/app/Cargo.toml

@@ -7,8 +7,7 @@ edition = "2021"
 
 [dependencies]
 tokio = { version = "1", features = ["full"] }
-source_gui = { path = "../source_gui" }
-rune_ui = { path = "../rune_ui" }
+gui = { path = "../gui" }
 futures = "0.3.28"
 eframe = { version = "0.25.0", features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO

crates/app/src/main.rs

@@ -7,6 +7,6 @@
 async fn main() -> Result<(), eframe::Error> {
     femme::with_level(femme::LevelFilter::Info);
 
-    source_gui::run().await?;
+    gui::run().await?;
     Ok(())
 }

crates/source_gui/Cargo.toml → crates/gui/Cargo.toml

@@ -1,12 +1,11 @@
 [package]
-name = "source_gui"
+name = "gui"
 version = "0.1.0"
 edition = "2021"
 build = "build.rs"
 
 [dependencies]
 lcu = { path = "../lcu" }
-rune_ui = { path = "../rune_ui" }
 anyhow = "1.0.71"
 bytes = "*"
 base64 = "0.21.0"
@@ -28,7 +27,6 @@ rand = "0.8.5"
 eframe = { version = "0.25.0", features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = "0.10.0"
 egui_extras = { version = "0.25.0", features = ["all_loaders"] }
 poll-promise = { version = "0.3.0", features = ["tokio"] }
 kv-log-macro = "1.0.7"

crates/source_gui/src/lib.rs → crates/gui/src/lib.rs

@@ -1,12 +1,13 @@
 use std::sync::{Arc, Mutex, RwLock};
 
+use crate::ui::setup_custom_fonts;
 use eframe::egui;
 use eframe::egui::IconData;
 use lcu::{cmd::CommandLineOutput, task};
-use crate::ui::setup_custom_fonts;
 
 pub mod config;
-mod toogle_ui;
+pub mod rune_viewport;
+pub mod toggle_ui;
 pub mod ui;
 
 pub async fn run() -> Result<(), eframe::Error> {
@@ -29,7 +30,9 @@ pub async fn run() -> Result<(), eframe::Error> {
 
     let app_icon = load_icon_data(include_bytes!("../../../assets/icon@2x_r.png"));
     let main_win_opts = eframe::NativeOptions {
-        viewport: egui::ViewportBuilder::default().with_inner_size([300., 480.]).with_icon(app_icon),
+        viewport: egui::ViewportBuilder::default()
+            .with_inner_size([300., 480.])
+            .with_icon(app_icon),
         persist_window: true,
         ..Default::default()
     };

crates/source_gui/src/ui.rs → crates/gui/src/ui.rs

@@ -1,5 +1,4 @@
 use futures::future::join_all;
-use rune_ui::viewport::{render_runes_ui, RuneUIState};
 
 use std::sync::{
     atomic::{AtomicBool, Ordering},
@@ -17,7 +16,10 @@ use lcu::{
     web::{self},
 };
 
-use crate::toogle_ui;
+use crate::{
+    rune_viewport::{render_runes_ui, RuneUIState},
+    toggle_ui,
+};
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Default)]
@@ -265,7 +267,7 @@ impl eframe::App for SourceWindow {
                     let random_mode = self.random_mode.clone();
                     ui.horizontal(|ui| {
                         ui.label("Random mode");
-                        toogle_ui::make_toggle(ui, &mut random_mode.lock().unwrap());
+                        toggle_ui::make_toggle(ui, &mut random_mode.lock().unwrap());
                     });
                 }
             } else {