account-settings: Move to the root of the crate

It is not particularly associated to the session view so there is no
reason for it to be a submodule.

po/POTFILES.in

@@ -5,6 +5,30 @@ data/org.gnome.Fractal.gschema.xml.in
 data/org.gnome.Fractal.metainfo.xml.in.in
 
 src/account_chooser_dialog/mod.blp
+src/account_settings/encryption_page/import_export_keys_subpage.rs
+src/account_settings/encryption_page/import_export_keys_subpage.blp
+src/account_settings/encryption_page/mod.rs
+src/account_settings/encryption_page/mod.blp
+src/account_settings/general_page/change_password_subpage.rs
+src/account_settings/general_page/change_password_subpage.ui
+src/account_settings/general_page/deactivate_account_subpage.rs
+src/account_settings/general_page/deactivate_account_subpage.blp
+src/account_settings/general_page/log_out_subpage.rs
+src/account_settings/general_page/log_out_subpage.blp
+src/account_settings/general_page/mod.rs
+src/account_settings/general_page/mod.blp
+src/account_settings/mod.blp
+src/account_settings/notifications_page.rs
+src/account_settings/notifications_page.blp
+src/account_settings/safety_page/ignored_users_subpage/ignored_user_row.rs
+src/account_settings/safety_page/ignored_users_subpage/ignored_user_row.blp
+src/account_settings/safety_page/ignored_users_subpage/mod.blp
+src/account_settings/safety_page/mod.rs
+src/account_settings/safety_page/mod.blp
+src/account_settings/user_session/user_session_list_subpage.blp
+src/account_settings/user_session/user_session_row.blp
+src/account_settings/user_session/user_session_subpage.rs
+src/account_settings/user_session/user_session_subpage.blp
 src/account_switcher/account_switcher_button.blp
 src/account_switcher/account_switcher_popover.blp
 src/account_switcher/session_item.blp
@@ -85,30 +109,6 @@ src/session/model/room_list/mod.rs
 src/session/model/sidebar_data/section/name.rs
 src/session/model/sidebar_data/icon_item.rs
 src/session/model/user_sessions_list/user_session.rs
-src/session/view/account_settings/encryption_page/import_export_keys_subpage.rs
-src/session/view/account_settings/encryption_page/import_export_keys_subpage.blp
-src/session/view/account_settings/encryption_page/mod.rs
-src/session/view/account_settings/encryption_page/mod.blp
-src/session/view/account_settings/general_page/change_password_subpage.rs
-src/session/view/account_settings/general_page/change_password_subpage.ui
-src/session/view/account_settings/general_page/deactivate_account_subpage.rs
-src/session/view/account_settings/general_page/deactivate_account_subpage.blp
-src/session/view/account_settings/general_page/log_out_subpage.rs
-src/session/view/account_settings/general_page/log_out_subpage.blp
-src/session/view/account_settings/general_page/mod.rs
-src/session/view/account_settings/general_page/mod.blp
-src/session/view/account_settings/mod.blp
-src/session/view/account_settings/notifications_page.rs
-src/session/view/account_settings/notifications_page.blp
-src/session/view/account_settings/safety_page/ignored_users_subpage/ignored_user_row.rs
-src/session/view/account_settings/safety_page/ignored_users_subpage/ignored_user_row.blp
-src/session/view/account_settings/safety_page/ignored_users_subpage/mod.blp
-src/session/view/account_settings/safety_page/mod.rs
-src/session/view/account_settings/safety_page/mod.blp
-src/session/view/account_settings/user_session/user_session_list_subpage.blp
-src/session/view/account_settings/user_session/user_session_row.blp
-src/session/view/account_settings/user_session/user_session_subpage.rs
-src/session/view/account_settings/user_session/user_session_subpage.blp
 src/session/view/content/explore/mod.blp
 src/session/view/content/explore/public_room_row.rs
 src/session/view/content/explore/servers_popover.blp

src/account_settings/encryption_page/import_export_keys_subpage.rs

@@ -27,7 +27,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/encryption_page/import_export_keys_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/encryption_page/import_export_keys_subpage.ui"
     )]
     #[properties(wrapper_type = super::ImportExportKeysSubpage)]
     pub struct ImportExportKeysSubpage {

src/account_settings/encryption_page/mod.rs

@@ -19,9 +19,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/encryption_page/mod.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/account_settings/encryption_page/mod.ui")]
     #[properties(wrapper_type = super::EncryptionPage)]
     pub struct EncryptionPage {
         #[template_child]

src/account_settings/general_page/change_password_subpage.rs

@@ -18,7 +18,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/general_page/change_password_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/general_page/change_password_subpage.ui"
     )]
     #[properties(wrapper_type = super::ChangePasswordSubpage)]
     pub struct ChangePasswordSubpage {

src/account_settings/general_page/deactivate_account_subpage.rs

@@ -19,7 +19,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/general_page/deactivate_account_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/general_page/deactivate_account_subpage.ui"
     )]
     #[properties(wrapper_type = super::DeactivateAccountSubpage)]
     pub struct DeactivateAccountSubpage {

src/account_settings/general_page/log_out_subpage.rs

@@ -3,11 +3,9 @@ use gettextrs::gettext;
 use gtk::glib;
 
 use crate::{
+    account_settings::AccountSettings,
     components::LoadingButtonRow,
-    session::{
-        model::{CryptoIdentityState, RecoveryState, Session, SessionVerificationState},
-        view::AccountSettings,
-    },
+    session::model::{CryptoIdentityState, RecoveryState, Session, SessionVerificationState},
     toast,
 };
 
@@ -17,9 +15,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/general_page/log_out_subpage.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/account_settings/general_page/log_out_subpage.ui")]
     #[properties(wrapper_type = super::LogOutSubpage)]
     pub struct LogOutSubpage {
         #[template_child]

src/account_settings/general_page/mod.rs

@@ -30,9 +30,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/general_page/mod.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/account_settings/general_page/mod.ui")]
     #[properties(wrapper_type = super::GeneralPage)]
     pub struct GeneralPage {
         #[template_child]

src/account_settings/mod.rs

@@ -59,7 +59,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/account_settings/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/account_settings/mod.ui")]
     #[properties(wrapper_type = super::AccountSettings)]
     pub struct AccountSettings {
         /// The current session.

src/account_settings/notifications_page.rs

@@ -19,9 +19,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/notifications_page.ui"
-    )]
+    #[template(resource = "/org/gnome/Fractal/ui/account_settings/notifications_page.ui")]
     #[properties(wrapper_type = super::NotificationsPage)]
     pub struct NotificationsPage {
         #[template_child]

src/account_settings/safety_page/ignored_users_subpage/ignored_user_row.rs

@@ -13,7 +13,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/safety_page/ignored_users_subpage/ignored_user_row.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/safety_page/ignored_users_subpage/ignored_user_row.ui"
     )]
     #[properties(wrapper_type = super::IgnoredUserRow)]
     pub struct IgnoredUserRow {

src/account_settings/safety_page/ignored_users_subpage/mod.rs

@@ -16,7 +16,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/safety_page/ignored_users_subpage/mod.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/safety_page/ignored_users_subpage/mod.ui"
     )]
     #[properties(wrapper_type = super::IgnoredUsersSubpage)]
     pub struct IgnoredUsersSubpage {

src/account_settings/safety_page/mod.rs

@@ -24,7 +24,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/account_settings/safety_page/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/account_settings/safety_page/mod.ui")]
     #[properties(wrapper_type = super::SafetyPage)]
     pub struct SafetyPage {
         #[template_child]

src/account_settings/user_session/user_session_list_subpage.rs

@@ -17,7 +17,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/user_session/user_session_list_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/user_session/user_session_list_subpage.ui"
     )]
     #[properties(wrapper_type = super::UserSessionListSubpage)]
     pub struct UserSessionListSubpage {

src/account_settings/user_session/user_session_row.rs

@@ -12,7 +12,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/user_session/user_session_row.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/user_session/user_session_row.ui"
     )]
     #[properties(wrapper_type = super::UserSessionRow)]
     pub struct UserSessionRow {

src/account_settings/user_session/user_session_subpage.rs

@@ -5,10 +5,11 @@ use matrix_sdk::authentication::oauth::{AccountManagementActionFull, AccountMana
 use tracing::error;
 
 use crate::{
+    account_settings::AccountSettings,
     components::{ActionButton, ActionState, AuthError, LoadingButtonRow},
     gettext_f,
     prelude::*,
-    session::{model::UserSession, view::AccountSettings},
+    session::model::UserSession,
     toast,
     utils::{BoundConstructOnlyObject, BoundObject, TemplateCallbacks},
 };
@@ -20,7 +21,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/account_settings/user_session/user_session_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/account_settings/user_session/user_session_subpage.ui"
     )]
     #[properties(wrapper_type = super::UserSessionSubpage)]
     pub struct UserSessionSubpage {

src/main.rs

@@ -9,6 +9,7 @@ mod application;
 mod components;
 #[rustfmt::skip]
 mod config;
+mod account_settings;
 mod contrib;
 mod error_page;
 mod i18n;

src/session/view/mod.rs

@@ -1,4 +1,3 @@
-mod account_settings;
 mod content;
 mod create_direct_chat_dialog;
 mod create_room_dialog;
@@ -6,7 +5,7 @@ mod media_viewer;
 mod session_view;
 mod sidebar;
 
-pub use self::{account_settings::AccountSettings, session_view::SessionView};
+pub use self::session_view::SessionView;
 use self::{
     content::Content, create_direct_chat_dialog::CreateDirectChatDialog,
     create_room_dialog::CreateRoomDialog, media_viewer::MediaViewer, sidebar::Sidebar,

src/session/view/sidebar/mod.rs

@@ -16,8 +16,8 @@ use self::{
     icon_item_row::SidebarIconItemRow, room_row::SidebarRoomRow, row::SidebarRow,
     section_row::SidebarSectionRow, verification_row::SidebarVerificationRow,
 };
-use super::{AccountSettings, account_settings::AccountSettingsSubpage};
 use crate::{
+    account_settings::{AccountSettings, AccountSettingsSubpage},
     account_switcher::AccountSwitcherButton,
     components::OfflineBanner,
     session::model::{

src/ui-blueprint-resources.in

@@ -2,6 +2,19 @@
 # Please keep this file sorted alphabetically.
 account_chooser_dialog/account_row.blp
 account_chooser_dialog/mod.blp
+account_settings/encryption_page/import_export_keys_subpage.blp
+account_settings/encryption_page/mod.blp
+account_settings/general_page/deactivate_account_subpage.blp
+account_settings/general_page/log_out_subpage.blp
+account_settings/general_page/mod.blp
+account_settings/mod.blp
+account_settings/notifications_page.blp
+account_settings/safety_page/ignored_users_subpage/ignored_user_row.blp
+account_settings/safety_page/ignored_users_subpage/mod.blp
+account_settings/safety_page/mod.blp
+account_settings/user_session/user_session_list_subpage.blp
+account_settings/user_session/user_session_row.blp
+account_settings/user_session/user_session_subpage.blp
 account_switcher/account_switcher_button.blp
 account_switcher/account_switcher_popover.blp
 account_switcher/avatar_with_selection.blp
@@ -62,19 +75,6 @@ login/method_page.blp
 login/mod.blp
 login/session_setup_view.blp
 login/sso_idp_button.blp
-session/view/account_settings/encryption_page/import_export_keys_subpage.blp
-session/view/account_settings/encryption_page/mod.blp
-session/view/account_settings/general_page/deactivate_account_subpage.blp
-session/view/account_settings/general_page/log_out_subpage.blp
-session/view/account_settings/general_page/mod.blp
-session/view/account_settings/mod.blp
-session/view/account_settings/notifications_page.blp
-session/view/account_settings/safety_page/ignored_users_subpage/ignored_user_row.blp
-session/view/account_settings/safety_page/ignored_users_subpage/mod.blp
-session/view/account_settings/safety_page/mod.blp
-session/view/account_settings/user_session/user_session_list_subpage.blp
-session/view/account_settings/user_session/user_session_row.blp
-session/view/account_settings/user_session/user_session_subpage.blp
 session/view/content/explore/mod.blp
 session/view/content/explore/public_room_row.blp
 session/view/content/explore/server_row.blp

src/ui-resources.gresource.xml.in

@@ -4,6 +4,6 @@
     <file compressed="true" preprocess="xml-stripblanks">shortcuts-dialog.ui</file>
   </gresource>
   <gresource prefix="/org/gnome/Fractal/ui/">@UI_FILES@
-    <file compressed="true" preprocess="xml-stripblanks">session/view/account_settings/general_page/change_password_subpage.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">account_settings/general_page/change_password_subpage.ui</file>
   </gresource>
 </gresources>

src/window.rs

@@ -7,6 +7,7 @@ use tracing::{error, warn};
 use crate::{
     APP_ID, Application, PROFILE, SETTINGS_KEY_CURRENT_SESSION,
     account_chooser_dialog::AccountChooserDialog,
+    account_settings::AccountSettings,
     account_switcher::{AccountSwitcherButton, AccountSwitcherPopover},
     components::OfflineBanner,
     error_page::ErrorPage,
@@ -16,7 +17,7 @@ use crate::{
     secret::SESSION_ID_LENGTH,
     session::{
         model::{Session, SessionState},
-        view::{AccountSettings, SessionView},
+        view::SessionView,
     },
     session_list::{FailedSession, SessionInfo},
     toast,