arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-20 06:28:09 +00:00
Code Issues Releases Wiki Activity

feat(core/rust): use loaders in coinjoin screens

Browse Source 
[no changelog]
This commit is contained in:
grdddj 2023-06-15 17:39:30 +02:00 committed by Jiří Musil
parent a318706145
commit b5226b55c8
1 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
core/embed/rust/src/ui/model_tr/component/coinjoin_progress.rs
View File

@ -1,3 +1,5 @@
use core::mem;
use crate::{
strutil::StringType,
ui::{
@ -6,8 +8,9 @@ use crate::{
text::util::{text_multiline, text_multiline_bottom},
Component, Event, EventCtx,
},
display::Font,
display::{self, Font},
geometry::{Alignment, Insets, Rect},
util::animation_disabled,
},
};
@ -16,8 +19,12 @@ use super::theme;
const HEADER: &str = "COINJOIN IN PROGRESS";
const FOOTER: &str = "Do not disconnect your Trezor!";
const FOOTER_TEXT_MARGIN: i16 = 8;
const LOADER_OFFSET: i16 = -15;
const LOADER_SPEED: u16 = 10;
pub struct CoinJoinProgress<T> {
value: u16,
loader_y_offset: i16,
text: T,
area: Rect,
indeterminate: bool,
@ -29,6 +36,8 @@ where
{
pub fn new(text: T, indeterminate: bool) -> Self {
Self {
value: 0,
loader_y_offset: LOADER_OFFSET,
text,
area: Rect::zero(),
indeterminate,
@ -47,7 +56,31 @@ where
bounds
}
fn event(&mut self, _ctx: &mut EventCtx, _event: Event) -> Option<Self::Msg> {
fn event(&mut self, ctx: &mut EventCtx, event: Event) -> Option<Self::Msg> {
if animation_disabled() {
return None;
}
// Indeterminate needs to request frames to animate.
// Determinate ones are receiving Event::Progress events.
if self.indeterminate {
match event {
Event::Attach => {
ctx.request_anim_frame();
}
Event::Timer(EventCtx::ANIM_FRAME_TIMER) => {
self.value = (self.value + LOADER_SPEED) % 1000;
ctx.request_anim_frame();
ctx.request_paint();
}
_ => {}
}
} else if let Event::Progress(new_value, _new_description) = event {
if mem::replace(&mut self.value, new_value) != new_value {
ctx.request_paint();
}
}
None
}
@ -62,10 +95,22 @@ where
theme::BG,
Alignment::Center,
);
display::loader::loader_small_indeterminate(
self.value,
self.loader_y_offset,
theme::FG,
theme::BG,
);
} else {
display::loader(
self.value,
self.loader_y_offset,
theme::FG,
theme::BG,
Some((theme::ICON_TICK_FAT, theme::FG)),
);
}
// CENTER
// BOTTOM
let top_rest = text_multiline_bottom(
self.area,