task-073

Co-authored-by: Joe Carstairs <jcarstairs@scottlogic.com>
Reviewed-on: https://git.joeac.net/joeac/schist/pulls/1
Co-authored-by: Joe Carstairs <me@joeac.net>
Co-committed-by: Joe Carstairs <me@joeac.net>

1 files changed, 14 insertions, 8 deletions

diff --git a/schist_desktop_gui/src/main.rs b/schist_desktop_gui/src/main.rs
index b836453..7e54ddb 100644
--- a/schist_desktop_gui/src/main.rs
+++ b/schist_desktop_gui/src/main.rs
@@ -1,18 +1,24 @@
 mod config;
-mod message;
+mod dummy_data;
+mod gui;
 mod settings;
-mod state;
+mod shortcut;
+mod style;
 mod theme;
+mod traits;
 mod window_settings;
-mod view;
 
-use crate::{config::Config, settings::make_settings, state::State, theme::make_theme, window_settings::make_window_settings, view::view};
+use crate::{
+    config::Config, gui::Gui, settings::make_settings, theme::make_theme,
+    window_settings::make_window_settings,
+};
 
 fn main() -> iced::Result {
     let config = Config::default();
-    iced::application("Schist", State::update, view)
+    iced::application("Schist", Gui::update, Gui::view)
         .settings(make_settings(&config.clone()))
-        .theme(|state: &State| make_theme(state))
+        .subscription(gui::subscription)
+        .theme(make_theme)
         .window(make_window_settings(&config.clone()))
-        .run()
-}
\ No newline at end of file
+        .run_with(Gui::new)
+}