feat: remove old unused code

This commit is contained in:
2026-01-29 21:08:50 +05:30
parent d509fb7813
commit 5b6affd56a
5 changed files with 13 additions and 177 deletions

8
Cargo.lock generated
View File

@@ -4176,14 +4176,6 @@ dependencies = [
"ui-iced", "ui-iced",
] ]
[[package]]
name = "jello-types"
version = "0.1.0"
dependencies = [
"serde",
"uuid",
]
[[package]] [[package]]
name = "jiff" name = "jiff"
version = "0.2.18" version = "0.2.18"

View File

@@ -6,10 +6,9 @@ members = [
"ui-gpui", "ui-gpui",
"ui-iced", "ui-iced",
"store", "store",
"jello-types",
"gst", "gst",
"examples/hdr-gstreamer-wgpu",
"crates/iced-video", "crates/iced-video",
"examples/hdr-gstreamer-wgpu",
] ]
[workspace.dependencies] [workspace.dependencies]
iced = { version = "0.14.0" } iced = { version = "0.14.0" }

View File

@@ -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"] }

View File

@@ -1,6 +0,0 @@
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
pub struct User {
id: uuid::Uuid,
name: Option<String>,
primary_image_tag: Option<String>,
}

View File

@@ -18,10 +18,10 @@ pub fn update(state: &mut State, message: SettingsMessage) -> Task<Message> {
SettingsMessage::Select(screen) => { SettingsMessage::Select(screen) => {
tracing::trace!("Switching settings screen to {:?}", screen); tracing::trace!("Switching settings screen to {:?}", screen);
state.settings.screen = screen; state.settings.screen = screen;
} } //
SettingsMessage::User(user) => state.settings.login_form.update(user), // SettingsMessage::User(user) => state.settings.login_form.update(user),
//
SettingsMessage::Server(server) => state.settings.server_form.update(server), // SettingsMessage::Server(server) => state.settings.server_page.update(server),
} }
Task::none() Task::none()
} }
@@ -30,40 +30,13 @@ pub fn empty() -> Element<'static, Message> {
column([]).into() column([]).into()
} }
#[derive(Debug, Clone, Default)]
pub struct SettingsState {
login_form: LoginForm,
server_form: ServerForm,
screen: SettingsScreen,
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum SettingsMessage { pub enum SettingsMessage {
Open, Open,
Close, Close,
Select(SettingsScreen), Select(SettingsScreen),
User(UserMessage), // User(UserMessage),
Server(ServerMessage), // 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,
} }
#[derive(Debug, Clone, Default, PartialEq, Eq)] #[derive(Debug, Clone, Default, PartialEq, Eq)]
@@ -74,124 +47,9 @@ pub enum SettingsScreen {
Servers, Servers,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default, PartialEq, Eq)]
pub struct ServerItem { pub struct SettingsState {
pub id: uuid::Uuid, pub screen: SettingsScreen,
pub name: SharedString,
pub url: SharedString,
pub users: Vec<uuid::Uuid>,
}
#[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<Message> {
(!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<Message> {
(!self.name.is_empty() && !self.url.is_empty())
.then(|| Message::Settings(SettingsMessage::Server(ServerMessage::Add)))
}
} }
mod screens { mod screens {
@@ -261,6 +119,7 @@ mod screens {
Column::new() Column::new()
.push(text("Main Settings")) .push(text("Main Settings"))
.push(toggler(true).label("HDR")) .push(toggler(true).label("HDR"))
.push(toggler(true).label("Enable Notifications"))
.spacing(20) .spacing(20)
.padding(20) .padding(20)
.pipe(container) .pipe(container)
@@ -270,7 +129,7 @@ mod screens {
pub fn server(state: &State) -> Element<'_, Message> { pub fn server(state: &State) -> Element<'_, Message> {
Column::new() Column::new()
.push(text("Server Settings")) .push(text("Server Settings"))
.push(state.settings.server_form.view()) // .push(ServerPage::view(state))
.spacing(20) .spacing(20)
.padding(20) .padding(20)
.pipe(container) .pipe(container)
@@ -280,7 +139,7 @@ mod screens {
pub fn user(state: &State) -> Element<'_, Message> { pub fn user(state: &State) -> Element<'_, Message> {
Column::new() Column::new()
.push(text("User Settings")) .push(text("User Settings"))
.push(state.settings.login_form.view()) // .push(LoginForm::view(&state.settings.login_form))
.spacing(20) .spacing(20)
.padding(20) .padding(20)
.pipe(container) .pipe(container)