From 4e7d168d223bd3b02363468b80c030dc02cc62dc Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Fri, 12 Apr 2024 16:16:19 -0700
Subject: [PATCH] refactor: rename widgets to ui

consolidate ui related things like widgets into our ui module

Signed-off-by: William Casarin <jb55@jb55.com>
---
 src/app.rs                           | 4 ++--
 src/lib.rs                           | 1 -
 src/{ui.rs => ui/mod.rs}             | 6 ++++++
 src/{widgets => ui}/note/contents.rs | 0
 src/{widgets => ui}/note/mod.rs      | 6 +++---
 src/{widgets => ui}/username.rs      | 0
 src/widgets/mod.rs                   | 5 -----
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{ui.rs => ui/mod.rs} (76%)
 rename src/{widgets => ui}/note/contents.rs (100%)
 rename src/{widgets => ui}/note/mod.rs (97%)
 rename src/{widgets => ui}/username.rs (100%)
 delete mode 100644 src/widgets/mod.rs

diff --git a/src/app.rs b/src/app.rs
index ca461c73..af56890b 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -5,7 +5,7 @@ use crate::frame_history::FrameHistory;
 use crate::imgcache::ImageCache;
 use crate::notecache::NoteCache;
 use crate::timeline;
-use crate::widgets;
+use crate::ui;
 use crate::Result;
 use egui::containers::scroll_area::ScrollBarVisibility;
 
@@ -522,7 +522,7 @@ fn render_notes(ui: &mut egui::Ui, damus: &mut Damus, timeline: usize) {
     let num_notes = damus.timelines[timeline].notes.len();
 
     for i in 0..num_notes {
-        let note = widgets::Note::new(damus, damus.timelines[timeline].notes[i].key, timeline);
+        let note = ui::Note::new(damus, damus.timelines[timeline].notes[i].key, timeline);
         ui.add(note);
         ui.add(egui::Separator::default().spacing(0.0));
     }
diff --git a/src/lib.rs b/src/lib.rs
index d93ef2cc..61c524b8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,6 @@ mod error;
 //mod note;
 //mod block;
 mod abbrev;
-mod widgets;
 mod fonts;
 mod images;
 mod result;
diff --git a/src/ui.rs b/src/ui/mod.rs
similarity index 76%
rename from src/ui.rs
rename to src/ui/mod.rs
index ef05058d..9b2e0396 100644
--- a/src/ui.rs
+++ b/src/ui/mod.rs
@@ -1,3 +1,9 @@
+pub mod note;
+pub mod username;
+
+pub use note::Note;
+pub use username::Username;
+
 use egui::Margin;
 
 pub fn padding<R>(
diff --git a/src/widgets/note/contents.rs b/src/ui/note/contents.rs
similarity index 100%
rename from src/widgets/note/contents.rs
rename to src/ui/note/contents.rs
diff --git a/src/widgets/note/mod.rs b/src/ui/note/mod.rs
similarity index 97%
rename from src/widgets/note/mod.rs
rename to src/ui/note/mod.rs
index 78a84404..26057103 100644
--- a/src/widgets/note/mod.rs
+++ b/src/ui/note/mod.rs
@@ -1,7 +1,7 @@
 pub mod contents;
 pub use contents::NoteContents;
 
-use crate::{widgets, Damus};
+use crate::{ui, Damus};
 use egui::{Color32, Label, RichText, Sense, TextureHandle, Vec2};
 use nostrdb::{NoteKey, Transaction};
 
@@ -65,7 +65,7 @@ impl<'a> Note<'a> {
                     ui.allocate_rect(rect, Sense::hover());
                     ui.put(rect, |ui: &mut egui::Ui| {
                         ui.add(
-                            widgets::Username::new(profile.as_ref().ok(), note.pubkey())
+                            ui::Username::new(profile.as_ref().ok(), note.pubkey())
                                 .abbreviated(8)
                                 .pk_colored(true),
                         )
@@ -114,7 +114,7 @@ impl<'a> Note<'a> {
                         ui.horizontal(|ui| {
                             ui.spacing_mut().item_spacing.x = 2.0;
                             ui.add(
-                                widgets::Username::new(profile.as_ref().ok(), note.pubkey())
+                                ui::Username::new(profile.as_ref().ok(), note.pubkey())
                                     .abbreviated(20),
                             );
 
diff --git a/src/widgets/username.rs b/src/ui/username.rs
similarity index 100%
rename from src/widgets/username.rs
rename to src/ui/username.rs
diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
deleted file mode 100644
index f79f26e7..00000000
--- a/src/widgets/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod note;
-pub mod username;
-
-pub use note::Note;
-pub use username::Username;