From 5b6affd56ae434fe3f4b30268e637d13f385443c Mon Sep 17 00:00:00 2001 From: servius Date: Thu, 29 Jan 2026 21:08:50 +0530 Subject: [PATCH] feat: remove old unused code --- Cargo.lock | 8 -- Cargo.toml | 3 +- jello-types/Cargo.toml | 8 -- jello-types/src/lib.rs | 6 -- ui-iced/src/settings.rs | 165 +++------------------------------------- 5 files changed, 13 insertions(+), 177 deletions(-) delete mode 100644 jello-types/Cargo.toml delete mode 100644 jello-types/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 87f5996..9ce967b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4176,14 +4176,6 @@ dependencies = [ "ui-iced", ] -[[package]] -name = "jello-types" -version = "0.1.0" -dependencies = [ - "serde", - "uuid", -] - [[package]] name = "jiff" version = "0.2.18" diff --git a/Cargo.toml b/Cargo.toml index a2fad21..724b547 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,10 +6,9 @@ members = [ "ui-gpui", "ui-iced", "store", - "jello-types", "gst", - "examples/hdr-gstreamer-wgpu", "crates/iced-video", + "examples/hdr-gstreamer-wgpu", ] [workspace.dependencies] iced = { version = "0.14.0" } diff --git a/jello-types/Cargo.toml b/jello-types/Cargo.toml deleted file mode 100644 index 7c31270..0000000 --- a/jello-types/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "jello-types" -version = "0.1.0" -edition = "2024" - -[dependencies] -serde = { version = "1.0.228", features = ["derive"] } -uuid = { version = "1.18.1", features = ["serde"] } diff --git a/jello-types/src/lib.rs b/jello-types/src/lib.rs deleted file mode 100644 index e6dcb32..0000000 --- a/jello-types/src/lib.rs +++ /dev/null @@ -1,6 +0,0 @@ -#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] -pub struct User { - id: uuid::Uuid, - name: Option, - primary_image_tag: Option, -} diff --git a/ui-iced/src/settings.rs b/ui-iced/src/settings.rs index aef4108..3ba9aab 100644 --- a/ui-iced/src/settings.rs +++ b/ui-iced/src/settings.rs @@ -18,10 +18,10 @@ pub fn update(state: &mut State, message: SettingsMessage) -> Task { SettingsMessage::Select(screen) => { tracing::trace!("Switching settings screen to {:?}", screen); state.settings.screen = screen; - } - SettingsMessage::User(user) => state.settings.login_form.update(user), - - SettingsMessage::Server(server) => state.settings.server_form.update(server), + } // + // SettingsMessage::User(user) => state.settings.login_form.update(user), + // + // SettingsMessage::Server(server) => state.settings.server_page.update(server), } Task::none() } @@ -30,40 +30,13 @@ pub fn empty() -> Element<'static, Message> { column([]).into() } -#[derive(Debug, Clone, Default)] -pub struct SettingsState { - login_form: LoginForm, - server_form: ServerForm, - screen: SettingsScreen, -} - #[derive(Debug, Clone)] pub enum SettingsMessage { Open, Close, Select(SettingsScreen), - User(UserMessage), - Server(ServerMessage), -} - -#[derive(Debug, Clone)] -pub enum UserMessage { - Add, - UsernameChanged(String), - PasswordChanged(String), - // Edit(uuid::Uuid), - // Delete(uuid::Uuid), - Clear, -} - -#[derive(Debug, Clone)] -pub enum ServerMessage { - Add, - NameChanged(String), - UrlChanged(String), - // Edit(uuid::Uuid), - // Delete(uuid::Uuid), - Clear, + // User(UserMessage), + // Server(ServerMessage), } #[derive(Debug, Clone, Default, PartialEq, Eq)] @@ -74,124 +47,9 @@ pub enum SettingsScreen { Servers, } -#[derive(Debug, Clone)] -pub struct ServerItem { - pub id: uuid::Uuid, - pub name: SharedString, - pub url: SharedString, - pub users: Vec, -} - -#[derive(Debug, Clone)] -pub struct UserItem { - pub id: uuid::Uuid, - pub name: SharedString, -} - -#[derive(Debug, Clone, Default)] -pub struct LoginForm { - username: String, - password: String, -} - -impl LoginForm { - pub fn update(&mut self, message: UserMessage) { - match message { - UserMessage::UsernameChanged(data) => { - self.username = data; - } - UserMessage::PasswordChanged(data) => { - self.password = data; - } - UserMessage::Add => { - // Handle adding user - } - UserMessage::Clear => { - self.username.clear(); - self.password.clear(); - } - } - } - pub fn view(&self) -> Element<'_, Message> { - iced::widget::column![ - text("Login Form"), - text_input("Enter Username", &self.username).on_input(|data| { - Message::Settings(SettingsMessage::User(UserMessage::UsernameChanged(data))) - }), - text_input("Enter Password", &self.password) - .secure(true) - .on_input(|data| { - Message::Settings(SettingsMessage::User(UserMessage::PasswordChanged(data))) - }), - row![ - button(text("Add User")).on_press_maybe(self.validate()), - button(text("Cancel")) - .on_press(Message::Settings(SettingsMessage::User(UserMessage::Clear))), - ] - .spacing(10), - ] - .spacing(10) - .padding([10, 0]) - .into() - } - - pub fn validate(&self) -> Option { - (!self.username.is_empty() && !self.password.is_empty()) - .then(|| Message::Settings(SettingsMessage::User(UserMessage::Add))) - } -} - -#[derive(Debug, Clone, Default)] -pub struct ServerForm { - name: String, - url: String, -} - -impl ServerForm { - pub fn update(&mut self, message: ServerMessage) { - match message { - ServerMessage::NameChanged(data) => { - self.name = data; - } - ServerMessage::UrlChanged(data) => { - self.url = data; - } - ServerMessage::Add => { - // Handle adding server - } - ServerMessage::Clear => { - self.name.clear(); - self.url.clear(); - } - _ => {} - } - } - pub fn view(&self) -> Element<'_, Message> { - iced::widget::column![ - text("Add New Server"), - text_input("Enter server name", &self.name).on_input(|data| { - Message::Settings(SettingsMessage::Server(ServerMessage::NameChanged(data))) - }), - text_input("Enter server URL", &self.url).on_input(|data| { - Message::Settings(SettingsMessage::Server(ServerMessage::UrlChanged(data))) - }), - row![ - button(text("Add Server")).on_press_maybe(self.validate()), - button(text("Cancel")).on_press(Message::Settings(SettingsMessage::Server( - ServerMessage::Clear - ))), - ] - .spacing(10), - ] - .spacing(10) - .padding([10, 0]) - .into() - } - - pub fn validate(&self) -> Option { - (!self.name.is_empty() && !self.url.is_empty()) - .then(|| Message::Settings(SettingsMessage::Server(ServerMessage::Add))) - } +#[derive(Debug, Clone, Default, PartialEq, Eq)] +pub struct SettingsState { + pub screen: SettingsScreen, } mod screens { @@ -261,6 +119,7 @@ mod screens { Column::new() .push(text("Main Settings")) .push(toggler(true).label("HDR")) + .push(toggler(true).label("Enable Notifications")) .spacing(20) .padding(20) .pipe(container) @@ -270,7 +129,7 @@ mod screens { pub fn server(state: &State) -> Element<'_, Message> { Column::new() .push(text("Server Settings")) - .push(state.settings.server_form.view()) + // .push(ServerPage::view(state)) .spacing(20) .padding(20) .pipe(container) @@ -280,7 +139,7 @@ mod screens { pub fn user(state: &State) -> Element<'_, Message> { Column::new() .push(text("User Settings")) - .push(state.settings.login_form.view()) + // .push(LoginForm::view(&state.settings.login_form)) .spacing(20) .padding(20) .pipe(container)