From e17ce59fa4c907511f38795c342b2232a7bba26d Mon Sep 17 00:00:00 2001
From: pml68 <contact@pml68.dev>
Date: Mon, 28 Apr 2025 10:59:52 +0200
Subject: feat: switch to fully custom, Material3-based theme

---
 src/types/project.rs          | 18 ++++--------------
 src/types/rendered_element.rs | 30 +-----------------------------
 2 files changed, 5 insertions(+), 43 deletions(-)

(limited to 'src/types')

diff --git a/src/types/project.rs b/src/types/project.rs
index 91b2bb1..11789ac 100644
--- a/src/types/project.rs
+++ b/src/types/project.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 
 use super::rendered_element::RenderedElement;
 use crate::Error;
-use crate::theme::{theme_from_str, theme_index};
+use crate::appearance::iced_theme_from_str;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Project {
@@ -33,8 +33,8 @@ impl Project {
 
     pub fn get_theme(&self) -> Theme {
         match &self.theme {
-            Some(theme) => theme_from_str(None, theme),
-            None => Theme::default(),
+            Some(theme) => iced_theme_from_str(theme),
+            None => iced::Theme::default(),
         }
     }
 
@@ -90,20 +90,10 @@ impl Project {
             Some(ref element_tree) => {
                 let (imports, view) = element_tree.codegen();
                 let theme = self.get_theme();
-                let theme_code = theme.to_string().replace(" ", "");
-                let mut theme_imports = "";
-                if theme_index(&theme.to_string(), Theme::ALL).is_none() {
-                    if theme_code.contains("Extended") {
-                        theme_imports = "use iced::{{color,theme::{{Palette,palette::{{Extended,Background,Primary,Secondary,Success,Danger,Warning,Pair}}}}}};\n";
-                    } else {
-                        theme_imports = "use iced::{{color,theme::Palette}};\n";
-                    }
-                }
 
                 let app_code = format!(
                     r#"// Automatically generated by iced Builder
 use iced::{{widget::{{{imports}}},Element}};
-{theme_imports}
 
 fn main() -> iced::Result {{
     iced::application(State::default, State::update, State::view).title("{}").theme(State::theme).run()
@@ -130,7 +120,7 @@ impl State {{
                         Some(ref t) => t,
                         None => "New app",
                     },
-                    theme_code
+                    theme.to_string().replace(" ", "")
                 );
                 let config = rust_format::Config::new_str()
                     .edition(Edition::Rust2021)
diff --git a/src/types/rendered_element.rs b/src/types/rendered_element.rs
index 9639299..020aa46 100755
--- a/src/types/rendered_element.rs
+++ b/src/types/rendered_element.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use iced::advanced::widget::Id;
-use iced::{Element, Length, widget};
+use iced::{Element, widget};
 use serde::{Deserialize, Serialize};
 
 use crate::Error;
@@ -171,34 +171,6 @@ impl RenderedElement {
         self
     }
 
-    pub fn text_view<'a>(self) -> Element<'a, Message> {
-        let mut children = widget::column![];
-
-        if let Some(els) = self.child_elements.clone() {
-            for el in els {
-                children = children.push(el.clone().text_view());
-            }
-        }
-        iced_drop::droppable(
-            widget::container(
-                widget::column![
-                    widget::text(self.name.clone().to_string()),
-                    children
-                ]
-                .width(Length::Fill)
-                .spacing(10),
-            )
-            .padding(10)
-            .style(widget::container::bordered_box),
-        )
-        .id(self.id().clone())
-        .drag_hide(true)
-        .on_drop(move |point, rect| {
-            Message::MoveElement(self.clone(), point, rect)
-        })
-        .into()
-    }
-
     pub fn codegen(&self) -> (String, String) {
         let mut imports = String::new();
         let mut view = String::new();
-- 
cgit v1.2.3