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 #3369

Merged
merged 69 commits into from
Jan 16, 2024
Merged

[FL-3678] NFC UI refactor #3369

merged 69 commits into from
Jan 16, 2024

Conversation

RebornedBrain
Copy link
Contributor

@RebornedBrain RebornedBrain commented Jan 15, 2024 •
edited by skotopes
Loading

What's new

  • Filename or "Unsaved + CardType" is now showed for saved cards during emulation
  • Headers added to Write scenes
  • Reordered menu items according to new spec

Verification

  • Read any card and try to emulate it without saving. Result: "Unsaved Card Type" will be printed during emulation. On saved card filename will be printed
  • Try to write any NTAG, there will be a new header
  • Go to saved menu choose any card and check the order of menu items

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 and others added 19 commits January 10, 2024 19:18
@RebornedBrain
Merge branch 'dev'
843fa3e
@RebornedBrain
Merge branch 'dev'
1ea99d1
@RebornedBrain
Change MIFARE name accroding to new requirements
cfb974d
@RebornedBrain
New QR code image for MFKey app
686fd20
@RebornedBrain
Update nfc_scene_mf_classic_mfkey_complete.c scene according to new U…
14af1fe 
…I requirements
@RebornedBrain
Update detect_reader.c and check_big_20x17.png
85f437e
@RebornedBrain
New nfc save confirm scene added
4397e2c
@RebornedBrain
Implemented new flow for 'Detect Reader button' after partial mf clas…
d3c994c 
…sic read according to new UI
@RebornedBrain
UID for 15693 tags now shown on the new line
bfffaf5
@RebornedBrain
Fix nfc unit tests
685ed6b
@gornekich
Merge branch 'dev' into reborned/nfc_ui_refactor_2
01d178a
@RebornedBrain
Revert "Fix nfc unit tests"
8799e11 
This reverts commit 685ed6b.
@RebornedBrain
Rolled back all Mifare renamings in library files
6103de1
@RebornedBrain
Revert "Change MIFARE name accroding to new requirements"
22aba52 
This reverts commit cfb974d.
@RebornedBrain
Now Mifare word is changed only on the app level without changes to l…
321a56d 
…ib level
@skotopes
Merge branch 'dev' into reborned/nfc_ui_refactor_2
c539cfa
@RebornedBrain
Filename or "Unsaved + CardType" is now showed for saved cards during…
957a89f 
… emulation
@RebornedBrain
Headers added to Write scenes
be15c5f
@RebornedBrain
Reordered menu items accrding to new spec
ba6b564
@skotopes skotopes merged commit a11fcfc into flipperdevices:dev Jan 16, 2024
9 checks passed
RogueMaster pushed a commit to RogueMaster/flipperzero-firmware-wPlugins that referenced this pull request Feb 13, 2024
@xMasterX @skotopes @gornekich
[FL-3678] NFC UI refactor (flipperdevices#3369)
7981cb8 
Co-authored-by: あく <[email protected]>
Co-authored-by: gornekich <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skotopes skotopes skotopes approved these changes

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

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

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

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

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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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