From 534e24c34de428e015b3a24b77e8b134b2a47587 Mon Sep 17 00:00:00 2001 From: cepetr Date: Fri, 15 Mar 2024 11:45:54 +0100 Subject: [PATCH] WIP - integration - canvas folder moved --- core/embed/rust/src/ui/component/jpeg.rs | 6 ++++-- core/embed/rust/src/ui/model_tr/cshape/dotted_line.rs | 3 +-- core/embed/rust/src/ui/model_tr/cshape/loader_circular.rs | 3 +-- core/embed/rust/src/ui/model_tr/cshape/loader_small.rs | 3 +-- core/embed/rust/src/ui/model_tr/cshape/loader_starry.rs | 3 +-- core/embed/rust/src/ui/model_tr/screens.rs | 4 +--- .../rust/src/ui/model_tt/component/coinjoin_progress.rs | 5 ++--- core/embed/rust/src/ui/model_tt/component/loader.rs | 3 +-- core/embed/rust/src/ui/model_tt/component/progress.rs | 7 +++---- .../embed/rust/src/ui/model_tt/component/welcome_screen.rs | 5 ++++- core/embed/rust/src/ui/model_tt/screens.rs | 1 - 11 files changed, 19 insertions(+), 24 deletions(-) diff --git a/core/embed/rust/src/ui/component/jpeg.rs b/core/embed/rust/src/ui/component/jpeg.rs index 89903aa8d..fd504b9aa 100644 --- a/core/embed/rust/src/ui/component/jpeg.rs +++ b/core/embed/rust/src/ui/component/jpeg.rs @@ -1,5 +1,7 @@ -use crate::error::Error; -use crate::micropython::{buffer::get_buffer, obj::Obj}; +use crate::{ + error::Error, + micropython::{buffer::get_buffer, obj::Obj}, +}; use crate::ui::{ component::{Component, Event, EventCtx, Never}, diff --git a/core/embed/rust/src/ui/model_tr/cshape/dotted_line.rs b/core/embed/rust/src/ui/model_tr/cshape/dotted_line.rs index 30e576879..6c5fe08c3 100644 --- a/core/embed/rust/src/ui/model_tr/cshape/dotted_line.rs +++ b/core/embed/rust/src/ui/model_tr/cshape/dotted_line.rs @@ -1,8 +1,7 @@ use crate::ui::{ - canvas::Canvas, display::Color, geometry::{Offset, Point, Rect}, - shape::{DrawingCache, Renderer, Shape, ShapeClone}, + shape::{Canvas, DrawingCache, Renderer, Shape, ShapeClone}, }; use without_alloc::alloc::LocalAllocLeakExt; diff --git a/core/embed/rust/src/ui/model_tr/cshape/loader_circular.rs b/core/embed/rust/src/ui/model_tr/cshape/loader_circular.rs index 3e2c9cbf0..676575aca 100644 --- a/core/embed/rust/src/ui/model_tr/cshape/loader_circular.rs +++ b/core/embed/rust/src/ui/model_tr/cshape/loader_circular.rs @@ -1,8 +1,7 @@ use crate::ui::{ - canvas::Canvas, display::Color, geometry::{Offset, Point, Rect}, - shape::{DrawingCache, Renderer, Shape, ShapeClone}, + shape::{Canvas, DrawingCache, Renderer, Shape, ShapeClone}, }; use without_alloc::alloc::LocalAllocLeakExt; diff --git a/core/embed/rust/src/ui/model_tr/cshape/loader_small.rs b/core/embed/rust/src/ui/model_tr/cshape/loader_small.rs index 6797eb567..17bbc1e2a 100644 --- a/core/embed/rust/src/ui/model_tr/cshape/loader_small.rs +++ b/core/embed/rust/src/ui/model_tr/cshape/loader_small.rs @@ -1,8 +1,7 @@ use crate::ui::{ - canvas::Canvas, display::Color, geometry::{Offset, Point, Rect}, - shape::{DrawingCache, Renderer, Shape, ShapeClone}, + shape::{Canvas, DrawingCache, Renderer, Shape, ShapeClone}, }; use without_alloc::alloc::LocalAllocLeakExt; diff --git a/core/embed/rust/src/ui/model_tr/cshape/loader_starry.rs b/core/embed/rust/src/ui/model_tr/cshape/loader_starry.rs index ebd09e412..f63440c29 100644 --- a/core/embed/rust/src/ui/model_tr/cshape/loader_starry.rs +++ b/core/embed/rust/src/ui/model_tr/cshape/loader_starry.rs @@ -1,8 +1,7 @@ use crate::ui::{ - canvas::Canvas, display::Color, geometry::{Offset, Point, Rect}, - shape::{DrawingCache, Renderer, Shape, ShapeClone}, + shape::{Canvas, DrawingCache, Renderer, Shape, ShapeClone}, }; use without_alloc::alloc::LocalAllocLeakExt; diff --git a/core/embed/rust/src/ui/model_tr/screens.rs b/core/embed/rust/src/ui/model_tr/screens.rs index 4bce551c0..69363cd16 100644 --- a/core/embed/rust/src/ui/model_tr/screens.rs +++ b/core/embed/rust/src/ui/model_tr/screens.rs @@ -1,8 +1,6 @@ #[cfg(feature = "micropython")] use crate::micropython::buffer::StrBuffer; -use crate::ui::{ - component::base::Component, constant::screen, model_tr::component::WelcomeScreen, -}; +use crate::ui::{component::base::Component, constant::screen, model_tr::component::WelcomeScreen}; #[cfg(not(feature = "new_rendering"))] use crate::ui::display; diff --git a/core/embed/rust/src/ui/model_tt/component/coinjoin_progress.rs b/core/embed/rust/src/ui/model_tt/component/coinjoin_progress.rs index 36d0424f8..408871e84 100644 --- a/core/embed/rust/src/ui/model_tt/component/coinjoin_progress.rs +++ b/core/embed/rust/src/ui/model_tt/component/coinjoin_progress.rs @@ -6,7 +6,6 @@ use crate::{ micropython::buffer::StrBuffer, translations::TR, ui::{ - canvas::algo::PI4, component::{ base::Never, Bar, Child, Component, ComponentExt, Empty, Event, EventCtx, Label, Split, }, @@ -143,8 +142,8 @@ where let start = (self.value as i16 - 100) % 1000; let end = (self.value as i16 + 100) % 1000; - let start = ((start as i32 * 8 * PI4 as i32) / 1000) as i16; - let end = ((end as i32 * 8 * PI4 as i32) / 1000) as i16; + let start = ((start as i32 * 8 * shape::PI4 as i32) / 1000) as i16; + let end = ((end as i32 * 8 * shape::PI4 as i32) / 1000) as i16; shape::Circle::new(center, LOADER_OUTER) .with_bg(inactive_color) diff --git a/core/embed/rust/src/ui/model_tt/component/loader.rs b/core/embed/rust/src/ui/model_tt/component/loader.rs index 175a77d6b..0f36ed467 100644 --- a/core/embed/rust/src/ui/model_tt/component/loader.rs +++ b/core/embed/rust/src/ui/model_tt/component/loader.rs @@ -4,7 +4,6 @@ use crate::{ time::{Duration, Instant}, ui::{ animation::Animation, - canvas::algo::PI4, component::{Component, Event, EventCtx, Pad}, display::{self, toif::Icon, Color}, geometry::{Alignment2D, Offset, Rect}, @@ -236,7 +235,7 @@ impl Component for Loader { shape::Circle::new(center, constant::LOADER_OUTER) .with_bg(style.loader_color) - .with_end_angle(((progress as i32 * PI4 as i32 * 8) / 1000) as i16) + .with_end_angle(((progress as i32 * shape::PI4 as i32 * 8) / 1000) as i16) .render(target); shape::Circle::new(center, constant::LOADER_INNER + 2) diff --git a/core/embed/rust/src/ui/model_tt/component/progress.rs b/core/embed/rust/src/ui/model_tt/component/progress.rs index 13da2894e..47f8177df 100644 --- a/core/embed/rust/src/ui/model_tt/component/progress.rs +++ b/core/embed/rust/src/ui/model_tt/component/progress.rs @@ -4,7 +4,6 @@ use crate::{ error::Error, strutil::StringType, ui::{ - canvas::algo::PI4, component::{ base::ComponentExt, paginated::Paginate, @@ -134,11 +133,11 @@ where let (start, end) = if self.indeterminate { let start = (self.value as i16 - 100) % 1000; let end = (self.value as i16 + 100) % 1000; - let start = ((start as i32 * 8 * PI4 as i32) / 1000) as i16; - let end = ((end as i32 * 8 * PI4 as i32) / 1000) as i16; + let start = ((start as i32 * 8 * shape::PI4 as i32) / 1000) as i16; + let end = ((end as i32 * 8 * shape::PI4 as i32) / 1000) as i16; (start, end) } else { - let end = ((self.value as i32 * 8 * PI4 as i32) / 1000) as i16; + let end = ((self.value as i32 * 8 * shape::PI4 as i32) / 1000) as i16; (0, end) }; diff --git a/core/embed/rust/src/ui/model_tt/component/welcome_screen.rs b/core/embed/rust/src/ui/model_tt/component/welcome_screen.rs index a3978b2e5..760e90aa3 100644 --- a/core/embed/rust/src/ui/model_tt/component/welcome_screen.rs +++ b/core/embed/rust/src/ui/model_tt/component/welcome_screen.rs @@ -6,7 +6,10 @@ use crate::ui::{ shape::Renderer, }; #[cfg(feature = "bootloader")] -use crate::ui::{display::{Icon, toif::Toif}, model_tt::theme::bootloader::DEVICE_NAME}; +use crate::ui::{ + display::{toif::Toif, Icon}, + model_tt::theme::bootloader::DEVICE_NAME, +}; const TEXT_BOTTOM_MARGIN: i16 = 24; // matching the homescreen label margin const ICON_TOP_MARGIN: i16 = 48; diff --git a/core/embed/rust/src/ui/model_tt/screens.rs b/core/embed/rust/src/ui/model_tt/screens.rs index 880e45812..e6d0ef5cc 100644 --- a/core/embed/rust/src/ui/model_tt/screens.rs +++ b/core/embed/rust/src/ui/model_tt/screens.rs @@ -14,7 +14,6 @@ use crate::ui::display; #[cfg(feature = "new_rendering")] use crate::ui::{display::Color, shape::render_on_display}; - #[cfg(not(feature = "micropython"))] // SAFETY: Actually safe but see below unsafe fn get_str(text: &str) -> &str {