Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev

Browse Source

...

This commit is contained in:

Willy-JL

2024-01-05 21:51:29 +00:00

parent 00fbf4a9c7 7eeb60e17e

commit 3041db537e

66 changed files with 166 additions and 76 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/icons/Dolphin/DolphinCommon_56x48.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 KiB

BIN

assets/icons/Dolphin/DolphinDone_80x58.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

assets/icons/Dolphin/DolphinMafia_119x62.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

0

assets/icons/Infrared/DolphinReadingSuccess_59x63.png → assets/icons/Dolphin/DolphinReadingSuccess_59x63.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

assets/icons/Dolphin/DolphinSaved_92x58.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 901 B

BIN

assets/icons/Dolphin/DolphinSuccess_91x55.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 930 B

0

assets/icons/iButton/DolphinWait_61x59.png → assets/icons/Dolphin/DolphinWait_61x59.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 2.0 KiB

BIN

assets/icons/Dolphin/WarningDolphinFlip_45x42.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

0

assets/icons/Interface/WarningDolphin_45x42.png → assets/icons/Dolphin/WarningDolphin_45x42.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

assets/icons/NFC/check_big_20x17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 199 B

BIN

assets/icons/RFID/RFIDDolphinSuccess_108x57.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.6 KiB

BIN

assets/icons/iButton/DolphinMafia_115x62.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

assets/icons/iButton/DolphinNice_96x59.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

assets/icons/iButton/iButtonDolphinVerySuccess_108x52.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.1 KiB

BIN

assets/icons/iButton/iButtonDolphinVerySuccess_92x55.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 967 B