Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hold to confirm animation for mercury ui #3776

Merged
merged 4 commits into from
May 29, 2024

Conversation

TychoVrahe
Copy link
Contributor

This PR adds hold to confirm animation to mercury UI.

Draft for now, as it relies on several other PRs which should go in first, namely: #3775 #3763 , and also contains i2c fix that should be removed in the final PR.

@TychoVrahe TychoVrahe self-assigned this May 5, 2024
Copy link

github-actions bot commented May 5, 2024

core UI changes device test click test persistence test
T2T1 Model T test(screens) main(screens) test(screens) main(screens) test(screens) main(screens)
T2B1 Safe 3 3280 test(screens) main(screens) 2724
T3T1 test(screens) main(screens) test(screens) main(screens) test(screens) main(screens)
All main(screens)

@Hannsek Hannsek added the blocked Blocked by external force. Third party inputs required. label May 9, 2024
@Hannsek Hannsek requested a review from obrusvit May 9, 2024 10:19
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/htc-anim branch from 902aa4c to ff59b1d Compare May 17, 2024 13:54
@TychoVrahe TychoVrahe marked this pull request as ready for review May 17, 2024 13:54
@TychoVrahe TychoVrahe requested a review from prusnak as a code owner May 17, 2024 13:54
Copy link

github-actions bot commented May 17, 2024

legacy UI changes device test(screens) main(screens)

@obrusvit obrusvit added T3T1 and removed blocked Blocked by external force. Third party inputs required. labels May 20, 2024
Copy link
Contributor

@obrusvit obrusvit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments.

rust/pareen/images/plots.png Outdated Show resolved Hide resolved
core/embed/rust/src/time.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@obrusvit obrusvit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build fails

@@ -161,7 +161,7 @@ impl Component for Bip39Input {
let style = self.button.style();

// First, paint the button background.
self.button.render_background(target, style);
self.button.render_background(target, style, 0xFF);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this line was removed in #3832 so it will cause conflict later.

@@ -192,7 +192,7 @@ impl Component for Slip39Input {
let style = self.button.style();

// First, paint the button background.
self.button.render_background(target, style);
self.button.render_background(target, style, 0xFF);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this line was removed in #3832 so it will cause conflict later.

@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/htc-anim branch 2 times, most recently from 73c2df4 to 4808c34 Compare May 21, 2024 10:36
@TychoVrahe TychoVrahe changed the base branch from ui-t3t1 to tychovrahe/ui-t3t1/haptic_setting May 21, 2024 10:36
@andrewkozlik andrewkozlik removed their request for review May 21, 2024 10:39
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/htc-anim branch from 4808c34 to 2fbe4a0 Compare May 21, 2024 11:45
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/haptic_setting branch from fda164d to ee43705 Compare May 24, 2024 12:52
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/htc-anim branch from 2fbe4a0 to 38c6b52 Compare May 24, 2024 12:59
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/haptic_setting branch 3 times, most recently from d1bf5a3 to b8409a3 Compare May 29, 2024 08:44
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/htc-anim branch from 38c6b52 to 8c02187 Compare May 29, 2024 09:00
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/htc-anim branch 2 times, most recently from 604c04b to 6455f69 Compare May 29, 2024 09:41
Base automatically changed from tychovrahe/ui-t3t1/haptic_setting to tychovrahe/ui-t3t1/brightness May 29, 2024 17:54
@TychoVrahe TychoVrahe force-pushed the tychovrahe/ui-t3t1/htc-anim branch from 6455f69 to 25762fd Compare May 29, 2024 17:56
@TychoVrahe TychoVrahe merged commit d0c02dd into tychovrahe/ui-t3t1/brightness May 29, 2024
67 of 76 checks passed
@TychoVrahe TychoVrahe deleted the tychovrahe/ui-t3t1/htc-anim branch May 29, 2024 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: 🤝 Needs QA
Development

Successfully merging this pull request may close these issues.

None yet

4 participants