From f0865e3b10e75c92e96d8e79b52f6ad22c8a8514 Mon Sep 17 00:00:00 2001
From: obrusvit <vit.obrusnik@gmail.com>
Date: Tue, 3 Jun 2025 10:48:18 +0200
Subject: [PATCH] feat(eckhart): fuel gauge UI

- fuel gauge (battery state) with icons for charging/discharging state
and soc percentage
- on attach on Homescreen ActionBar
- permanently on the first DeviceMenu subscreen
- temporarily in the Header on charging state update

[no changelog]
---
 core/Makefile                                 |   2 +-
 .../embed/rust/src/trezorhal/power_manager.rs |   1 +
 core/embed/rust/src/ui/component/base.rs      |   2 +-
 .../src/ui/layout_eckhart/component/button.rs |  24 +-
 .../ui/layout_eckhart/firmware/action_bar.rs  |  15 ++
 .../firmware/device_menu_screen.rs            |  27 +--
 .../ui/layout_eckhart/firmware/fuel_gauge.rs  | 220 ++++++++++++++++++
 .../src/ui/layout_eckhart/firmware/header.rs  |  52 +++--
 .../ui/layout_eckhart/firmware/homescreen.rs  |  66 ++++--
 .../src/ui/layout_eckhart/firmware/mod.rs     |   2 +
 .../ui/layout_eckhart/res/battery/empty.png   | Bin 0 -> 341 bytes
 .../ui/layout_eckhart/res/battery/empty.toif  | Bin 0 -> 90 bytes
 .../ui/layout_eckhart/res/battery/full.png    | Bin 0 -> 280 bytes
 .../ui/layout_eckhart/res/battery/full.toif   | Bin 0 -> 98 bytes
 .../src/ui/layout_eckhart/res/battery/low.png | Bin 0 -> 271 bytes
 .../ui/layout_eckhart/res/battery/low.toif    | Bin 0 -> 98 bytes
 .../src/ui/layout_eckhart/res/battery/mid.png | Bin 0 -> 283 bytes
 .../ui/layout_eckhart/res/battery/mid.toif    | Bin 0 -> 103 bytes
 .../src/ui/layout_eckhart/res/battery/zap.png | Bin 0 -> 243 bytes
 .../ui/layout_eckhart/res/battery/zap.toif    | Bin 0 -> 103 bytes
 .../src/ui/layout_eckhart/res/battery_bar.png | Bin 154 -> 0 bytes
 .../ui/layout_eckhart/res/battery_bar.toif    | Bin 25 -> 0 bytes
 .../src/ui/layout_eckhart/res/battery_zap.png | Bin 236 -> 0 bytes
 .../ui/layout_eckhart/res/battery_zap.toif    | Bin 97 -> 0 bytes
 .../src/ui/layout_eckhart/theme/firmware.rs   |   2 +
 .../rust/src/ui/layout_eckhart/theme/mod.rs   |   7 +-
 26 files changed, 363 insertions(+), 57 deletions(-)
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/firmware/fuel_gauge.rs
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/empty.png
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/empty.toif
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/full.png
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/full.toif
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/low.png
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/low.toif
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/mid.png
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/mid.toif
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/zap.png
 create mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery/zap.toif
 delete mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery_bar.png
 delete mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery_bar.toif
 delete mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery_zap.png
 delete mode 100644 core/embed/rust/src/ui/layout_eckhart/res/battery_zap.toif

diff --git a/core/Makefile b/core/Makefile
index 2545d3e7ba..2ce733d985 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -179,7 +179,7 @@ test: ## run unit tests
 test_rust: ## run rs unit tests
 	export BUILD_DIR=$(abspath $(UNIX_BUILD_DIR)) ; \
 	cd embed/rust ; cargo test $(TESTOPTS) --target=$(RUST_TARGET) \
-		--no-default-features --features $(LAYOUT_FEATURE),test \
+		--no-default-features --features $(LAYOUT_FEATURE),power_manager,test \
 		-- --test-threads=1 --nocapture
 
 test_emu: ## run selected device tests from python-trezor
diff --git a/core/embed/rust/src/trezorhal/power_manager.rs b/core/embed/rust/src/trezorhal/power_manager.rs
index 8b8b0b8145..eba7c4b2e8 100644
--- a/core/embed/rust/src/trezorhal/power_manager.rs
+++ b/core/embed/rust/src/trezorhal/power_manager.rs
@@ -3,6 +3,7 @@ use super::ffi;
 #[cfg(feature = "ui")]
 use crate::ui::event::PMEvent;
 
+#[derive(PartialEq, Eq, Copy, Clone)]
 pub enum ChargingState {
     Discharging,
     Charging,
diff --git a/core/embed/rust/src/ui/component/base.rs b/core/embed/rust/src/ui/component/base.rs
index da13168ec5..ce8393d09a 100644
--- a/core/embed/rust/src/ui/component/base.rs
+++ b/core/embed/rust/src/ui/component/base.rs
@@ -424,7 +424,7 @@ impl Timer {
         self.token().0 == Timer::INVALID_TOKEN_VALUE
     }
 
-    const fn is_running(&self) -> bool {
+    pub const fn is_running(&self) -> bool {
         self.0 & Timer::IS_RUNNING_BITMASK != 0
     }
 
diff --git a/core/embed/rust/src/ui/layout_eckhart/component/button.rs b/core/embed/rust/src/ui/layout_eckhart/component/button.rs
index e73b3e3842..eb3e401fd5 100644
--- a/core/embed/rust/src/ui/layout_eckhart/component/button.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/component/button.rs
@@ -15,11 +15,11 @@ use crate::{
     },
 };
 
+use super::super::theme;
+
 #[cfg(feature = "bootloader")]
 use super::super::fonts;
 
-use super::super::theme;
-
 pub enum ButtonMsg {
     Pressed,
     Released,
@@ -236,9 +236,7 @@ impl Button {
     }
 
     pub fn set_content(&mut self, content: ButtonContent) {
-        if self.content != content {
-            self.content = content
-        }
+        self.content = content
     }
 
     pub fn set_expanded_touch_area(&mut self, expand: Insets) {
@@ -253,6 +251,10 @@ impl Button {
         &self.content
     }
 
+    pub fn content_mut(&mut self) -> &mut ButtonContent {
+        &mut self.content
+    }
+
     pub fn content_offset(&self) -> Offset {
         self.content_offset
     }
@@ -301,7 +303,7 @@ impl Button {
                 text.map(|t| self.text_height(t, false, width) + self.baseline_subtext_height())
             }
             #[cfg(feature = "micropython")]
-            ButtonContent::HomeBar(_) => theme::ACTION_BAR_HEIGHT,
+            ButtonContent::HomeBar(..) => theme::ACTION_BAR_HEIGHT,
         }
     }
 
@@ -407,7 +409,7 @@ impl Button {
     }
 
     fn render_content<'s>(
-        &self,
+        &'s self,
         target: &mut impl Renderer<'s>,
         stylesheet: &ButtonStyle,
         alpha: u8,
@@ -558,7 +560,7 @@ impl Button {
         }
     }
 
-    pub fn render_with_alpha<'s>(&self, target: &mut impl Renderer<'s>, alpha: u8) {
+    pub fn render_with_alpha<'s>(&'s self, target: &mut impl Renderer<'s>, alpha: u8) {
         let style = self.style();
         self.render_background(target, style, alpha);
         self.render_content(target, style, alpha);
@@ -690,7 +692,9 @@ impl crate::trace::Trace for Button {
                 t.string("text", *text);
             }
             #[cfg(feature = "micropython")]
-            ButtonContent::HomeBar(text) => t.string("text", text.unwrap_or(TString::empty())),
+            ButtonContent::HomeBar(text) => {
+                t.string("text", text.unwrap_or(TString::empty()));
+            }
         }
     }
 }
@@ -711,7 +715,7 @@ impl State {
     }
 }
 
-#[derive(PartialEq, Eq, Clone)]
+#[derive(Clone)]
 pub enum ButtonContent {
     Empty,
     Text {
diff --git a/core/embed/rust/src/ui/layout_eckhart/firmware/action_bar.rs b/core/embed/rust/src/ui/layout_eckhart/firmware/action_bar.rs
index 259d2be092..a78aa11ef9 100644
--- a/core/embed/rust/src/ui/layout_eckhart/firmware/action_bar.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/firmware/action_bar.rs
@@ -177,6 +177,21 @@ impl ActionBar {
         }
     }
 
+    pub fn left_button(&self) -> Option<&Button> {
+        self.left_button.as_ref()
+    }
+
+    pub fn left_button_mut(&mut self) -> Option<&mut Button> {
+        self.left_button.as_mut()
+    }
+    pub fn right_button(&self) -> Option<&Button> {
+        self.right_button.as_ref()
+    }
+
+    pub fn right_button_mut(&mut self) -> Option<&mut Button> {
+        self.right_button.as_mut()
+    }
+
     fn new(
         mode: Mode,
         left_button: Option<Button>,
diff --git a/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs b/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs
index cd7cade7b6..714b44f9ab 100644
--- a/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/firmware/device_menu_screen.rs
@@ -14,19 +14,21 @@ use crate::{
             Component, Event, EventCtx,
         },
         geometry::Rect,
-        layout_eckhart::{
-            component::{Button, ButtonStyleSheet},
-            constant::SCREEN,
-            firmware::{
-                Header, HeaderMsg, TextScreen, TextScreenMsg, VerticalMenu, VerticalMenuScreen,
-                VerticalMenuScreenMsg, SHORT_MENU_ITEMS,
-            },
-        },
         shape::Renderer,
     },
 };
 
-use super::{theme, ShortMenuVec};
+use super::{
+    super::{
+        component::{Button, ButtonStyleSheet},
+        constant::SCREEN,
+        firmware::{
+            FuelGauge, Header, HeaderMsg, TextScreen, TextScreenMsg, VerticalMenu,
+            VerticalMenuScreen, VerticalMenuScreenMsg, SHORT_MENU_ITEMS,
+        },
+    },
+    theme, ShortMenuVec,
+};
 use heapless::Vec;
 
 const MAX_DEPTH: usize = 3;
@@ -37,10 +39,9 @@ const DISCONNECT_DEVICE_MENU_INDEX: usize = 1;
 
 #[derive(Clone)]
 enum Action {
-    // Go to another registered subscreen
+    /// Go to another registered subscreen
     GoTo(usize),
-
-    // Return a DeviceMenuMsg to the caller
+    /// Return a DeviceMenuMsg to the caller
     Return(DeviceMenuMsg),
 }
 
@@ -381,7 +382,7 @@ impl<'a> DeviceMenuScreen<'a> {
                 }
                 let mut header = Header::new(submenu.header_text).with_close_button();
                 if submenu.show_battery {
-                    // TODO: add battery
+                    header = header.with_fuel_gauge(Some(FuelGauge::always()));
                 } else {
                     header = header.with_left_button(
                         Button::with_icon(theme::ICON_CHEVRON_LEFT),
diff --git a/core/embed/rust/src/ui/layout_eckhart/firmware/fuel_gauge.rs b/core/embed/rust/src/ui/layout_eckhart/firmware/fuel_gauge.rs
new file mode 100644
index 0000000000..1309c36342
--- /dev/null
+++ b/core/embed/rust/src/ui/layout_eckhart/firmware/fuel_gauge.rs
@@ -0,0 +1,220 @@
+use crate::{
+    trezorhal::power_manager::{self, ChargingState},
+    ui::{
+        component::{Component, Event, EventCtx, Never, Timer},
+        display::{Color, Font, Icon},
+        geometry::{Alignment, Alignment2D, Offset, Point, Rect},
+        shape::{self, Renderer},
+        util::animation_disabled,
+    },
+};
+
+use super::super::{
+    fonts,
+    theme::{
+        firmware::FUEL_GAUGE_DURATION, GREY_LIGHT, ICON_BATTERY_EMPTY, ICON_BATTERY_FULL,
+        ICON_BATTERY_LOW, ICON_BATTERY_MID, ICON_BATTERY_ZAP, RED, YELLOW,
+    },
+};
+
+/// Component for showing a small fuel gauge (battery status) consisting of:
+/// - icon indicating charging or discharging state
+/// - percentage
+#[derive(Clone)]
+pub struct FuelGauge {
+    /// Area where the fuel gauge is rendered
+    area: Rect,
+    /// Alignment of the fuel gauge within its area
+    alignment: Alignment,
+    /// Mode of the fuel gauge (Always or OnChrgStatusChange)
+    mode: FuelGaugeMode,
+    /// State of battery charging
+    charging_state: ChargingState,
+    /// State of charge (0-100) [%]
+    soc: Option<u8>,
+    /// Timer to track temporary battery status showcase
+    timer: Timer,
+    /// Font used for the soc percentage
+    font: Font,
+}
+
+#[derive(Clone, PartialEq)]
+pub enum FuelGaugeMode {
+    /// Always show the fuel gauge
+    Always,
+    /// Show the fuel gauge only when charging state changes
+    OnChargingChange,
+    /// Show the fuel gauge when charging state changes or when attached
+    OnChargingChangeOrAttach,
+}
+
+impl FuelGauge {
+    pub const fn always() -> Self {
+        Self::new(FuelGaugeMode::Always)
+    }
+
+    pub const fn on_charging_change() -> Self {
+        Self::new(FuelGaugeMode::OnChargingChange)
+    }
+
+    pub const fn on_charging_change_or_attach() -> Self {
+        Self::new(FuelGaugeMode::OnChargingChangeOrAttach)
+    }
+
+    pub const fn with_alignment(mut self, alignment: Alignment) -> Self {
+        self.alignment = alignment;
+        self
+    }
+
+    pub const fn with_font(mut self, font: Font) -> Self {
+        self.font = font;
+        self
+    }
+
+    pub fn update_pm_state(&mut self) {
+        self.soc = Some(power_manager::soc());
+        self.charging_state = power_manager::charging_state();
+    }
+
+    pub fn should_be_shown(&self) -> bool {
+        match self.mode {
+            FuelGaugeMode::Always => true,
+            FuelGaugeMode::OnChargingChange | FuelGaugeMode::OnChargingChangeOrAttach => {
+                self.timer.is_running()
+            }
+        }
+    }
+
+    const fn new(mode: FuelGaugeMode) -> Self {
+        Self {
+            area: Rect::zero(),
+            alignment: Alignment::Start,
+            mode,
+            charging_state: ChargingState::Idle,
+            soc: None,
+            timer: Timer::new(),
+            font: fonts::FONT_SATOSHI_REGULAR_22,
+        }
+    }
+
+    /// Returns the icon, color for the icon, and color for the text based on
+    /// the charging state and state of charge (soc).
+    fn battery_indication(&self, charging_state: ChargingState, soc: u8) -> (Icon, Color, Color) {
+        const SOC_THRESHOLD_FULL: u8 = 80;
+        const SOC_THRESHOLD_MID: u8 = 25;
+        const SOC_THRESHOLD_LOW: u8 = 9;
+        match charging_state {
+            ChargingState::Charging => (ICON_BATTERY_ZAP, YELLOW, GREY_LIGHT),
+            ChargingState::Discharging | ChargingState::Idle => {
+                if soc > SOC_THRESHOLD_FULL {
+                    (ICON_BATTERY_FULL, GREY_LIGHT, GREY_LIGHT)
+                } else if soc > SOC_THRESHOLD_MID {
+                    (ICON_BATTERY_MID, GREY_LIGHT, GREY_LIGHT)
+                } else if soc > SOC_THRESHOLD_LOW {
+                    (ICON_BATTERY_LOW, YELLOW, GREY_LIGHT)
+                } else {
+                    (ICON_BATTERY_EMPTY, RED, RED)
+                }
+            }
+        }
+    }
+}
+
+impl Component for FuelGauge {
+    type Msg = Never;
+
+    fn place(&mut self, bounds: Rect) -> Rect {
+        self.area = bounds;
+        self.area
+    }
+
+    fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        match event {
+            Event::Attach(_) => {
+                if self.soc.is_none() {
+                    self.update_pm_state();
+                }
+                if !animation_disabled() && self.mode == FuelGaugeMode::OnChargingChangeOrAttach {
+                    self.timer.start(ctx, FUEL_GAUGE_DURATION.into());
+                }
+                ctx.request_paint();
+            }
+            Event::PM(e) => {
+                self.update_pm_state();
+                match self.mode {
+                    FuelGaugeMode::Always => {
+                        ctx.request_paint();
+                    }
+                    FuelGaugeMode::OnChargingChange | FuelGaugeMode::OnChargingChangeOrAttach => {
+                        if e.charging_status_changed {
+                            self.timer.start(ctx, FUEL_GAUGE_DURATION.into());
+                            ctx.request_paint();
+                        }
+                    }
+                }
+            }
+            Event::Timer(_) => {
+                if self.timer.expire(event) {
+                    ctx.request_paint();
+                }
+            }
+            _ => {}
+        }
+
+        None
+    }
+
+    fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
+        const ICON_PERCENT_GAP: i16 = 16;
+
+        let soc = self.soc.unwrap_or(0);
+        let (icon, color_icon, color_text) = self.battery_indication(self.charging_state, soc);
+        let soc_percent_fmt = if self.soc.is_none() {
+            uformat!("--")
+        } else {
+            uformat!("{} %", soc)
+        };
+        let text_width = self.font.text_width(&soc_percent_fmt);
+        let text_height = self.font.text_height();
+        let icon_width = icon.toif.width();
+        let icon_height = icon.toif.height();
+
+        let (point, alignment) = match self.alignment {
+            Alignment::Start => (self.area.left_center(), Alignment2D::CENTER_LEFT),
+            Alignment::End => (self.area.right_center(), Alignment2D::CENTER_RIGHT),
+            Alignment::Center => (self.area.center(), Alignment2D::CENTER),
+        };
+
+        let area = Rect::snap(
+            point,
+            Offset::new(
+                icon_width + ICON_PERCENT_GAP + text_width,
+                text_height.max(icon_height),
+            ),
+            alignment,
+        );
+        let text_y_coord = self.font.vert_center(area.y0, area.y1, &soc_percent_fmt);
+
+        shape::ToifImage::new(area.left_center(), icon.toif)
+            .with_fg(color_icon)
+            .with_align(Alignment2D::CENTER_LEFT)
+            .render(target);
+
+        shape::Text::new(
+            Point::new(area.x1, text_y_coord),
+            &soc_percent_fmt,
+            self.font,
+        )
+        .with_fg(color_text)
+        .with_align(Alignment::End)
+        .render(target);
+    }
+}
+
+#[cfg(feature = "ui_debug")]
+impl crate::trace::Trace for FuelGauge {
+    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
+        t.component("FuelGauge");
+        t.int("soc", self.soc.unwrap_or(0) as i64);
+    }
+}
diff --git a/core/embed/rust/src/ui/layout_eckhart/firmware/header.rs b/core/embed/rust/src/ui/layout_eckhart/firmware/header.rs
index fecbefe7f3..7f7ac1c37e 100644
--- a/core/embed/rust/src/ui/layout_eckhart/firmware/header.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/firmware/header.rs
@@ -9,7 +9,10 @@ use crate::{
 };
 
 use super::{
-    super::component::{Button, ButtonContent, ButtonMsg},
+    super::{
+        component::{Button, ButtonContent, ButtonMsg},
+        firmware::FuelGauge,
+    },
     constant, theme,
 };
 
@@ -31,6 +34,8 @@ pub struct Header {
     /// icon in the top-left corner (used instead of left button)
     icon: Option<Icon>,
     icon_color: Option<Color>,
+    /// Battery status indicator
+    fuel_gauge: Option<FuelGauge>,
 }
 
 #[derive(Copy, Clone)]
@@ -56,6 +61,7 @@ impl Header {
             left_button_msg: HeaderMsg::Cancelled,
             icon: None,
             icon_color: None,
+            fuel_gauge: Some(FuelGauge::on_charging_change()),
         }
     }
 
@@ -115,6 +121,11 @@ impl Header {
         }
     }
 
+    #[inline(never)]
+    pub fn with_fuel_gauge(self, fuel_gauge: Option<FuelGauge>) -> Self {
+        Self { fuel_gauge, ..self }
+    }
+
     #[inline(never)]
     pub fn update_title(&mut self, ctx: &mut EventCtx, title: TString<'static>) {
         self.title.set_text(title);
@@ -148,24 +159,31 @@ impl Component for Header {
 
         let bounds = bounds.inset(Self::HEADER_INSETS);
         let rest = if let Some(b) = &mut self.right_button {
-            let (rest, button_area) = bounds.split_right(Self::HEADER_BUTTON_WIDTH);
-            b.place(button_area);
+            let (rest, right_button_area) = bounds.split_right(Self::HEADER_BUTTON_WIDTH);
+            b.place(right_button_area);
             rest
         } else {
             bounds
         };
 
         let icon_width = self.left_icon_width();
-        let (rest, title_area) = rest.split_left(icon_width);
+        let (left_button_area, title_area) = rest.split_left(icon_width);
 
-        self.left_button.place(rest);
+        self.left_button.place(left_button_area);
         self.title.place(title_area);
+        self.fuel_gauge.place(title_area.union(left_button_area));
+        if let Some(fuel_gauge) = &mut self.fuel_gauge {
+            // Force update the fuel gauge state, so it is up-to-date
+            // necessary e.g. for the first DeviceMenu Submenu re-entry
+            fuel_gauge.update_pm_state();
+        }
+
         self.area = bounds;
         bounds
     }
 
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
-        self.title.event(ctx, event);
+        self.fuel_gauge.event(ctx, event);
 
         if let Some(ButtonMsg::Clicked) = self.left_button.event(ctx, event) {
             return Some(self.left_button_msg);
@@ -179,14 +197,22 @@ impl Component for Header {
 
     fn render<'s>(&'s self, target: &mut impl Renderer<'s>) {
         self.right_button.render(target);
-        self.left_button.render(target);
-        if let Some(icon) = self.icon {
-            shape::ToifImage::new(self.area.left_center(), icon.toif)
-                .with_fg(self.icon_color.unwrap_or(theme::GREY_LIGHT))
-                .with_align(Alignment2D::CENTER_LEFT)
-                .render(target);
+        if self
+            .fuel_gauge
+            .as_ref()
+            .is_some_and(|fg| fg.should_be_shown())
+        {
+            self.fuel_gauge.render(target);
+        } else {
+            self.left_button.render(target);
+            if let Some(icon) = self.icon {
+                shape::ToifImage::new(self.area.left_center(), icon.toif)
+                    .with_fg(self.icon_color.unwrap_or(theme::GREY_LIGHT))
+                    .with_align(Alignment2D::CENTER_LEFT)
+                    .render(target);
+            }
+            self.title.render(target);
         }
-        self.title.render(target);
     }
 }
 
diff --git a/core/embed/rust/src/ui/layout_eckhart/firmware/homescreen.rs b/core/embed/rust/src/ui/layout_eckhart/firmware/homescreen.rs
index 8cd3369df2..a5f7daec64 100644
--- a/core/embed/rust/src/ui/layout_eckhart/firmware/homescreen.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/firmware/homescreen.rs
@@ -7,21 +7,22 @@ use crate::{
     ui::{
         component::{text::TextStyle, Component, Event, EventCtx, Label, Never},
         display::{image::ImageInfo, Color},
-        geometry::{Alignment2D, Insets, Offset, Point, Rect},
+        geometry::{Alignment, Alignment2D, Insets, Offset, Point, Rect},
         layout::util::get_user_custom_image,
         lerp::Lerp,
         shape::{self, Renderer},
+        util::animation_disabled,
     },
 };
 
 use super::{
     super::{
-        component::{Button, ButtonMsg},
+        component::{Button, ButtonContent, ButtonMsg},
         fonts,
     },
     constant::{HEIGHT, SCREEN, WIDTH},
     theme::{self, firmware::button_homebar_style, TILES_GRID},
-    ActionBar, ActionBarMsg, Hint,
+    ActionBar, ActionBarMsg, FuelGauge, Hint,
 };
 
 const LOCK_HOLD_DURATION: ShortDuration = ShortDuration::from_millis(3000);
@@ -42,8 +43,12 @@ pub struct Homescreen {
     lockable: bool,
     /// Whether the homescreen is locked
     locked: bool,
+    /// Whether the homescreen is a boot screen
+    bootscreen: bool,
     /// Hold to lock button placed everywhere except the `action_bar`
     virtual_locking_button: Button,
+    /// Fuel gauge (battery status indicator) rendered in the `action_bar` area
+    fuel_gauge: FuelGauge,
 }
 
 pub enum HomescreenMsg {
@@ -91,31 +96,53 @@ impl Homescreen {
             led_color = None;
         }
 
-        // ActionBar button
-        let button_style = button_homebar_style(notification_level);
-        let button = if bootscreen {
-            Button::with_homebar_content(Some(TR::lockscreen__tap_to_connect.into()))
-                .styled(button_style)
-        } else if locked {
-            Button::with_homebar_content(Some(TR::lockscreen__tap_to_unlock.into()))
-                .styled(button_style)
-        } else {
-            // TODO: Battery/Connectivity button content
-            Button::with_homebar_content(None).styled(button_style)
-        };
-
         Ok(Self {
             label: HomeLabel::new(label, shadow),
             hint,
-            action_bar: ActionBar::new_single(button),
+            action_bar: ActionBar::new_single(
+                Button::new(Self::homebar_content(bootscreen, locked))
+                    .styled(button_homebar_style(notification_level)),
+            ),
             image,
             led_color,
             lockable,
             locked,
+            bootscreen,
             virtual_locking_button: Button::empty().with_long_press(LOCK_HOLD_DURATION),
+            fuel_gauge: FuelGauge::on_charging_change_or_attach()
+                .with_alignment(Alignment::Center)
+                .with_font(fonts::FONT_SATOSHI_MEDIUM_26),
         })
     }
 
+    fn homebar_content(bootscreen: bool, locked: bool) -> ButtonContent {
+        let text = if bootscreen {
+            Some(TR::lockscreen__tap_to_connect.into())
+        } else if locked {
+            Some(TR::lockscreen__tap_to_unlock.into())
+        } else {
+            None
+        };
+        ButtonContent::HomeBar(text)
+    }
+
+    fn event_fuel_gauge(&mut self, ctx: &mut EventCtx, event: Event) {
+        if animation_disabled() {
+            return;
+        }
+
+        self.fuel_gauge.event(ctx, event);
+        let bar_content = if self.fuel_gauge.should_be_shown() {
+            ButtonContent::Empty
+        } else {
+            Self::homebar_content(self.bootscreen, self.locked)
+        };
+
+        if let Some(b) = self.action_bar.right_button_mut() {
+            b.set_content(bar_content)
+        }
+    }
+
     fn event_hold(&mut self, ctx: &mut EventCtx, event: Event) -> bool {
         if let Some(ButtonMsg::LongPressed) = self.virtual_locking_button.event(ctx, event) {
             return true;
@@ -146,6 +173,7 @@ impl Component for Homescreen {
 
         self.label.place(label_area);
         self.action_bar.place(bar_area);
+        self.fuel_gauge.place(bar_area);
         // Locking button is placed everywhere except the action bar
         let locking_area = bounds.inset(Insets::bottom(self.action_bar.touch_area().height()));
         self.virtual_locking_button.place(locking_area);
@@ -153,6 +181,7 @@ impl Component for Homescreen {
     }
 
     fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
+        self.event_fuel_gauge(ctx, event);
         if let Some(ActionBarMsg::Confirmed) = self.action_bar.event(ctx, event) {
             if self.locked {
                 return Some(HomescreenMsg::Dismissed);
@@ -178,6 +207,9 @@ impl Component for Homescreen {
         self.label.render(target);
         self.hint.render(target);
         self.action_bar.render(target);
+        if self.fuel_gauge.should_be_shown() {
+            self.fuel_gauge.render(target);
+        }
     }
 }
 
diff --git a/core/embed/rust/src/ui/layout_eckhart/firmware/mod.rs b/core/embed/rust/src/ui/layout_eckhart/firmware/mod.rs
index ccb5825230..31db4a57a8 100644
--- a/core/embed/rust/src/ui/layout_eckhart/firmware/mod.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/firmware/mod.rs
@@ -5,6 +5,7 @@ mod device_menu_screen;
 mod fido;
 #[rustfmt::skip]
 mod fido_icons;
+mod fuel_gauge;
 mod header;
 mod hint;
 mod hold_to_confirm;
@@ -25,6 +26,7 @@ pub use brightness_screen::SetBrightnessScreen;
 pub use confirm_homescreen::{ConfirmHomescreen, ConfirmHomescreenMsg};
 pub use device_menu_screen::{DeviceMenuMsg, DeviceMenuScreen};
 pub use fido::{FidoAccountName, FidoCredential};
+pub use fuel_gauge::FuelGauge;
 pub use header::{Header, HeaderMsg};
 pub use hint::Hint;
 pub use hold_to_confirm::HoldToConfirmAnim;
diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/empty.png b/core/embed/rust/src/ui/layout_eckhart/res/battery/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..d083e7e502711808a8487eab972bc37137dc780d
GIT binary patch
literal 341
zcmWlU%S%FG6vRItb<NTWAth?jCNfA`v<ep{_oBB_B6}i1MYX6!fwfFBDa|CM49PNt
zAnlz6LW>G!{;|Fmzca(YIh?`CR5)O>c3XuIHa)0LOYM<#Sj=+bjmIpmNoQQ02&jU;
zNFm28er43M6I_f5(dzieAW*`MOUBBs9?}#(G@C5$kyf1I!2f?Kud8D-1I+OV7pQk4
z>1#7P=Y0xlP4kvsT-i}Ep~!=XVHfW><L$7S_aPo?JV$m8RaVR{y9c*?TIc($1os>L
ztVeB3FoREKVr*;%kl-^5D_eVmOo&MjzTzV0W?IF!B7ZNSJh~(dNaKkWTt>Ey4n8i7
z@&y%K^KLxCX9rS4XlQY~u*9kdDKE-6_S*XtCh;S;9=e#~cXVH9s3EH(@8n0jEGTp>
Ltm4(bj6>@m+7ggD

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/empty.toif b/core/embed/rust/src/ui/layout_eckhart/res/battery/empty.toif
new file mode 100644
index 0000000000000000000000000000000000000000..4373f059648eeb9f2cfac619157d643a89d2653c
GIT binary patch
literal 90
zcmV-g0Hyy_Pf14{01yC90000}c>Ny=)-y3MJbHfy3jXRbF#P6VfP#ko3=H=f;NTqt
w!+8YnH!82;J__$YnY{a`Hrzw-{sINqVVnY>%O2g|4Fw=qEBuD}=p4{T04G`|qyPW_

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/full.png b/core/embed/rust/src/ui/layout_eckhart/res/battery/full.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d40d33c6f7877945dee04cc2b04170d059d3be7
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZA!2%@LAG@9cq?nSt-CY>|xA&jf59DzcctjR6
zFmMZlFeAgPITAoY_7YEDSN4}|%p95~+}#aMK%teME{-7@=Z{Xl$a~0v$2nf${{a?X
z_XMG^#O5*<vxioWyBU=Wd@kfA)J3fjc;xrJ`M=W5jmnk{F?-#X7Eb-#baLm$=Z;Uz
zwdQm#*0o{v)Rhd-URiJ5m9h2Q9HCw3^t#@>+3;o}TfqE11!=m~W|oTkUG|A{Fn$P1
z^t@uvncR3G%6Rp5pAd(3)gO!>uC9p-n*4Z)TTsQ%bE^F(C;fIm>9}sf$B@NsU!!dq
Yl_WNp-?E#10qAH3Pgg&ebxsLQ057v=yZ`_I

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/full.toif b/core/embed/rust/src/ui/layout_eckhart/res/battery/full.toif
new file mode 100644
index 0000000000000000000000000000000000000000..896cb3d765bf7652d1648085135bb576be9068bf
GIT binary patch
literal 98
zcmV-o0G<C-Pf14{01yCH0000}c>Ny=)-y3MJbHfy3jXRbF#P6VfP#ko3=H=Rc0&RC
zI|hdH8({i)exvdl?xXPjlgYb}YQwz(n9JDz0$s)qb6Ek<WsmN|Tn2Kr!f%+qb3h*f
E0IGN^tN;K2

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/low.png b/core/embed/rust/src/ui/layout_eckhart/res/battery/low.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb29ed950883207a0f2d76f1163ea1b880f72e4a
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZA!2%@LAG@9cq?nSt-CY>|xA&jf59DzcctjR6
zFmMZlFeAgPITAoY_7YEDSN4}|%p95~+}#aMK%oVmE{-7@=Z{W4$lK%~;&NY#djs<|
zp*KBz3zRoDEoJsjSj%8lA;;s@!?;QOxykH5-^=+vGcG=PF*mk%k7&;w%a011*L9sZ
zqI#ydEbBDi%~dZyUtwJ1tM;1L#9Hs5oX@YK)d`nw%71J5BUq`yz}T@g!SjlJ<4y*i
zT#kn|DT|o$SQgw)cyws?m9+EzX0NKh#(dfn`RPY!k-@FE7OO7SRfhSWyE`k?K#1QC
P=vD?#S3j3^P6<r_OWkFV

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/low.toif b/core/embed/rust/src/ui/layout_eckhart/res/battery/low.toif
new file mode 100644
index 0000000000000000000000000000000000000000..fd04650af99a96b237c218b8ce0e09a729e25e02
GIT binary patch
literal 98
zcmV-o0G<C-Pf14{01yCH0000}c>Ny=)-y3MJbHfy3jXRbF#P6VfP#ko3=H=RcC$md
z?-&@)Z}`sx<^4wGHQYzx{U?)mAJv9?1!rKk{{;%b*bD_gmp!__8wx<KR`?C`(K(=x
E0Ff>#lmGw#

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/mid.png b/core/embed/rust/src/ui/layout_eckhart/res/battery/mid.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b32137e035c1a502d1b6f7e02d14744e29fea96
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZA!2%@LAG@9cq?nSt-CY>|xA&jf59DzcctjR6
zFmMZlFeAgPITAoY_7YEDSN4}|%p95~+}#aMK%q6BE{-7@=Z{Xl$lK%~;F8|^KZ{jI
zHKKFv4aO-6>Q1cg?9(1ZGM0S!W5wEB^ziu4TfS*|&n88BS~Si}jVaulup{r*>xC=s
zYdn!E*>YqtV^(T|6i2?h$l51sF6->xdfG#3>t^Su1(P}A|6TR9VO~->S-42;Q*CR&
zq$k;}*^B;pN`!N)HQQXY+Oc&>nAzzpwb}h?OaV_V0vXr02c3MJbn@@wCqjOc3qx%0
c{#Y}Q^T9I5U3z<hf$nDTboFyt=akR{0CD_l4*&oF

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/mid.toif b/core/embed/rust/src/ui/layout_eckhart/res/battery/mid.toif
new file mode 100644
index 0000000000000000000000000000000000000000..08cf7997b1711478d2cc8e276c88ab6c76357192
GIT binary patch
literal 103
zcmV-t0GR(&Pf14{01yCM0000}c>Ny=)-y3MJbHfy3jXRbF#P6VfP#ko3=H=Rc7s4Q
zko%5-;rs@$rt?7FZ&Y5xeH7k*GI{q=ZMatec2*6L_ZKL@4s%%n&}EPA?}h@9s}+93
Jd~^=zBLG%TEENC%

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/zap.png b/core/embed/rust/src/ui/layout_eckhart/res/battery/zap.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ae22400bc2972255f743b29c5479296f9e743f3
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+k!2%@pru(!2DW)WEcNd2L?fqx=19_YU9+AZi
z4BWyX%*Zfnjs#GUy~NYkmHj0fGl!-LcXxvmP^iVz#W6(VeC>p2(Pjey7j-|Sg+c|F
zraFj<s0X-C6_5#F-!9KOOSS*!t;yACn>Jt4RO)mN4Bt4XKyRVr<=0Ki;|jF)R&My(
z^l;i{g^e%f?OhY~{pI5JjxDK<hrUFs?Gkw@`bTb$@$;?oelNSdm+Ajkx2cbATAc0^
m-e7oTA>-`*GrljA`oqNY`q<8mJ}w|%FnGH9xvX<aXaWF{-&vLb

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery/zap.toif b/core/embed/rust/src/ui/layout_eckhart/res/battery/zap.toif
new file mode 100644
index 0000000000000000000000000000000000000000..140b5f74bc8c26e71ac62a611a36b1e308092859
GIT binary patch
literal 103
zcmV-t0GR(&Pf14)01^OO0001EU{Lt`U!MU87X1Iu38KIK|IY-ZfWrMyVO^*&8$|d&
zGer3R-rcL2KK%y+wuFuqKx#cm<)8omIY27^!wmp&87}>=2T=^)!R9b9{PhD<3GbP~
J^aWcm1pqT(F1G*x

literal 0
HcmV?d00001

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery_bar.png b/core/embed/rust/src/ui/layout_eckhart/res/battery_bar.png
deleted file mode 100644
index 03c64fbdca4a261af1b6f34e4a915834b022598c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^EI`b`0U}GRru6|SrX+877l!}s{b%+Ad7K3vk;M!Q
z+`=Ht$S`Y;1W=H@#M9T6{UsAOw~EMi%Xb@rLfW1#jv*Y^OOH7+GAQsI+0b<H?9YM%
v3k|Ll+7ZV#7KEG)Vz}|)JnMr5>tl5a4<$A&5#S32YGd$p^>bP0l+XkKs;Dbp

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery_bar.toif b/core/embed/rust/src/ui/layout_eckhart/res/battery_bar.toif
deleted file mode 100644
index ab898ec4aa8d9d8b2a28a7547eeac399dc13df8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25
gcmWIX_jG4r;9%foU|^`0`u+WHy~dC7|50)b099)UUH||9

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery_zap.png b/core/embed/rust/src/ui/layout_eckhart/res/battery_zap.png
deleted file mode 100644
index f2c25a6acaaad5607a89fb856c7a65b1f267753b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!2%?E=C*AFQcOwS?k)`f+xyS#2l6-zJR*x3
z7`TN&n2}-D90{Nxdx@v7EBi|(Zf+H0A>-&<K%rVs7sn8Z%cXtMqAdy{uKc_`4lSJv
zJeM52;h=ouKz4Ix5=%xxi?RHJ*b~Y12XAE`W)!J%tJ8RRialCu^{W-TSKrsY+c$0d
zDgQhkhl6XrHyF=7(o%D3w(c~(!Xx6&-wvfX{o9^VTBy<fb6=6C=h7|0SC-_tbN{l~
exAfSyU(8Bwb5u6{jyMB!2!p4qpUXO@geCwQ-c>aK

diff --git a/core/embed/rust/src/ui/layout_eckhart/res/battery_zap.toif b/core/embed/rust/src/ui/layout_eckhart/res/battery_zap.toif
deleted file mode 100644
index f25474585678c0cdd99e2a8f29190f7feba58c3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 97
zcmV-n0G|I;Pf14(01yCG0001EV7TyqKLZea|E~`u75@L{1X2h7|7QY=%?FA7`)?1V
z7X1HzzoUcc(|-`)Na%P0<THVVWq`65{-0+AQs4edfeib*9z-U9&0@IF4<Z@9aDYev
D=ISff

diff --git a/core/embed/rust/src/ui/layout_eckhart/theme/firmware.rs b/core/embed/rust/src/ui/layout_eckhart/theme/firmware.rs
index 303f674ec9..25ee1f8f09 100644
--- a/core/embed/rust/src/ui/layout_eckhart/theme/firmware.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/theme/firmware.rs
@@ -16,6 +16,8 @@ use super::{
 
 pub const CONFIRM_HOLD_DURATION: ShortDuration = ShortDuration::from_millis(1500);
 pub const ERASE_HOLD_DURATION: ShortDuration = ShortDuration::from_millis(1500);
+/// Duration for the battery status showcase on the ActionBar or Header
+pub const FUEL_GAUGE_DURATION: ShortDuration = ShortDuration::from_millis(2000);
 
 // Text styles
 /// Alias for use with copied code, might be deleted later
diff --git a/core/embed/rust/src/ui/layout_eckhart/theme/mod.rs b/core/embed/rust/src/ui/layout_eckhart/theme/mod.rs
index bb3777f22a..40ccac58d3 100644
--- a/core/embed/rust/src/ui/layout_eckhart/theme/mod.rs
+++ b/core/embed/rust/src/ui/layout_eckhart/theme/mod.rs
@@ -116,8 +116,11 @@ include_icon!(ICON_LOGO, "layout_eckhart/res/lock_full.toif");
 include_icon!(ICON_WARNING40, "layout_eckhart/res/warning40.toif");
 
 // Battery icons
-include_icon!(ICON_BATTERY_BAR, "layout_eckhart/res/battery_bar.toif");
-include_icon!(ICON_BATTERY_ZAP, "layout_eckhart/res/battery_zap.toif");
+include_icon!(ICON_BATTERY_ZAP, "layout_eckhart/res/battery/zap.toif");
+include_icon!(ICON_BATTERY_FULL, "layout_eckhart/res/battery/full.toif");
+include_icon!(ICON_BATTERY_MID, "layout_eckhart/res/battery/mid.toif");
+include_icon!(ICON_BATTERY_LOW, "layout_eckhart/res/battery/low.toif");
+include_icon!(ICON_BATTERY_EMPTY, "layout_eckhart/res/battery/empty.toif");
 
 // Border overlay icons for bootloader screens and hold to confirm animation
 include_icon!(ICON_BORDER_BL, "layout_eckhart/res/border/BL.toif");