Delizia tap-to-swipe hotfix #4571

matejcik · 2025-02-03T13:14:13Z

This implements tap-to-swipe functionality on Delizia, to avoid problematic swipes.

points of interest:

df6f791 should probably be a separate PR fixing rust-analyzer, but it's here for now 🤷‍♀️
a929f51 is a generic pager impl that we can (and ideally should) use everywhere
e234e25 introduces PaginateFull trait that is using Pager instead of just returning a total. this is used throughout Delizia, for now the original Paginate is kept for backwards compatibility.

the big changes in above are refactors of Paragraphs and FormattedText pagination, where we don't have to go from the beginning every time, because we now remember on which page we are (until then we only knew on which offset in source data we are)

8dc1e12 is the big hotfix -- introduce a virtual button in Footer and respond to clicks to that button by (a) replaying an artificial swipe to an internally swipable component, or (b) returning FlowMsg::Next up the stack, for SwipeFlow to pick up, which should respond by

checking that no action has happened in response to Next
checking that an action is registered for swipe-up
if yes, triggering that action
this way all the flows written to work with swipe-up will magically also work with footer-click

the rest are some patches for some problems.

another important refactor in cf490d0 is that Frame now has its own map() function that maps only the content message to something. Messages from button(s), either header or footer, are always mapped to themselves.

github-actions · 2025-02-04T12:41:22Z

core UI changes	device test	click test	persistence test
T2T1 Model T	test(screens) main(screens)	test(screens) main(screens)	test(screens) main(screens)
T3B1 Safe 3	test(screens) main(screens)	test(screens) main(screens)	test(screens) main(screens)
T3T1 Safe 5	test(screens) main(screens)	test(screens) main(screens)	test(screens) main(screens)
All	main(screens)

matejcik · 2025-02-05T14:39:43Z

Monero failure is spurious. Perhaps #3463 will help with those.

Hannsek · 2025-02-11T13:10:53Z

TODO:

extend the hold/tap to confirm zone as much as possible - not directly related to this PR but would be nice to tackle it here as it would help with the UX
extend the tap zone on all screens to the bottom half (bottom two thirds) of the diplay, including the footer
replace "swipe up" with "tap to continue"
edit tutorial according to Figma

translations:

DE: Zum Fortfahren tippen
FR: Toucher pour continuer
ES: Toca para continuar
PT-BR: Toque para continuar
IT: Tocca per continuare
CS: Klepnutím pokračujte

obrusvit

A few comments for now, I'd like to review and test more later on.

core/embed/rust/build.rs

core/embed/rust/src/ui/util.rs

obrusvit · 2025-02-19T22:59:43Z

I think we can proceed with the points from @Hannsek

regarding the touch zone of the footer, it is now at double the size of the footer (74 px), roughly 1/3 of the screen and IMHO it's not bad.

Hannsek · 2025-02-20T08:14:18Z

regarding the touch zone of the footer, it is now at double the size of the footer (74 px), roughly 1/3 of the screen and IMHO it's not bad.

Can we do even more?

matejcik · 2025-02-20T14:21:31Z

replace "swipe up" with "tap to continue"

what do we think about replacing the same string id?
it would mean that the instruction is wrong when you have an outdated translation blob

obrusvit · 2025-02-20T14:42:43Z

what do we think about replacing the same string id?
it would mean that the instruction is wrong when you have an outdated translation blob

Having "Tap to confirm" under instruction__swipe_up sounds like something which might bite in the future. Even if it is only for Delizia.
And on the contrary, if we introduce a new ID, then you'd see english version of the new instruction if you have old blob... But the old instruction wouldn't matter because it's still valid: users can still swipe.

I'm in favor of introducing the new one.

matejcik · 2025-02-21T14:18:49Z

FR: Toucher pour continuer

we translate "Tap to confirm" as "Appuyez pour confirmer", we should probably use the same word here?

IT: Tocca per continuare

"Tocca e continua", same as "hold to continue" is "Premi e continua" ?

edit tutorial according to Figma

so we're getting rid of "tap to start"?

also we need translations for the new text:

Tap the lower half of the screen to continue, or swipe down to go back.

matejcik · 2025-02-21T14:20:15Z

Having "Tap to confirm" under instruction__swipe_up sounds like something which might bite in the future. Even if it is only for Delizia.

i mean, we can fully rename the key 🤷‍♀️
but we probably can afford one more empty key

PaginateFull uses Pager instead of reporting just the total number of pages. Delizia will rely on this trait; going forward, we'll want PaginateFull to replace Paginate, but this refactor would be too big if we also needed to include Caesar and Bolt in it

We introduce a new variant FlowMsg::Next, used only internally (for now). Sending FlowMsg::Next indicates we want to proceed to the next screen of the flow. If there is internal pagination, Next will play a simulated swipe to the child component.

this generally simplifies the mappings of Frame messages, but also relies on the button actions being properly set up.

…ating content

…to hit

when animations are disabled, hold-to-confirm has zero timeout

…easier to hit

matejcik · 2025-02-21T15:11:16Z

extend the hold/tap to confirm zone as much as possible - not directly related to this PR but would be nice to tackle it here as it would help with the UX

extend the tap zone on all screens to the bottom half (bottom two thirds) of the diplay, including the footer

these two are the same thing. i tried to extend over the whole screen except header, please test

replace "swipe up" with "tap to continue"

done

edit tutorial according to Figma

done

obrusvit · 2025-02-21T15:13:50Z

I'll do final pass including the tutorial later on.

Hannsek · 2025-02-21T18:37:06Z

these two are the same thing. i tried to extend over the whole screen except header, please test

Does swipe down to go back work?

Hannsek · 2025-02-21T18:38:21Z

extend the hold/tap to confirm zone as much as possible - not directly related to this PR but would be nice to tackle it here as it would help with the UX
extend the tap zone on all screens to the bottom half (bottom two thirds) of the diplay, including the footer
these two are the same thing

They are not. The first one is about the confirmation screen where the middle confirmation button is.

matejcik force-pushed the matejcik/hotfix-haha-delizia-swipe branch 3 times, most recently from e0c31d3 to e581a3d Compare February 4, 2025 12:40

matejcik force-pushed the matejcik/hotfix-haha-delizia-swipe branch 3 times, most recently from 39f7ee6 to e12346a Compare February 5, 2025 12:49

matejcik marked this pull request as ready for review February 5, 2025 13:45

matejcik requested a review from prusnak as a code owner February 5, 2025 13:45

matejcik requested review from obrusvit and removed request for prusnak February 5, 2025 13:45

matejcik self-assigned this Feb 5, 2025

obrusvit reviewed Feb 11, 2025

View reviewed changes

core/embed/rust/build.rs Outdated Show resolved Hide resolved

core/embed/rust/src/ui/util.rs Show resolved Hide resolved

core/embed/rust/src/ui/util.rs Show resolved Hide resolved

matejcik added this to the Release 25.03 milestone Feb 18, 2025

obrusvit mentioned this pull request Feb 19, 2025

Friendlier way to confirm long messages #4601

Open

obrusvit added the T3T1 Trezor Safe 5 label Feb 20, 2025

matejcik added 6 commits February 21, 2025 15:26

feat(core/rust): introduce Pager

bd7008e

refactor(core/rust): propagate footer button message everywhere

bc0a119

this generally simplifies the mappings of Frame messages, but also relies on the button actions being properly set up.

refactor(core/rust): force recalculate Paragraphs visibility when upd…

990f69e

…ating content

fix(core/rust): respond to the correct button in Address info

0895af7

matejcik added 9 commits February 21, 2025 15:26

feat(core/rust): enlarge delizia footer touch area to make it easier …

bad4db7

…to hit

refactor(core/rust): remove internal pager from SwipePage

40b431f

style(core/rust): fix clippy complaints

b4346f2

fix(tests): remove useless hold-to-confirm for delizia

84bc13d

when animations are disabled, hold-to-confirm has zero timeout

refactor(core/rust): add a helper for a swipeup-footer

4cb43c8

fix(core): change "Swipe up" to "Tap to continue" everywhere

b1b0653

fixup! fix(tests): remove useless hold-to-confirm for delizia

1fee1f4

fix(core): modify Delizia tutorial to account for tap-to-continue

a48b524

fixup! feat(core/rust): introduce Pager

88daace

matejcik force-pushed the matejcik/hotfix-haha-delizia-swipe branch from e12346a to 88daace Compare February 21, 2025 14:35

matejcik added 4 commits February 21, 2025 15:54

fixup! fix(core): modify Delizia tutorial to account for tap-to-continue

9f756ad

fixup! feat(core/rust): enlarge delizia footer touch area to make it …

207b604

…easier to hit

fixup! fixup! feat(core/rust): introduce Pager

51b7577

fixup! refactor(core/rust): add a helper for a swipeup-footer

68fabd5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Delizia tap-to-swipe hotfix #4571

Delizia tap-to-swipe hotfix #4571

matejcik commented Feb 3, 2025 •

edited

Loading

github-actions bot commented Feb 4, 2025 •

edited

Loading

matejcik commented Feb 5, 2025

Hannsek commented Feb 11, 2025 •

edited

Loading

obrusvit left a comment

obrusvit commented Feb 19, 2025

Hannsek commented Feb 20, 2025

matejcik commented Feb 20, 2025

obrusvit commented Feb 20, 2025 •

edited

Loading

matejcik commented Feb 21, 2025

matejcik commented Feb 21, 2025

matejcik commented Feb 21, 2025

obrusvit commented Feb 21, 2025

Hannsek commented Feb 21, 2025

Hannsek commented Feb 21, 2025

Delizia tap-to-swipe hotfix #4571

Are you sure you want to change the base?

Delizia tap-to-swipe hotfix #4571

Conversation

matejcik commented Feb 3, 2025 • edited Loading

github-actions bot commented Feb 4, 2025 • edited Loading

matejcik commented Feb 5, 2025

Hannsek commented Feb 11, 2025 • edited Loading

obrusvit left a comment

Choose a reason for hiding this comment

obrusvit commented Feb 19, 2025

Hannsek commented Feb 20, 2025

matejcik commented Feb 20, 2025

obrusvit commented Feb 20, 2025 • edited Loading

matejcik commented Feb 21, 2025

matejcik commented Feb 21, 2025

matejcik commented Feb 21, 2025

obrusvit commented Feb 21, 2025

Hannsek commented Feb 21, 2025

Hannsek commented Feb 21, 2025

matejcik commented Feb 3, 2025 •

edited

Loading

github-actions bot commented Feb 4, 2025 •

edited

Loading

Hannsek commented Feb 11, 2025 •

edited

Loading

obrusvit commented Feb 20, 2025 •

edited

Loading