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.

Sign up for GitHub

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

Jump to bottom

[FL-3678] NFC UI refactor #3382

Merged
merged 82 commits into from
Feb 6, 2024
Merged

[FL-3678] NFC UI refactor #3382

merged 82 commits into from
Feb 6, 2024

Conversation

RebornedBrain
Copy link
Contributor

@RebornedBrain RebornedBrain commented Jan 18, 2024 •
edited by jira bot
Loading

What's new

  • FL-3678
  • Fixed "Mifare" word for desfire cards
  • Info screens now have new formatting according to UI specs
  • New "More_Info" scene for SLIX and iso15693 cards added

Verification

  • [ Describe how to verify changes ]

Checklist (For Reviewer)

  • PR has description of feature/bug or link to Confluence/Jira task
  • Description contains actions to verify feature/bugfix
  • I've built this code, uploaded it to the device and verified feature/bugfix

RebornedBrain and others added 30 commits November 30, 2023 22:16
@RebornedBrain
Added new image DolphinSaved_113x58.png for all "saved" pages
f0838dd
@RebornedBrain
New image DolphinDone_80x58.png added
810dfa1
@RebornedBrain
Replaced dolphins on all scenes accroding to new UI specs
f7de656
@RebornedBrain
New success dolphin image added
94cdaf2
@RebornedBrain
Success scene image replaced
59e797b
@RebornedBrain
Changed image and text for update initial scene
7554e7b
@RebornedBrain
Image and text adjusted for "Original restored" scene
fa04e36
@RebornedBrain
Removed old DolphinNice_96x59.png image
f151d3b
@RebornedBrain
New image for LFRFID scene
ff724ce
@RebornedBrain
Removed unused image
7af6a46
@RebornedBrain
New UI image added to assets
38b65fb
@RebornedBrain
Replaced warning dolphin on mf_classic write initial fail scene
d113bbf
@RebornedBrain
Removed old image
278ae51
@RebornedBrain
Changed image on scenes to a new one
12180ba
@RebornedBrain
New dolphin mafia image
18ea05e
@RebornedBrain
Replaced dolphin mafia image to a new one
064c60e
@RebornedBrain
Removed DolphinMafia_115x62.png
fa146d8
@RebornedBrain
New check symbol on completed state for detect_reader
59e9456
@RebornedBrain
Adjusted layout elements position
f3cbb03
@RebornedBrain
Removed second switching to popup view in order to achieve control in…
94e8e5d 
… support callbacks

In general now we show generic scene and after that in on_enter callback we can redefine it for particular protocol
@RebornedBrain
CardDetected event now also triggers on_event callback
1a56ce7
@RebornedBrain
Now on AuthRequest we throw CardDetected custom event
04e28f3
@RebornedBrain
Added callback for read_on_event
d7b54df
@RebornedBrain
Now we show different screen while reading and unlocking
69d1d54
@skotopes
Merge branch 'dev' into reborned/nfc_ui_refactor
cf6829f
@RebornedBrain
Fixed missing asstes for some scenes
4a77a23
@RebornedBrain
Update DolphinMafia_119x62.png
d5164c4
@RebornedBrain
Adjusted all the scenes with DolphinMafia image
5bff5ca
@RebornedBrain
Scenes with save image adjusted
33136b4
@RebornedBrain
Removed unnecessary assets DolphinMafia_119x62.png and DolphinSaved_1…
3ec0703 
…13x58.png
@RebornedBrain RebornedBrain marked this pull request as ready for review January 18, 2024 14:15
@gornekich gornekich self-assigned this Jan 23, 2024
gornekich
gornekich previously approved these changes Jan 23, 2024
View reviewed changes
@gornekich gornekich mentioned this pull request Jan 25, 2024
Merged
3 tasks
@hedger hedger merged commit 9a77dbe into flipperdevices:dev Feb 6, 2024
9 checks passed
@RebornedBrain RebornedBrain deleted the reborned/nfc_ui_refactor_2 branch August 19, 2024 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gornekich gornekich gornekich approved these changes

@hedger hedger hedger approved these changes

@skotopes skotopes Awaiting requested review from skotopes skotopes is a code owner

@DrZlo13 DrZlo13 Awaiting requested review from DrZlo13 DrZlo13 is a code owner

@gsurkov gsurkov Awaiting requested review from gsurkov gsurkov is a code owner

@Astrrra Astrrra Awaiting requested review from Astrrra Astrrra is a code owner

Assignees

@gornekich gornekich

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@RebornedBrain @hedger @gornekich @skotopes