draft: storage page

cosmic-settings/Cargo.toml

@@ -53,6 +53,7 @@ image = { version = "0.25", default-features = false, features = [
 indexmap = "2.12.0"
 itertools = "0.14.0"
 itoa = "1.0.15"
+jwalk = { version = "0.8.1", optional = true }
 libcosmic.workspace = true
 locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
 mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
@@ -67,6 +68,7 @@ serde = { version = "1.0.228", features = ["derive"] }
 slab = "0.4.11"
 slotmap = "1.0.7"
 static_init = "1.0.4"
+sysinfo = { version = "0.37.2", optional = true }
 sunrise = "2.1.0"
 tachyonix = "0.3.1"
 timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
@@ -124,6 +126,7 @@ linux = [
     "page-power",
     "page-region",
     "page-sound",
+    "page-storage",
     "page-users",
     "page-window-management",
     "page-workspaces",
@@ -168,6 +171,7 @@ page-networking = [
 page-power = ["dep:upower_dbus", "dep:zbus"]
 page-region = ["gettext", "dep:locales-rs", "dep:locale1", "dep:zbus"]
 page-sound = ["dep:cosmic-settings-sound-subscription"]
+page-storage = ["dep:jwalk", "dep:sysinfo"]
 page-users = ["xdg-portal", "dep:accounts-zbus", "dep:zbus", "dep:zbus_polkit"]
 page-window-management = ["dep:cosmic-settings-config"]
 page-workspaces = ["dep:cosmic-comp-config"]

cosmic-settings/src/app.rs

@@ -556,6 +556,61 @@ impl cosmic::Application for SettingsApp {
                     }
                 }
 
+                #[cfg(feature = "page-storage")]
+                crate::pages::Message::Storage(message) => {
+                    if let Some(page) = self.pages.page_mut::<system::storage::Page>() {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+
+                #[cfg(feature = "page-storage")]
+                crate::pages::Message::StorageSystemCategory(message) => {
+                    if let Some(page) = self
+                        .pages
+                        .page_mut::<system::storage::system_category::Page>()
+                    {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+
+                #[cfg(feature = "page-storage")]
+                crate::pages::Message::StorageHomeCategory(message) => {
+                    if let Some(page) = self
+                        .pages
+                        .page_mut::<system::storage::home_category::Page>()
+                    {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+
+                #[cfg(feature = "page-storage")]
+                crate::pages::Message::StorageApplicationsCategory(message) => {
+                    if let Some(page) = self
+                        .pages
+                        .page_mut::<system::storage::applications_category::Page>()
+                    {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+
+                #[cfg(feature = "page-storage")]
+                crate::pages::Message::StorageAppDetails(message) => {
+                    if let Some(page) = self.pages.page_mut::<system::storage::app_details::Page>()
+                    {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+
+                #[cfg(feature = "page-storage")]
+                crate::pages::Message::StorageOtherCategory(message) => {
+                    if let Some(page) = self
+                        .pages
+                        .page_mut::<system::storage::other_category::Page>()
+                    {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+
                 #[cfg(feature = "page-users")]
                 crate::pages::Message::User(message) => {
                     if let Some(page) = self.pages.page_mut::<system::users::Page>() {

cosmic-settings/src/pages/mod.rs

@@ -85,6 +85,18 @@ pub enum Message {
     #[cfg(feature = "page-sound")]
     Sound(sound::Message),
     StartupApps(applications::startup_apps::Message),
+    #[cfg(feature = "page-storage")]
+    Storage(system::storage::Message),
+    #[cfg(feature = "page-storage")]
+    StorageSystemCategory(system::storage::system_category::Message),
+    #[cfg(feature = "page-storage")]
+    StorageHomeCategory(system::storage::home_category::Message),
+    #[cfg(feature = "page-storage")]
+    StorageApplicationsCategory(system::storage::applications_category::Message),
+    #[cfg(feature = "page-storage")]
+    StorageAppDetails(system::storage::app_details::Message),
+    #[cfg(feature = "page-storage")]
+    StorageOtherCategory(system::storage::other_category::Message),
     #[cfg(feature = "page-users")]
     User(system::users::Message),
     #[cfg(feature = "page-input")]

cosmic-settings/src/pages/system/mod.rs

@@ -5,6 +5,8 @@
 pub mod about;
 
 pub mod firmware;
+#[cfg(feature = "page-storage")]
+pub mod storage;
 #[cfg(feature = "page-users")]
 pub mod users;
 
@@ -41,6 +43,11 @@ impl page::AutoBind<crate::pages::Message> for Page {
 
         page = page.sub_page::<firmware::Page>();
 
+        #[cfg(feature = "page-storage")]
+        {
+            page = page.sub_page::<storage::Page>();
+        }
+
         page
     }
 }