work

src/bin/client/main.rs

@@ -1,25 +1,21 @@
 #![windows_subsystem = "windows"]
 
 use crate::{
+    data::ClientData,
     net::{NetHandle, NetSender},
-    rsc::{CLIENT_DATA, ClientData},
     state::{ClientState, LoggedIn, Login},
-    ui::*,
 };
 use iris::prelude::*;
-use openworm::{
-    net::{ClientMsg, ServerMsg, install_crypto_provider},
-    rsc::DataDir,
-};
+use openworm::net::{ClientMsg, ServerMsg, install_crypto_provider};
 use winit::{
     event::{ElementState, MouseButton, WindowEvent},
     window::WindowAttributes,
 };
 
 mod account;
+mod data;
 mod debug;
 mod net;
-mod rsc;
 mod state;
 mod ui;
 
@@ -31,7 +27,6 @@ fn main() {
 #[derive(DefaultUiState)]
 pub struct Client {
     ui_state: DefaultUiState,
-    dir: DataDir,
     data: ClientData,
     state: ClientState,
     main_ui: WeakWidget<WidgetPtr>,
@@ -55,7 +50,6 @@ impl DefaultAppState for Client {
         rsc: &mut DefaultRsc<Self>,
         proxy: Proxy<Self::Event>,
     ) -> Self {
-        let dir = DataDir::default();
         let notif = WidgetPtr::default().add(rsc);
         let main_ui = WidgetPtr::default().add(rsc);
         let bg = (
@@ -72,13 +66,12 @@ impl DefaultAppState for Client {
             .stack()
             .set_root(rsc, &mut ui_state);
 
-        start_ui(rsc).set_ptr(main_ui, rsc);
+        ui::start(rsc).set_ptr(main_ui, rsc);
 
         Self {
             ui_state,
-            data: dir.load(CLIENT_DATA),
+            data: ClientData::load(),
             state: Default::default(),
-            dir,
             main_ui,
             notif,
             proxy,
@@ -110,7 +103,7 @@ impl DefaultAppState for Client {
                     if let ClientState::LoggedIn(state) = &mut self.state
                         && let Some(msg_area) = state.channel
                     {
-                        let msg = msg_widget(&msg.user, &msg.content).add_strong(rsc);
+                        let msg = ui::msg_widget(&msg.user, &msg.content).add_strong(rsc);
                         rsc[msg_area].children.push(msg);
                     }
                 }
@@ -120,7 +113,7 @@ impl DefaultAppState for Client {
                     {
                         for msg in msgs {
                             state.msgs.push(msg.clone());
-                            let msg = msg_widget(&msg.user, &msg.content).add_strong(rsc);
+                            let msg = ui::msg_widget(&msg.user, &msg.content).add_strong(rsc);
                             rsc[msg_area].children.push(msg);
                         }
                     }
@@ -136,22 +129,22 @@ impl DefaultAppState for Client {
                         msgs: Vec::new(),
                         username,
                     });
-                    main_view(rsc).set_ptr(self.main_ui, rsc);
+                    ui::main_view(rsc).set_ptr(self.main_ui, rsc);
                 }
                 ServerMsg::Error(error) => {
                     let msg = format!("{error:?}");
-                    rsc[self.notif].inner = Some(werror(&msg, rsc));
+                    rsc[self.notif].inner = Some(ui::werror(&msg, rsc));
                 }
             },
             ClientEvent::Err(msg) => {
-                rsc[self.notif].inner = Some(werror(&msg, rsc));
+                rsc[self.notif].inner = Some(ui::werror(&msg, rsc));
             }
         }
     }
 
     fn exit(&mut self, _rsc: &mut DefaultRsc<Self>, _render: &mut UiRenderState) {
         self.state.exit();
-        self.dir.save(CLIENT_DATA, &self.data);
+        self.data.save();
     }
 
     fn window_event(