Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-31 02:23:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict

Browse Source
This commit is contained in:
Willy-JL
2023-02-19 03:28:21 +00:00
parent 94eed59e46 e338db1392
commit d91981b66b
8 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/subghz/views/receiver.c
+2 -2
View File
@@ -265,7 +265,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) {
canvas,
0,
0,
furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52);
furi_hal_subghz_get_radio_type() ? XTREME_ASSETS()->I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 63, 46, "Scanning...");
//canvas_draw_line(canvas, 46, 51, 125, 51);
@@ -275,7 +275,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) {
canvas,
0,
0,
furi_hal_subghz_get_radio_type() ? &I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52);
furi_hal_subghz_get_radio_type() ? XTREME_ASSETS()->I_Fishing_123x52 : XTREME_ASSETS()->I_Scanning_123x52);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 63, 46, "Decoding...");
canvas_set_font(canvas, FontSecondary);
applications/services/xtreme/assets.c
+2
View File
@@ -102,6 +102,7 @@ void swap(XtremeAssets* x, FuriString* p, File* f) {
icon(&x->I_RFIDDolphinSend_97x61, "RFID/RFIDDolphinSend_97x61", p, f);
icon(&x->I_RFIDDolphinSuccess_108x57, "RFID/RFIDDolphinSuccess_108x57", p, f);
icon(&x->I_Cry_dolph_55x52, "Settings/Cry_dolph_55x52", p, f);
icon(&x->I_Fishing_123x52, "SubGhz/Fishing_123x52", p, f);
icon(&x->I_Scanning_123x52, "SubGhz/Scanning_123x52", p, f);
icon(&x->I_Auth_62x31, "U2F/Auth_62x31", p, f);
icon(&x->I_Connect_me_62x31, "U2F/Connect_me_62x31", p, f);
@@ -131,6 +132,7 @@ void XTREME_ASSETS_LOAD() {
xtreme_assets->I_RFIDDolphinSend_97x61 = &I_RFIDDolphinSend_97x61;
xtreme_assets->I_RFIDDolphinSuccess_108x57 = &I_RFIDDolphinSuccess_108x57;
xtreme_assets->I_Cry_dolph_55x52 = &I_Cry_dolph_55x52;
xtreme_assets->I_Fishing_123x52 = &I_Fishing_123x52;
xtreme_assets->I_Scanning_123x52 = &I_Scanning_123x52;
xtreme_assets->I_Auth_62x31 = &I_Auth_62x31;
xtreme_assets->I_Connect_me_62x31 = &I_Connect_me_62x31;
applications/services/xtreme/assets.h
+1
View File
@@ -25,6 +25,7 @@ typedef struct {
const Icon* I_RFIDDolphinSend_97x61;
const Icon* I_RFIDDolphinSuccess_108x57;
const Icon* I_Cry_dolph_55x52;
const Icon* I_Fishing_123x52;
const Icon* I_Scanning_123x52;
const Icon* I_Auth_62x31;
const Icon* I_Connect_me_62x31;