arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-30 10:28:14 +00:00
Code Issues Releases Wiki Activity

chore(core/eckhart): enable swipe up in homescreen

Browse Source 
use swipe up on the homescreen to open the menu
[no changelog]
This commit is contained in:
Lukas Bielesch 2025-07-08 19:39:20 +02:00 committed by Lukáš Bielesch
parent 32a4552be9
commit 954ab619a0
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/embed/rust/src/ui/layout_eckhart/firmware/homescreen.rs
View File

@ -8,9 +8,9 @@ use crate::{
time::ShortDuration,
translations::TR,
ui::{
component::{text::TextStyle, Component, Event, EventCtx, Label, Never},
component::{text::TextStyle, Component, Event, EventCtx, Label, Never, Swipe},
display::{image::ImageInfo, Color},
geometry::{Alignment, Alignment2D, Insets, Offset, Rect},
geometry::{Alignment, Alignment2D, Direction, Insets, Offset, Rect},
layout::util::get_user_custom_image,
shape::{self, Renderer},
util::animation_disabled,
@ -51,6 +51,9 @@ pub struct Homescreen {
virtual_locking_button: Button,
/// Fuel gauge (battery status indicator) rendered in the `action_bar` area
fuel_gauge: FuelGauge,
/// Swipe component for vertical swiping
swipe: Swipe,
// swipe_config: SwipeConfig,
}
pub enum HomescreenMsg {
@ -107,6 +110,7 @@ impl Homescreen {
fuel_gauge: FuelGauge::on_charging_change_or_attach()
.with_alignment(Alignment::Center)
.with_font(fonts::FONT_SATOSHI_MEDIUM_26),
swipe: Swipe::new().up(),
})
}
@ -224,6 +228,8 @@ impl Component for Homescreen {
self.label.place(label_area);
self.action_bar.place(bar_area);
self.fuel_gauge.place(bar_area);
// Swipe component is placed in the action bar touch area
self.swipe.place(self.action_bar.touch_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);
@ -232,13 +238,21 @@ 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);
let swipe_up = matches!(self.swipe.event(ctx, event), Some(Direction::Up));
let homebar_tap = matches!(
self.action_bar.event(ctx, event),
Some(ActionBarMsg::Confirmed)
);
if swipe_up || homebar_tap {
return if self.locked {
Some(HomescreenMsg::Dismissed)
} else {
return Some(HomescreenMsg::Menu);
}
Some(HomescreenMsg::Menu)
};
}
if self.lockable {
Self::event_hold(self, ctx, event).then_some(HomescreenMsg::Dismissed)
} else {