[fractal/fractal-next] content: Move room-history to it's own module



commit a5a484be8aa365a54fd47800c5fa43c1b7649de9
Author: Julian Sparber <julian sparber net>
Date:   Tue Nov 30 11:59:36 2021 +0100

    content: Move room-history to it's own module

 po/POTFILES.in                                           | 16 ++++++++--------
 src/meson.build                                          | 16 ++++++++--------
 src/session/content/mod.rs                               |  7 -------
 src/session/content/{ => room_history}/divider_row.rs    |  0
 src/session/content/{ => room_history}/item_row.rs       |  2 +-
 .../content/{ => room_history}/message_row/file.rs       |  0
 .../content/{ => room_history}/message_row/image.rs      |  0
 .../content/{ => room_history}/message_row/mod.rs        |  0
 .../content/{ => room_history}/message_row/text.rs       |  0
 .../content/{room_history.rs => room_history/mod.rs}     | 11 ++++++++++-
 src/session/content/{ => room_history}/state_row.rs      |  0
 11 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 728fcbc8..3f25f606 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,19 +73,19 @@ src/session/account_settings/mod.rs
 src/session/categories/category.rs
 src/session/categories/category_type.rs
 src/session/categories/mod.rs
-src/session/content/divider_row.rs
-src/session/content/item_row.rs
 src/session/content/invite.rs
 src/session/content/markdown_popover.rs
-src/session/content/message_row/file.rs
-src/session/content/message_row/image.rs
-src/session/content/message_row/mod.rs
-src/session/content/message_row/text.rs
 src/session/content/mod.rs
 src/session/content/room_details/member_page.rs
 src/session/content/room_details/mod.rs
-src/session/content/room_history.rs
-src/session/content/state_row.rs
+src/session/content/room_history/divider_row.rs
+src/session/content/room_history/item_row.rs
+src/session/content/room_history/message_row/file.rs
+src/session/content/room_history/message_row/image.rs
+src/session/content/room_history/message_row/mod.rs
+src/session/content/room_history/message_row/text.rs
+src/session/content/room_history/mod.rs
+src/session/content/room_history/state_row.rs
 src/session/mod.rs
 src/session/room_creation/mod.rs
 src/session/room_list.rs
diff --git a/src/meson.build b/src/meson.build
index 826590c8..d3ccd1cd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -54,23 +54,23 @@ sources = files(
   'session/account_settings/mod.rs',
   'session/user.rs',
   'session/mod.rs',
-  'session/content/divider_row.rs',
   'session/content/explore/mod.rs',
   'session/content/explore/public_room.rs',
   'session/content/explore/public_room_list.rs',
   'session/content/explore/public_room_row.rs',
-  'session/content/item_row.rs',
   'session/content/invite.rs',
   'session/content/markdown_popover.rs',
-  'session/content/message_row/file.rs',
-  'session/content/message_row/image.rs',
-  'session/content/message_row/mod.rs',
-  'session/content/message_row/text.rs',
+  'session/content/room_history/divider_row.rs',
+  'session/content/room_history/item_row.rs',
+  'session/content/room_history/message_row/file.rs',
+  'session/content/room_history/message_row/image.rs',
+  'session/content/room_history/message_row/mod.rs',
+  'session/content/room_history/message_row/text.rs',
+  'session/content/room_history/mod.rs',
+  'session/content/room_history/state_row.rs',
   'session/content/mod.rs',
-  'session/content/room_history.rs',
   'session/content/room_details/member_page.rs',
   'session/content/room_details/mod.rs',
-  'session/content/state_row.rs',
   'session/room/event.rs',
   'session/room/highlight_flags.rs',
   'session/room/item.rs',
diff --git a/src/session/content/mod.rs b/src/session/content/mod.rs
index 69b6e69b..bef5ea22 100644
--- a/src/session/content/mod.rs
+++ b/src/session/content/mod.rs
@@ -1,21 +1,14 @@
-mod divider_row;
 mod explore;
 mod invite;
-mod item_row;
 mod markdown_popover;
-mod message_row;
 mod room_details;
 mod room_history;
-mod state_row;
 
-use self::divider_row::DividerRow;
 use self::explore::Explore;
 use self::invite::Invite;
-use self::item_row::ItemRow;
 use self::markdown_popover::MarkdownPopover;
 use self::room_details::RoomDetails;
 use self::room_history::RoomHistory;
-use self::state_row::StateRow;
 use crate::session::sidebar::{Entry, EntryType};
 
 use crate::session::verification::{IdentityVerification, IncomingVerification, VerificationMode};
diff --git a/src/session/content/divider_row.rs b/src/session/content/room_history/divider_row.rs
similarity index 100%
rename from src/session/content/divider_row.rs
rename to src/session/content/room_history/divider_row.rs
diff --git a/src/session/content/item_row.rs b/src/session/content/room_history/item_row.rs
similarity index 99%
rename from src/session/content/item_row.rs
rename to src/session/content/room_history/item_row.rs
index 1d6a7c43..8b013544 100644
--- a/src/session/content/item_row.rs
+++ b/src/session/content/room_history/item_row.rs
@@ -8,7 +8,7 @@ use matrix_sdk::ruma::events::{
 
 use crate::components::{ContextMenuBin, ContextMenuBinExt, ContextMenuBinImpl};
 use crate::matrix_error::UserFacingError;
-use crate::session::content::{message_row::MessageRow, DividerRow, StateRow};
+use crate::session::content::room_history::{message_row::MessageRow, DividerRow, StateRow};
 use crate::session::event_source_dialog::EventSourceDialog;
 use crate::session::room::{Event, Item, ItemType};
 use crate::utils::cache_dir;
diff --git a/src/session/content/message_row/file.rs b/src/session/content/room_history/message_row/file.rs
similarity index 100%
rename from src/session/content/message_row/file.rs
rename to src/session/content/room_history/message_row/file.rs
diff --git a/src/session/content/message_row/image.rs b/src/session/content/room_history/message_row/image.rs
similarity index 100%
rename from src/session/content/message_row/image.rs
rename to src/session/content/room_history/message_row/image.rs
diff --git a/src/session/content/message_row/mod.rs b/src/session/content/room_history/message_row/mod.rs
similarity index 100%
rename from src/session/content/message_row/mod.rs
rename to src/session/content/room_history/message_row/mod.rs
diff --git a/src/session/content/message_row/text.rs b/src/session/content/room_history/message_row/text.rs
similarity index 100%
rename from src/session/content/message_row/text.rs
rename to src/session/content/room_history/message_row/text.rs
diff --git a/src/session/content/room_history.rs b/src/session/content/room_history/mod.rs
similarity index 98%
rename from src/session/content/room_history.rs
rename to src/session/content/room_history/mod.rs
index ed51e4c2..715b9d08 100644
--- a/src/session/content/room_history.rs
+++ b/src/session/content/room_history/mod.rs
@@ -1,3 +1,12 @@
+mod divider_row;
+mod item_row;
+mod message_row;
+mod state_row;
+
+use self::divider_row::DividerRow;
+use self::item_row::ItemRow;
+use self::state_row::StateRow;
+
 use adw::subclass::prelude::*;
 use gtk::{
     gdk, glib, glib::clone, glib::signal::Inhibit, prelude::*, subclass::prelude::*,
@@ -6,7 +15,7 @@ use gtk::{
 use sourceview::prelude::*;
 
 use crate::components::{CustomEntry, RoomTitle};
-use crate::session::content::{ItemRow, MarkdownPopover, RoomDetails};
+use crate::session::content::{MarkdownPopover, RoomDetails};
 use crate::session::room::{Room, RoomType};
 
 mod imp {
diff --git a/src/session/content/state_row.rs b/src/session/content/room_history/state_row.rs
similarity index 100%
rename from src/session/content/state_row.rs
rename to src/session/content/room_history/state_row.rs


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]