diff --git a/src/lib.rs b/src/lib.rs index d325585..b1e2058 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,7 +18,6 @@ pub mod login_manager; mod notecache; mod profile; pub mod relay_pool_manager; -pub mod relay_view; mod result; mod test_data; mod time; diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 7715548..e24e9c8 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,9 +1,11 @@ pub mod note; pub mod preview; +pub mod relay; pub mod username; pub use note::Note; pub use preview::{Preview, PreviewApp}; +pub use relay::RelayView; pub use username::Username; use egui::Margin; diff --git a/src/relay_view.rs b/src/ui/relay.rs similarity index 94% rename from src/relay_view.rs rename to src/ui/relay.rs index ae2fc6b..8d0a920 100644 --- a/src/relay_view.rs +++ b/src/ui/relay.rs @@ -117,10 +117,10 @@ fn add_relay_button() -> egui::Button<'static> { fn delete_button(dark_mode: bool) -> egui::Button<'static> { let img_data = if dark_mode { - egui::include_image!("../assets/icons/delete_icon_4x.png") + egui::include_image!("../../assets/icons/delete_icon_4x.png") } else { // TODO: use light delete icon - egui::include_image!("../assets/icons/delete_icon_4x.png") + egui::include_image!("../../assets/icons/delete_icon_4x.png") }; egui::Button::image(egui::Image::new(img_data).max_width(10.0)).frame(false) @@ -160,10 +160,12 @@ fn show_connection_status(ui: &mut Ui, status: &RelayStatus) { fn get_connection_icon(status: &RelayStatus) -> egui::Image<'static> { let img_data = match status { - RelayStatus::Connected => egui::include_image!("../assets/icons/connected_icon_4x.png"), - RelayStatus::Connecting => egui::include_image!("../assets/icons/connecting_icon_4x.png"), + RelayStatus::Connected => egui::include_image!("../../assets/icons/connected_icon_4x.png"), + RelayStatus::Connecting => { + egui::include_image!("../../assets/icons/connecting_icon_4x.png") + } RelayStatus::Disconnected => { - egui::include_image!("../assets/icons/disconnected_icon_4x.png") + egui::include_image!("../../assets/icons/disconnected_icon_4x.png") } };