refactor(core/mercury): remove unnecessary Child

[no changelog]

Author: mmilata

core/embed/rust/src/ui/model_mercury/component/coinjoin_progress.rs

@@ -6,9 +6,7 @@ use crate::{
     strutil::TString,
     translations::TR,
     ui::{
-        component::{
-            base::Never, Bar, Child, Component, ComponentExt, Empty, Event, EventCtx, Label, Split,
-        },
+        component::{base::Never, Bar, Component, Empty, Event, EventCtx, Label, Split},
         display::loader::{loader_circular_uncompress, LoaderDimensions},
         geometry::{Insets, Offset, Rect},
         model_mercury::constant,
@@ -30,7 +28,7 @@ const LOADER_SPEED: u16 = 5;
 pub struct CoinJoinProgress<U> {
     value: u16,
     indeterminate: bool,
-    content: Child<Frame<Split<Empty, U>>>,
+    content: Frame<Split<Empty, U>>,
     // Label is not a child since circular loader paints large black rectangle which overlaps it.
     // To work around this, draw label every time loader is drawn.
     label: Label<'static>,
@@ -65,8 +63,7 @@ where
             content: Frame::centered(
                 TR::coinjoin__title_progress.into(),
                 Split::bottom(RECTANGLE_HEIGHT, 0, Empty, inner),
-            )
-            .into_child(),
+            ),
             label: Label::centered(text, theme::TEXT_NORMAL),
         })
     }

core/embed/rust/src/ui/model_mercury/component/error.rs

@@ -1,7 +1,7 @@
 use crate::{
     strutil::TString,
     ui::{
-        component::{Child, Component, Event, EventCtx, Label, Never, Pad},
+        component::{Component, Event, EventCtx, Label, Never, Pad},
         constant::screen,
         geometry::{Alignment2D, Point, Rect},
         shape,
@@ -26,9 +26,9 @@ const STYLE: &ResultStyle = &super::theme::RESULT_ERROR;
 
 pub struct ErrorScreen<'a> {
     bg: Pad,
-    title: Child<Label<'a>>,
-    message: Child<Label<'a>>,
-    footer: Child<ResultFooter<'a>>,
+    title: Label<'a>,
+    message: Label<'a>,
+    footer: ResultFooter<'a>,
 }
 
 impl<'a> ErrorScreen<'a> {
@@ -42,9 +42,9 @@ impl<'a> ErrorScreen<'a> {
 
         Self {
             bg: Pad::with_background(FATAL_ERROR_COLOR).with_clear(),
-            title: Child::new(title),
-            message: Child::new(message),
-            footer: Child::new(footer),
+            title,
+            message,
+            footer,
         }
     }
 }

core/embed/rust/src/ui/model_mercury/component/fido.rs

@@ -1,9 +1,7 @@
 use crate::{
     strutil::TString,
     ui::{
-        component::{
-            image::Image, Child, Component, Event, EventCtx, Label, Swipe, SwipeDirection,
-        },
+        component::{image::Image, Component, Event, EventCtx, Label, Swipe, SwipeDirection},
         display,
         geometry::{Insets, Rect},
         model_mercury::component::{fido_icons::get_fido_icon_data, theme, ScrollBar},
@@ -30,7 +28,7 @@ pub struct FidoConfirm<F: Fn(usize) -> TString<'static>, U> {
     page_swipe: Swipe,
     app_name: Label<'static>,
     account_name: Label<'static>,
-    icon: Child<Image>,
+    icon: Image,
     /// Function/closure that will return appropriate page on demand.
     get_account: F,
     scrollbar: ScrollBar,
@@ -79,7 +77,7 @@ where
             app_name: Label::centered(app_name, theme::TEXT_DEMIBOLD),
             account_name: Label::centered(current_account, theme::TEXT_DEMIBOLD),
             page_swipe,
-            icon: Child::new(Image::new(icon_data)),
+            icon: Image::new(icon_data),
             get_account,
             scrollbar,
             fade: Cell::new(false),

core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs

@@ -2,7 +2,7 @@ use crate::{
     strutil::TString,
     ui::{
         component::{
-            maybe::paint_overlapping, Child, Component, Event, EventCtx, Label, Maybe, Swipe,
+            maybe::paint_overlapping, Component, Event, EventCtx, Label, Maybe, Swipe,
             SwipeDirection,
         },
         geometry::{Alignment, Grid, Insets, Rect},
@@ -24,17 +24,17 @@ pub enum MnemonicKeyboardMsg {
 
 pub struct MnemonicKeyboard<T> {
     /// Initial prompt, displayed on empty input.
-    prompt: Child<Maybe<Label<'static>>>,
+    prompt: Maybe<Label<'static>>,
     /// Delete a char button.
-    erase: Child<Maybe<Button>>,
+    erase: Maybe<Button>,
     /// Go to previous word button
-    back: Child<Maybe<Button>>,
+    back: Maybe<Button>,
     /// Input area, acting as the auto-complete and confirm button.
-    input: Child<Maybe<T>>,
+    input: Maybe<T>,
     /// Area with keypads - used for rounded overlay
     keypad_area: Rect,
     /// Key buttons.
-    keys: [Child<Button>; MNEMONIC_KEY_COUNT],
+    keys: [Button; MNEMONIC_KEY_COUNT],
     /// Swipe controller - allowing for going to the previous word.
     swipe: Swipe,
     /// Whether going back is allowed (is not on the very first word).
@@ -56,26 +56,20 @@ where
             .styled(theme::button_default())
             .with_expanded_touch_area(Insets::right(BACK_BUTTON_RIGHT_EXPAND));
         Self {
-            prompt: Child::new(Maybe::new(
+            prompt: Maybe::new(
                 theme::BG,
                 Label::centered(prompt, theme::TEXT_MAIN_GREY_LIGHT).vertically_centered(),
                 prompt_visible,
-            )),
-            erase: Child::new(Maybe::new(theme::BG, erase_btn, !prompt_visible)),
-            back: Child::new(Maybe::new(
-                theme::BG,
-                back_btn,
-                prompt_visible && can_go_back,
-            )),
-            input: Child::new(Maybe::new(theme::BG, input, !prompt_visible)),
+            ),
+            erase: Maybe::new(theme::BG, erase_btn, !prompt_visible),
+            back: Maybe::new(theme::BG, back_btn, prompt_visible && can_go_back),
+            input: Maybe::new(theme::BG, input, !prompt_visible),
             keypad_area: Rect::zero(),
-            keys: T::keys()
-                .map(|t| {
-                    Button::with_text(t.into())
-                        .styled(theme::button_keyboard())
-                        .with_text_align(Alignment::Center)
-                })
-                .map(Child::new),
+            keys: T::keys().map(|t| {
+                Button::with_text(t.into())
+                    .styled(theme::button_keyboard())
+                    .with_text_align(Alignment::Center)
+            }),
             swipe: Swipe::new().right(),
             can_go_back,
         }
@@ -90,32 +84,23 @@ where
     /// completion mask and the pending key.
     fn toggle_key_buttons(&mut self, ctx: &mut EventCtx) {
         for (key, btn) in self.keys.iter_mut().enumerate() {
-            let enabled = self
-                .input
-                .inner()
-                .inner()
-                .can_key_press_lead_to_a_valid_word(key);
-            btn.mutate(ctx, |ctx, b| b.enable_if(ctx, enabled));
+            let enabled = self.input.inner().can_key_press_lead_to_a_valid_word(key);
+            btn.enable_if(ctx, enabled);
         }
     }
 
     /// After edit operations, we need to either show or hide the prompt, the
     /// input, the erase button and the back button.
     fn toggle_prompt_or_input(&mut self, ctx: &mut EventCtx) {
-        let prompt_visible = self.input.inner().inner().is_empty();
-        self.prompt
-            .mutate(ctx, |ctx, p| p.show_if(ctx, prompt_visible));
-        self.input
-            .mutate(ctx, |ctx, i| i.show_if(ctx, !prompt_visible));
-        self.erase
-            .mutate(ctx, |ctx, b| b.show_if(ctx, !prompt_visible));
-        self.back.mutate(ctx, |ctx, b| {
-            b.show_if(ctx, prompt_visible && self.can_go_back)
-        });
+        let prompt_visible = self.input.inner().is_empty();
+        self.prompt.show_if(ctx, prompt_visible);
+        self.input.show_if(ctx, !prompt_visible);
+        self.erase.show_if(ctx, !prompt_visible);
+        self.back.show_if(ctx, prompt_visible && self.can_go_back);
     }
 
     pub fn mnemonic(&self) -> Option<&'static str> {
-        self.input.inner().inner().mnemonic()
+        self.input.inner().mnemonic()
     }
 }
 
@@ -181,23 +166,20 @@ where
 
         match self.erase.event(ctx, event) {
             Some(ButtonMsg::Clicked) => {
-                self.input
-                    .mutate(ctx, |ctx, i| i.inner_mut().on_backspace_click(ctx));
+                self.input.inner_mut().on_backspace_click(ctx);
                 self.on_input_change(ctx);
                 return None;
             }
             Some(ButtonMsg::LongPressed) => {
-                self.input
-                    .mutate(ctx, |ctx, i| i.inner_mut().on_backspace_long_press(ctx));
+                self.input.inner_mut().on_backspace_long_press(ctx);
                 self.on_input_change(ctx);
                 return None;
             }
             _ => {}
         }
         for (key, btn) in self.keys.iter_mut().enumerate() {
             if let Some(ButtonMsg::Clicked) = btn.event(ctx, event) {
-                self.input
-                    .mutate(ctx, |ctx, i| i.inner_mut().on_key_click(ctx, key));
+                self.input.inner_mut().on_key_click(ctx, key);
                 self.on_input_change(ctx);
                 return None;
             }
@@ -213,7 +195,7 @@ where
     }
 
     fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
-        if self.input.inner().inner().is_empty() {
+        if self.input.inner().is_empty() {
             self.prompt.render(target);
             if self.can_go_back {
                 self.back.render(target);