feat(core): lockscreen for mercury_ui

[no changelog]

core/embed/rust/src/ui/model_mercury/component/homescreen/mod.rs

@@ -7,8 +7,8 @@ use crate::{
     translations::TR,
     trezorhal::usb::usb_configured,
     ui::{
-        component::{Component, Event, EventCtx, Pad, TimerToken},
+        component::{Component, Event, EventCtx, TimerToken},
-        display::{self, tjpgd::jpeg_info, toif::Icon, Color, Font},
+        display::{tjpgd::jpeg_info, toif::Icon, Color, Font},
         event::{TouchEvent, USBEvent},
         geometry::{Alignment, Alignment2D, Insets, Offset, Point, Rect},
         layout::util::get_user_custom_image,
@@ -20,13 +20,16 @@ use crate::{
 use crate::{
     trezorhal::{buffers::BufferJpegWork, uzlib::UZLIB_WINDOW_SIZE},
     ui::{
-        constant::HEIGHT,
+        constant::{screen, HEIGHT},
         display::{
             tjpgd::BufferInput,
             toif::{Toif, ToifFormat},
         },
-        model_mercury::component::homescreen::render::{
+        model_mercury::{
-            HomescreenJpeg, HomescreenToif, HOMESCREEN_TOIF_SIZE,
+            component::homescreen::render::{HomescreenJpeg, HomescreenToif, HOMESCREEN_TOIF_SIZE},
+            theme::{
+                GREEN_LIGHT, GREY_LIGHT, ICON_CENTRAL_CIRCLE, ICON_KEY, ICON_LOCKSCREEN_FILTER,
+            },
         },
     },
 };
@@ -54,8 +57,6 @@ pub struct Homescreen {
     custom_image: Option<Gc<[u8]>>,
     hold_to_lock: bool,
     loader: Loader,
-    pad: Pad,
-    paint_notification_only: bool,
     delay: Option<TimerToken>,
 }
 
@@ -75,8 +76,6 @@ impl Homescreen {
             custom_image: get_user_custom_image().ok(),
             hold_to_lock,
             loader: Loader::with_lock_icon().with_durations(LOADER_DURATION, LOADER_DURATION / 3),
-            pad: Pad::with_background(theme::BG),
-            paint_notification_only: false,
             delay: None,
         }
     }
@@ -133,13 +132,8 @@ impl Homescreen {
         self.loader.render(target)
     }
 
-    pub fn set_paint_notification(&mut self) {
-        self.paint_notification_only = true;
-    }
-
     fn event_usb(&mut self, ctx: &mut EventCtx, event: Event) {
         if let Event::USB(USBEvent::Connected(_)) = event {
-            self.paint_notification_only = true;
             ctx.request_paint();
         }
     }
@@ -165,8 +159,6 @@ impl Homescreen {
             }
             Event::Timer(token) if Some(token) == self.delay => {
                 self.delay = None;
-                self.pad.clear();
-                self.paint_notification_only = false;
                 self.loader.start_growing(ctx, Instant::now());
             }
             _ => {}
@@ -178,8 +170,6 @@ impl Homescreen {
             }
             Some(LoaderMsg::ShrunkCompletely) => {
                 self.loader.reset();
-                self.pad.clear();
-                self.paint_notification_only = false;
                 ctx.request_paint()
             }
             None => {}
@@ -193,7 +183,6 @@ impl Component for Homescreen {
     type Msg = HomescreenMsg;
 
     fn place(&mut self, bounds: Rect) -> Rect {
-        self.pad.place(AREA);
         self.loader.place(AREA.translate(LOADER_OFFSET));
         bounds
     }
@@ -268,7 +257,6 @@ impl Component for Homescreen {
     }
 
     fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
-        self.pad.render(target);
         if self.loader.is_animating() || self.loader.is_completely_grown(Instant::now()) {
             self.render_loader(target);
         } else {
@@ -278,7 +266,7 @@ impl Component for Homescreen {
             };
 
             if is_image_jpeg(img_data) {
-                shape::JpegImage::new(self.pad.area.center(), img_data)
+                shape::JpegImage::new(AREA.center(), img_data)
                     .with_align(Alignment2D::CENTER)
                     .render(target);
             } else if is_image_toif(img_data) {
@@ -296,7 +284,7 @@ impl Component for Homescreen {
                     .render(target);
 
                 let style = theme::TEXT_DEMIBOLD;
-                let pos = Point::new(self.pad.area.center().x, LABEL_Y);
+                let pos = Point::new(AREA.center().x, LABEL_Y);
                 shape::Text::new(pos, t)
                     .with_align(Alignment::Center)
                     .with_font(style.text_font)
@@ -309,9 +297,7 @@ impl Component for Homescreen {
                 const NOTIFICATION_BORDER: i16 = 6;
                 const TEXT_ICON_SPACE: i16 = 8;
 
-                let banner = self
+                let banner = AREA
-                    .pad
-                    .area
                     .inset(Insets::sides(NOTIFICATION_BORDER))
                     .with_height(NOTIFICATION_HEIGHT)
                     .translate(Offset::y(NOTIFICATION_BORDER));
@@ -350,7 +336,7 @@ impl Component for Homescreen {
     #[cfg(feature = "ui_bounds")]
     fn bounds(&self, sink: &mut dyn FnMut(Rect)) {
         self.loader.bounds(sink);
-        sink(self.pad.area);
+        sink(AREA);
     }
 }
 
@@ -477,15 +463,25 @@ impl Component for Lockscreen<'_> {
             shape::JpegImage::new(center, img_data)
                 .with_align(Alignment2D::CENTER)
                 .with_blur(4)
-                .with_dim(140)
+                .with_dim(102)
-                .render(target);
-        } else if is_image_toif(img_data) {
-            shape::ToifImage::new(center, unwrap!(Toif::new(img_data)))
-                .with_align(Alignment2D::CENTER)
-                //.with_blur(5)
                 .render(target);
         }
 
+        shape::ToifImage::new(center, ICON_LOCKSCREEN_FILTER.toif)
+            .with_align(Alignment2D::CENTER)
+            .with_fg(Color::black())
+            .render(target);
+
+        shape::ToifImage::new(center + Offset::y(12), ICON_CENTRAL_CIRCLE.toif)
+            .with_align(Alignment2D::CENTER)
+            .with_fg(GREEN_LIGHT)
+            .render(target);
+
+        shape::ToifImage::new(center + Offset::y(12), ICON_KEY.toif)
+            .with_align(Alignment2D::CENTER)
+            .with_fg(GREY_LIGHT)
+            .render(target);
+
         let (locked, tap) = if self.bootscreen {
             (
                 TR::lockscreen__title_not_connected,
@@ -498,69 +494,49 @@ impl Component for Lockscreen<'_> {
         let mut label_style = theme::TEXT_DEMIBOLD;
         label_style.text_color = theme::GREY_LIGHT;
 
-        let mut texts: &[HomescreenText] = &[
+        let mut offset = 0;
-            HomescreenText {
-                text: "".into(),
-                style: theme::TEXT_NORMAL,
-                offset: Offset::new(2, COINJOIN_Y),
-                icon: Some(theme::ICON_COINJOIN),
-            },
-            HomescreenText {
-                text: locked.into(),
-                style: theme::TEXT_BOLD,
-                offset: Offset::y(LOCKED_Y),
-                icon: Some(theme::ICON_LOCK),
-            },
-            HomescreenText {
-                text: tap.into(),
-                style: theme::TEXT_NORMAL,
-                offset: Offset::y(TAP_Y),
-                icon: None,
-            },
-            HomescreenText {
-                text: self.label,
-                style: label_style,
-                offset: Offset::y(LABEL_Y),
-                icon: None,
-            },
-        ];
 
-        if !self.coinjoin_authorized {
+        self.label.map(|t| {
-            texts = &texts[1..];
+            offset = theme::TEXT_DEMIBOLD.text_font.visible_text_height(t);
-        }
+
+            let text_pos = Point::new(0, offset);
+
+            shape::Text::new(text_pos, t)
+                .with_font(theme::TEXT_DEMIBOLD.text_font)
+                .with_fg(theme::GREY_LIGHT)
+                .render(target);
+        });
 
-        for item in texts.iter() {
+        offset += 6;
-            item.text.map(|t| {
-                const TEXT_ICON_SPACE: i16 = 2;
 
-                let icon_width = match item.icon {
+        locked.map_translated(|t| {
-                    Some(icon) => icon.toif.width() + TEXT_ICON_SPACE,
+            offset += theme::TEXT_SUB_GREY.text_font.visible_text_height(t);
-                    None => 0,
-                };
 
-                let area = constant::screen();
+            let text_pos = Point::new(0, offset);
 
-                let text_pos = Point::new(
+            shape::Text::new(text_pos, t)
-                    item.style
+                .with_font(theme::TEXT_SUB_GREY.text_font)
-                        .text_font
+                .with_fg(theme::TEXT_SUB_GREY.text_color)
-                        .horz_center(area.x0 + icon_width, area.x1, t),
+                .render(target);
-                    0,
+        });
-                ) + item.offset;
 
-                shape::Text::new(text_pos, t)
+        tap.map_translated(|t| {
-                    .with_font(item.style.text_font)
+            offset = theme::TEXT_SUB_GREY.text_font.text_baseline();
-                    .with_fg(item.style.text_color)
-                    .render(target);
 
-                if let Some(icon) = item.icon {
+            let text_pos = Point::new(
-                    let icon_pos = Point::new(text_pos.x - icon_width, text_pos.y);
+                theme::TEXT_SUB_GREY
-                    shape::ToifImage::new(icon_pos, icon.toif)
+                    .text_font
-                        .with_align(Alignment2D::BOTTOM_LEFT)
+                    .horz_center(screen().x0, screen().x1, t),
-                        .with_fg(item.style.text_color)
+                screen().y1 - offset,
-                        .render(target);
+            );
-                }
+
-            });
+            shape::Text::new(text_pos, t)
-        }
+                .with_font(theme::TEXT_SUB_GREY.text_font)
+                .with_fg(theme::GREY_DARK)
+                .render(target);
+        });
+
+        // TODO coinjoin authorized text
     }
 }
 

core/embed/rust/src/ui/model_mercury/theme/mod.rs

@@ -91,6 +91,7 @@ include_icon!(ICON_CLOSE, "model_mercury/res/close30.toif");
 include_icon!(ICON_CONFIRM_INPUT, "model_mercury/res/confirm_input30.toif");
 include_icon!(ICON_DELETE, "model_mercury/res/delete30.toif");
 include_icon!(ICON_MENU, "model_mercury/res/menu30.toif");
+include_icon!(ICON_KEY, "model_mercury/res/key30.toif");
 include_icon!(
     ICON_SIMPLE_CHECKMARK,
     "model_mercury/res/simple_checkmark30.toif"
@@ -101,6 +102,13 @@ include_icon!(ICON_SIGN, "model_mercury/res/sign30.toif");
 include_icon!(ICON_MINUS, "model_mercury/res/minus40.toif");
 include_icon!(ICON_PLUS, "model_mercury/res/plus40.toif");
 
+// Homescreen
+include_icon!(
+    ICON_LOCKSCREEN_FILTER,
+    "model_mercury/res/lockscreen_filter.toif"
+);
+include_icon!(ICON_CENTRAL_CIRCLE, "model_mercury/res/central_circle.toif");
+
 // TODO remove TT icons:
 
 // Button icons.