 d511d76a1b
			
		
	
	
		d511d76a1b
		
			
		
	
	
	
	
		
			
			* Added new image DolphinSaved_113x58.png for all "saved" pages * New image DolphinDone_80x58.png added * Replaced dolphins on all scenes accroding to new UI specs * New success dolphin image added * Success scene image replaced * Changed image and text for update initial scene * Image and text adjusted for "Original restored" scene * Removed old DolphinNice_96x59.png image * New image for LFRFID scene * Removed unused image * New UI image added to assets * Replaced warning dolphin on mf_classic write initial fail scene * Removed old image * Changed image on scenes to a new one * New dolphin mafia image * Replaced dolphin mafia image to a new one * Removed DolphinMafia_115x62.png * New check symbol on completed state for detect_reader * Adjusted layout elements position * Removed second switching to popup view in order to achieve control in support callbacks In general now we show generic scene and after that in on_enter callback we can redefine it for particular protocol * CardDetected event now also triggers on_event callback * Now on AuthRequest we throw CardDetected custom event * Added callback for read_on_event * Now we show different screen while reading and unlocking * Fixed missing asstes for some scenes * Update DolphinMafia_119x62.png * Adjusted all the scenes with DolphinMafia image * Scenes with save image adjusted * Removed unnecessary assets DolphinMafia_119x62.png and DolphinSaved_113x58.png * All common dolphins moved to Dolphin folder * Moved DolphinReadingSuccess_59x63.png to Dolphin folder * Set proper led color for detect and read scenes * Added new notification sequence for semi_success results * Use new sequence for semi_success nfc reads * Different events are now throwed depending on read result * Added handling of incomplete event for ultralight cards * Replaced image for iButton scene * Updated API for f18 * Fixed issue with unlock retry sequence * Fix after review * Success notification replaced to semi success in case of incomplete mf classic reading * New text for read scene * New read result sound notification logic for mf classic cards Co-authored-by: あく <alleteam@gmail.com> Co-authored-by: gornekich <n.gorbadey@gmail.com>
		
			
				
	
	
		
			62 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			62 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "../nfc_app_i.h"
 | |
| #include <dolphin/dolphin.h>
 | |
| 
 | |
| void nfc_scene_detect_scan_callback(NfcScannerEvent event, void* context) {
 | |
|     furi_assert(context);
 | |
| 
 | |
|     NfcApp* instance = context;
 | |
| 
 | |
|     if(event.type == NfcScannerEventTypeDetected) {
 | |
|         nfc_app_set_detected_protocols(instance, event.data.protocols, event.data.protocol_num);
 | |
|         view_dispatcher_send_custom_event(instance->view_dispatcher, NfcCustomEventWorkerExit);
 | |
|     }
 | |
| }
 | |
| 
 | |
| void nfc_scene_detect_on_enter(void* context) {
 | |
|     NfcApp* instance = context;
 | |
| 
 | |
|     // Setup view
 | |
|     popup_reset(instance->popup);
 | |
|     popup_set_header(instance->popup, "Reading", 97, 15, AlignCenter, AlignTop);
 | |
|     popup_set_text(
 | |
|         instance->popup, "Apply card to\nFlipper's back", 97, 27, AlignCenter, AlignTop);
 | |
|     popup_set_icon(instance->popup, 0, 8, &I_NFC_manual_60x50);
 | |
|     view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup);
 | |
| 
 | |
|     nfc_app_reset_detected_protocols(instance);
 | |
| 
 | |
|     instance->scanner = nfc_scanner_alloc(instance->nfc);
 | |
|     nfc_scanner_start(instance->scanner, nfc_scene_detect_scan_callback, instance);
 | |
| 
 | |
|     nfc_blink_detect_start(instance);
 | |
| }
 | |
| 
 | |
| bool nfc_scene_detect_on_event(void* context, SceneManagerEvent event) {
 | |
|     NfcApp* instance = context;
 | |
|     bool consumed = false;
 | |
| 
 | |
|     if(event.type == SceneManagerEventTypeCustom) {
 | |
|         if(event.event == NfcCustomEventWorkerExit) {
 | |
|             if(instance->protocols_detected_num > 1) {
 | |
|                 notification_message(instance->notifications, &sequence_single_vibro);
 | |
|                 scene_manager_next_scene(instance->scene_manager, NfcSceneSelectProtocol);
 | |
|             } else {
 | |
|                 scene_manager_next_scene(instance->scene_manager, NfcSceneRead);
 | |
|             }
 | |
|             consumed = true;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     return consumed;
 | |
| }
 | |
| 
 | |
| void nfc_scene_detect_on_exit(void* context) {
 | |
|     NfcApp* instance = context;
 | |
| 
 | |
|     nfc_scanner_stop(instance->scanner);
 | |
|     nfc_scanner_free(instance->scanner);
 | |
|     popup_reset(instance->popup);
 | |
| 
 | |
|     nfc_blink_stop(instance);
 | |
| }
 |