228 refactor graphics::window into lvgl component

drivers/shared/src/devices/http_common.rs

@@ -22,25 +22,24 @@ pub fn map_network_error(error: network::Error) -> Error {
 }
 
 pub fn split_host_port(host_value: &str, default_port: u16) -> (&str, u16) {
-    if let Some(stripped) = host_value.strip_prefix('[') {
-        if let Some(end) = stripped.find(']') {
-            let host = &stripped[..end];
-            let remainder = &stripped[end + 1..];
-            if let Some(port_string) = remainder.strip_prefix(':') {
-                if let Ok(port) = port_string.parse::<u16>() {
-                    return (host, port);
-                }
-            }
-            return (host, default_port);
+    if let Some(stripped) = host_value.strip_prefix('[')
+        && let Some(end) = stripped.find(']')
+    {
+        let host = &stripped[..end];
+        let remainder = &stripped[end + 1..];
+        if let Some(port_string) = remainder.strip_prefix(':')
+            && let Ok(port) = port_string.parse::<u16>()
+        {
+            return (host, port);
         }
+        return (host, default_port);
     }
 
-    if let Some((host, port_string)) = host_value.rsplit_once(':') {
-        if !host.contains(':') {
-            if let Ok(port) = port_string.parse::<u16>() {
-                return (host, port);
-            }
-        }
+    if let Some((host, port_string)) = host_value.rsplit_once(':')
+        && !host.contains(':')
+        && let Ok(port) = port_string.parse::<u16>()
+    {
+        return (host, port);
     }
 
     (host_value, default_port)

drivers/std/src/devices/cpu.rs

@@ -99,10 +99,10 @@ fn render_cpuinfo_text() -> String {
     let architecture = std::env::consts::ARCH;
     let cores = std::thread::available_parallelism().ok().map(usize::from);
 
-    if cfg!(target_os = "linux") {
-        if let Ok(content) = std::fs::read_to_string("/proc/cpuinfo") {
-            return build_cpuinfo_text_from_proc(&content, architecture, cores);
-        }
+    if cfg!(target_os = "linux")
+        && let Ok(content) = std::fs::read_to_string("/proc/cpuinfo")
+    {
+        return build_cpuinfo_text_from_proc(&content, architecture, cores);
     }
 
     build_cpuinfo_text_from_proc("", architecture, cores)

drivers/wasm/src/devices/graphics/keyboard.rs

@@ -79,12 +79,12 @@ impl KeyboardDevice {
         let sender = inner.0.sender();
 
         let paste_closure = Closure::wrap(Box::new(move |event: ClipboardEvent| {
-            if let Some(clipboard_data) = event.clipboard_data() {
-                if let Ok(text) = clipboard_data.get_data("text") {
-                    for char in text.chars() {
-                        Self::handle_key_press_char(sender, char, true);
-                        Self::handle_key_press_char(sender, char, false);
-                    }
+            if let Some(clipboard_data) = event.clipboard_data()
+                && let Ok(text) = clipboard_data.get_data("text")
+            {
+                for char in text.chars() {
+                    Self::handle_key_press_char(sender, char, true);
+                    Self::handle_key_press_char(sender, char, false);
                 }
             }
         }) as Box<dyn FnMut(ClipboardEvent)>);

drivers/wasm/src/devices/http_client.rs

@@ -69,7 +69,7 @@ fn build_request<'a>(scheme: &str, request: HttpRequestParser<'a>) -> Option<Req
 
     let url = format!("{}://{}{}", scheme, host?, path.unwrap_or("/"));
 
-    Some(Request::new_with_str_and_init(&url, &options).ok()?)
+    Request::new_with_str_and_init(&url, &options).ok()
 }
 
 fn build_headers_response(response: &web_sys::Response, buffer: &mut [u8]) -> Result<usize> {
@@ -78,7 +78,7 @@ fn build_headers_response(response: &web_sys::Response, buffer: &mut [u8]) -> Re
     // Status code
     let status = response.status();
     builder
-        .add_status_code(status as u16)
+        .add_status_code(status)
         .ok_or(Error::InternalError)?;
 
     // Headers

drivers/wasm/src/devices/time.rs

@@ -69,7 +69,7 @@ impl DirectBaseOperations for TimeDevice {
 
         buffer[..duration_bytes.len()].copy_from_slice(duration_bytes);
 
-        Ok(duration_bytes.len().into())
+        Ok(duration_bytes.len())
     }
 
     fn write(&self, _: &[u8], _: Size) -> Result<usize> {

examples/wasm/src/main.rs

@@ -86,7 +86,7 @@ async fn main() {
     let partition = Box::leak(Box::new(partition));
 
     // Print MBR information
-    let mbr = Mbr::read_from_device(&*drive).unwrap();
+    let mbr = Mbr::read_from_device(drive).unwrap();
     log::information!("MBR Information: {mbr}");
 
     // Mount the file system

executables/file_manager/src/file_manager.rs

@@ -6,20 +6,20 @@ pub(crate) use alloc::{
     vec::Vec,
 };
 use core::ptr::null_mut;
-use xila::internationalization::translate;
 use xila::log;
 use xila::task;
 use xila::virtual_file_system::{Directory, get_instance};
 use xila::{
     file_system::{Kind, Path, PathOwned},
     graphics::{
-        self, EventKind, Window, lvgl,
+        self, EventKind, lvgl,
         palette::{self, Hue},
     },
 };
+use xila::{graphics::OwnedWindow, internationalization::translate};
 
 pub struct FileManager {
-    window: Window,
+    window: OwnedWindow,
     toolbar: *mut lvgl::lv_obj_t,
     up_button: *mut lvgl::lv_obj_t,
     home_button: *mut lvgl::lv_obj_t,
@@ -63,15 +63,15 @@ impl FileManager {
             // Set up window layout for flex
             unsafe {
                 lvgl::lv_obj_set_layout(
-                    manager.window.get_object(),
+                    manager.window.as_object_mutable(),
                     lvgl::lv_layout_t_LV_LAYOUT_FLEX,
                 );
                 lvgl::lv_obj_set_flex_flow(
-                    manager.window.get_object(),
+                    manager.window.as_object_mutable(),
                     lvgl::lv_flex_flow_t_LV_FLEX_FLOW_COLUMN,
                 );
                 lvgl::lv_obj_set_style_pad_all(
-                    manager.window.get_object(),
+                    manager.window.as_object_mutable(),
                     0,
                     lvgl::LV_STATE_DEFAULT,
                 );
@@ -103,10 +103,10 @@ impl FileManager {
 
     pub async fn handle_event(&mut self, event: graphics::Event) -> Result<()> {
         match event.code {
-            EventKind::Delete | EventKind::CloseRequested => {
-                if event.target == self.window.get_object() {
-                    self.running = false;
-                }
+            EventKind::Delete | EventKind::CloseRequested
+                if event.target == self.window.as_object_mutable() =>
+            {
+                self.running = false;
             }
             EventKind::Clicked => {
                 let target = event.target;
@@ -133,7 +133,7 @@ impl FileManager {
 
     async fn create_toolbar(&mut self) -> Result<()> {
         unsafe {
-            self.toolbar = lvgl::lv_obj_create(self.window.get_object());
+            self.toolbar = lvgl::lv_obj_create(self.window.as_object_mutable());
             if self.toolbar.is_null() {
                 return Err(Error::FailedToCreateObject);
             }
@@ -223,7 +223,7 @@ impl FileManager {
 
     async fn create_file_list(&mut self) -> Result<()> {
         unsafe {
-            self.file_list = lvgl::lv_list_create(self.window.get_object());
+            self.file_list = lvgl::lv_list_create(self.window.as_object_mutable());
             if self.file_list.is_null() {
                 return Err(Error::FailedToCreateObject);
             }

executables/settings/src/settings.rs

@@ -1,15 +1,16 @@
 use alloc::string::String;
 use xila::file_system::Kind;
+use xila::graphics::OwnedWindow;
 use xila::graphics::{
-    self, EventKind, Window, lvgl,
+    self, EventKind, lvgl,
     palette::{self, Hue},
 };
 
 use crate::error::Result;
 use crate::tabs::{AboutTab, GeneralTab, NetworkTab, PasswordTab, Tab};
 
 pub struct Settings {
-    window: Window,
+    window: OwnedWindow,
     tabs: [Tab; 4],
 }
 
@@ -30,7 +31,7 @@ impl Settings {
 
         // Create tabview
         let tabview = unsafe {
-            let tabview = lvgl::lv_tabview_create(window.get_object());
+            let tabview = lvgl::lv_tabview_create(window.as_object_mutable());
 
             if tabview.is_null() {
                 return Err(crate::error::Error::FailedToCreateUiElement);
@@ -60,7 +61,7 @@ impl Settings {
             while let Some(event) = self.window.pop_event() {
                 // Logique de filtrage spécifique à Settings
                 if (event.code == EventKind::Delete || event.code == EventKind::CloseRequested)
-                    && event.target == self.window.get_object()
+                    && event.target == self.window.as_object_mutable()
                 {
                     return false;
                 }

executables/shell/command_line/src/lib.rs

@@ -125,14 +125,12 @@ impl Shell {
             None => return Ok(()),
         };
 
-        let result = match next_positional {
-            command => match resolve_user_command(command) {
-                Some(user_command) => {
-                    let mut context = ShellCommandContext::new(self);
-                    dispatch_user_command(user_command, &mut context, &mut options, paths).await
-                }
-                None => self.execute(input, paths).await,
-            },
+        let result = match resolve_user_command(next_positional) {
+            Some(user_command) => {
+                let mut context = ShellCommandContext::new(self);
+                dispatch_user_command(user_command, &mut context, &mut options, paths).await
+            }
+            None => self.execute(input, paths).await,
         };
 
         if let Err(error) = result {