Sfoglia il codice sorgente

Replace Laptop animation text (#919)

* Fix Laptop animation bubble
* Correct new animation select
Albert Kharisov 4 anni fa
parent
commit
cdfc420ddf

+ 2 - 1
applications/desktop/scenes/desktop_scene_debug.c

@@ -33,12 +33,14 @@ bool desktop_scene_debug_on_event(void* context, SceneManagerEvent event) {
         case DesktopDebugEventDeed:
             dolphin_deed(dolphin, DolphinDeedIButtonEmulate);
             desktop_debug_get_dolphin_data(desktop->debug_view);
+            desktop_start_new_idle_animation(desktop->animation);
             consumed = true;
             break;
 
         case DesktopDebugEventWrongDeed:
             dolphin_deed(dolphin, DolphinDeedWrong);
             desktop_debug_get_dolphin_data(desktop->debug_view);
+            desktop_start_new_idle_animation(desktop->animation);
             consumed = true;
             break;
 
@@ -59,5 +61,4 @@ bool desktop_scene_debug_on_event(void* context, SceneManagerEvent event) {
 void desktop_scene_debug_on_exit(void* context) {
     Desktop* desktop = (Desktop*)context;
     desktop_debug_reset_screen_idx(desktop->debug_view);
-    desktop_start_new_idle_animation(desktop->animation);
 }

File diff suppressed because it is too large
+ 3 - 3
assets/compiled/assets_icons.c


+ 79 - 79
assets/compiled/assets_icons.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <gui/icon.h>
 
-extern const Icon I_Certification1_103x23;
 extern const Icon I_Certification2_119x30;
+extern const Icon I_Certification1_103x23;
 extern const Icon A_BadBattery_128x51;
 extern const Icon A_BoxActive_128x51;
 extern const Icon A_Box_128x51;
@@ -37,19 +37,19 @@ extern const Icon A_Level3Hijack_128x51;
 extern const Icon A_Level3LabActive_128x51;
 extern const Icon A_Level3Lab_128x51;
 extern const Icon I_LevelUp2_04;
-extern const Icon I_LevelUp2_05;
-extern const Icon I_LevelUp2_01;
 extern const Icon I_LevelUp2_03;
+extern const Icon I_LevelUp2_07;
+extern const Icon I_LevelUp2_05;
 extern const Icon I_LevelUp2_02;
 extern const Icon I_LevelUp2_06;
-extern const Icon I_LevelUp2_07;
-extern const Icon I_LevelUp3_03;
+extern const Icon I_LevelUp2_01;
 extern const Icon I_LevelUp3_07;
-extern const Icon I_LevelUp3_01;
-extern const Icon I_LevelUp3_06;
-extern const Icon I_LevelUp3_04;
 extern const Icon I_LevelUp3_02;
+extern const Icon I_LevelUp3_04;
 extern const Icon I_LevelUp3_05;
+extern const Icon I_LevelUp3_01;
+extern const Icon I_LevelUp3_03;
+extern const Icon I_LevelUp3_06;
 extern const Icon A_LevelUpPending_128x51;
 extern const Icon A_NoSdCard_128x51;
 extern const Icon A_SleepActive_128x52;
@@ -58,88 +58,88 @@ extern const Icon A_TvActive_128x52;
 extern const Icon A_Tv_128x52;
 extern const Icon A_WavesActive_128x52;
 extern const Icon A_Waves_128x52;
-extern const Icon I_Nfc_10px;
-extern const Icon I_ir_10px;
-extern const Icon I_ble_10px;
 extern const Icon I_sub1_10px;
-extern const Icon I_dir_10px;
+extern const Icon I_ir_10px;
 extern const Icon I_unknown_10px;
 extern const Icon I_ibutt_10px;
+extern const Icon I_Nfc_10px;
+extern const Icon I_ble_10px;
 extern const Icon I_125_10px;
+extern const Icon I_dir_10px;
 extern const Icon I_BLE_Pairing_128x64;
-extern const Icon I_Voldwn_6x6;
-extern const Icon I_Volup_8x6;
 extern const Icon I_Button_18x18;
-extern const Icon I_Pressed_Button_13x13;
-extern const Icon I_Ble_disconnected_24x34;
+extern const Icon I_Ble_connected_38x34;
+extern const Icon I_Ok_btn_9x9;
 extern const Icon I_Space_65x18;
+extern const Icon I_Volup_8x6;
+extern const Icon I_Voldwn_6x6;
 extern const Icon I_Circles_47x47;
-extern const Icon I_Ok_btn_9x9;
-extern const Icon I_Ble_connected_38x34;
-extern const Icon I_Clock_18x18;
-extern const Icon I_Error_18x18;
-extern const Icon I_EviSmile2_18x21;
+extern const Icon I_Ble_disconnected_24x34;
+extern const Icon I_Pressed_Button_13x13;
 extern const Icon I_EviWaiting1_18x21;
+extern const Icon I_EviSmile2_18x21;
+extern const Icon I_Error_18x18;
+extern const Icon I_Percent_10x14;
 extern const Icon I_EviSmile1_18x21;
 extern const Icon I_EviWaiting2_18x21;
 extern const Icon I_UsbTree_48x22;
 extern const Icon I_Smile_18x18;
-extern const Icon I_Percent_10x14;
-extern const Icon I_ButtonLeft_4x7;
-extern const Icon I_ButtonRight_4x7;
+extern const Icon I_Clock_18x18;
 extern const Icon I_ButtonDown_7x4;
+extern const Icon I_ButtonCenter_7x7;
+extern const Icon I_ButtonLeft_4x7;
 extern const Icon I_ButtonUp_7x4;
-extern const Icon I_Warning_30x23;
 extern const Icon I_DFU_128x50;
-extern const Icon I_ButtonRightSmall_3x5;
-extern const Icon I_ButtonCenter_7x7;
 extern const Icon I_ButtonLeftSmall_3x5;
-extern const Icon I_DolphinOkay_41x43;
-extern const Icon I_DolphinFirstStart7_61x51;
-extern const Icon I_DolphinFirstStart4_67x53;
-extern const Icon I_DolphinFirstStart3_57x48;
-extern const Icon I_Flipper_young_80x60;
-extern const Icon I_DolphinFirstStart0_70x53;
+extern const Icon I_ButtonRightSmall_3x5;
+extern const Icon I_ButtonRight_4x7;
+extern const Icon I_Warning_30x23;
 extern const Icon I_DolphinFirstStart2_59x51;
-extern const Icon I_DolphinFirstStart6_58x54;
 extern const Icon I_DolphinFirstStart5_54x49;
+extern const Icon I_DolphinFirstStart6_58x54;
+extern const Icon I_Flipper_young_80x60;
 extern const Icon I_DolphinFirstStart8_56x51;
 extern const Icon I_DolphinFirstStart1_59x53;
+extern const Icon I_DolphinOkay_41x43;
+extern const Icon I_DolphinFirstStart3_57x48;
+extern const Icon I_DolphinFirstStart7_61x51;
+extern const Icon I_DolphinFirstStart0_70x53;
+extern const Icon I_DolphinFirstStart4_67x53;
 extern const Icon I_ArrowUpEmpty_14x15;
-extern const Icon I_ArrowDownEmpty_14x15;
-extern const Icon I_ArrowDownFilled_14x15;
 extern const Icon I_ArrowUpFilled_14x15;
+extern const Icon I_ArrowDownFilled_14x15;
+extern const Icon I_ArrowDownEmpty_14x15;
+extern const Icon I_PassportBottom_128x17;
+extern const Icon I_DoorLeft_70x55;
 extern const Icon I_DoorRight_70x55;
 extern const Icon I_DoorLocked_10x56;
-extern const Icon I_DoorLeft_70x55;
 extern const Icon I_PassportLeft_6x47;
 extern const Icon I_LockPopup_100x49;
-extern const Icon I_PassportBottom_128x17;
-extern const Icon I_Vol_up_25x27;
-extern const Icon I_Fill_marker_7x7;
-extern const Icon I_IrdaArrowUp_4x8;
 extern const Icon I_Down_hvr_25x27;
-extern const Icon I_Vol_up_hvr_25x27;
-extern const Icon I_Power_25x27;
+extern const Icon I_Vol_down_hvr_25x27;
+extern const Icon I_Down_25x27;
+extern const Icon I_Fill_marker_7x7;
 extern const Icon I_Vol_down_25x27;
-extern const Icon I_IrdaSend_128x64;
+extern const Icon I_Vol_up_25x27;
 extern const Icon I_Up_hvr_25x27;
-extern const Icon I_Back_15x10;
+extern const Icon I_Vol_up_hvr_25x27;
+extern const Icon I_IrdaLearnShort_128x31;
+extern const Icon I_IrdaSend_128x64;
 extern const Icon I_DolphinReadingSuccess_59x63;
-extern const Icon I_IrdaSendShort_128x34;
 extern const Icon I_Mute_hvr_25x27;
-extern const Icon I_IrdaLearnShort_128x31;
-extern const Icon I_Down_25x27;
+extern const Icon I_Back_15x10;
 extern const Icon I_Up_25x27;
+extern const Icon I_IrdaArrowUp_4x8;
 extern const Icon I_Mute_25x27;
-extern const Icon I_Vol_down_hvr_25x27;
-extern const Icon I_Power_hvr_25x27;
-extern const Icon I_IrdaLearn_128x64;
+extern const Icon I_Power_25x27;
+extern const Icon I_IrdaSendShort_128x34;
 extern const Icon I_IrdaArrowDown_4x8;
-extern const Icon I_KeyBackspaceSelected_16x9;
-extern const Icon I_KeySave_24x11;
+extern const Icon I_IrdaLearn_128x64;
+extern const Icon I_Power_hvr_25x27;
 extern const Icon I_KeySaveSelected_24x11;
 extern const Icon I_KeyBackspace_16x9;
+extern const Icon I_KeyBackspaceSelected_16x9;
+extern const Icon I_KeySave_24x11;
 extern const Icon A_125khz_14;
 extern const Icon A_BadUsb_14;
 extern const Icon A_Bluetooth_14;
@@ -157,56 +157,56 @@ extern const Icon A_Sub1ghz_14;
 extern const Icon A_Tamagotchi_14;
 extern const Icon A_U2F_14;
 extern const Icon A_iButton_14;
-extern const Icon I_Medium_chip_22x21;
 extern const Icon I_Detailed_chip_17x13;
-extern const Icon I_passport_happy1_46x49;
-extern const Icon I_passport_happy2_46x49;
-extern const Icon I_passport_bad3_46x49;
+extern const Icon I_Medium_chip_22x21;
 extern const Icon I_passport_okay2_46x49;
-extern const Icon I_passport_bad2_46x49;
-extern const Icon I_passport_bad1_46x49;
+extern const Icon I_passport_happy2_46x49;
 extern const Icon I_passport_bottom_128x18;
-extern const Icon I_passport_happy3_46x49;
+extern const Icon I_passport_happy1_46x49;
+extern const Icon I_passport_bad1_46x49;
 extern const Icon I_passport_left_6x46;
-extern const Icon I_passport_okay3_46x49;
+extern const Icon I_passport_bad3_46x49;
 extern const Icon I_passport_okay1_46x49;
+extern const Icon I_passport_bad2_46x49;
+extern const Icon I_passport_okay3_46x49;
+extern const Icon I_passport_happy3_46x49;
+extern const Icon I_BatteryBody_52x28;
+extern const Icon I_FaceCharging_29x14;
 extern const Icon I_Health_16x16;
-extern const Icon I_FaceNopower_29x14;
+extern const Icon I_Temperature_16x16;
 extern const Icon I_Battery_16x16;
-extern const Icon I_BatteryBody_52x28;
 extern const Icon I_FaceConfused_29x14;
-extern const Icon I_FaceCharging_29x14;
 extern const Icon I_FaceNormal_29x14;
 extern const Icon I_Voltage_16x16;
-extern const Icon I_Temperature_16x16;
-extern const Icon I_RFIDDolphinReceive_97x61;
+extern const Icon I_FaceNopower_29x14;
 extern const Icon I_RFIDDolphinSend_97x61;
-extern const Icon I_RFIDBigChip_37x36;
 extern const Icon I_RFIDDolphinSuccess_108x57;
+extern const Icon I_RFIDDolphinReceive_97x61;
+extern const Icon I_RFIDBigChip_37x36;
 extern const Icon I_SDQuestion_35x43;
 extern const Icon I_SDError_43x35;
 extern const Icon I_Cry_dolph_55x52;
+extern const Icon I_Background_128x11;
+extern const Icon I_Lock_8x8;
 extern const Icon I_Battery_26x8;
-extern const Icon I_PlaceholderL_11x13;
+extern const Icon I_Battery_19x8;
+extern const Icon I_USBConnected_15x8;
+extern const Icon I_BadUsb_9x8;
 extern const Icon I_BT_Pair_9x8;
+extern const Icon I_PlaceholderL_11x13;
+extern const Icon I_SDcardFail_11x8;
 extern const Icon I_Bluetooth_5x8;
-extern const Icon I_BadUsb_9x8;
 extern const Icon I_PlaceholderR_30x13;
-extern const Icon I_USBConnected_15x8;
-extern const Icon I_Battery_19x8;
-extern const Icon I_Lock_8x8;
-extern const Icon I_Background_128x11;
-extern const Icon I_SDcardFail_11x8;
 extern const Icon I_SDcardMounted_11x8;
-extern const Icon I_Lock_7x8;
 extern const Icon I_Quest_7x8;
+extern const Icon I_Lock_7x8;
 extern const Icon I_Scanning_123x52;
 extern const Icon I_MHz_25x11;
 extern const Icon I_Unlock_7x8;
+extern const Icon I_iButtonKey_49x44;
+extern const Icon I_DolphinExcited_64x63;
+extern const Icon I_DolphinWait_61x59;
 extern const Icon I_iButtonDolphinVerySuccess_108x52;
 extern const Icon I_DolphinMafia_115x62;
-extern const Icon I_iButtonDolphinSuccess_109x60;
-extern const Icon I_DolphinExcited_64x63;
 extern const Icon I_DolphinNice_96x59;
-extern const Icon I_iButtonKey_49x44;
-extern const Icon I_DolphinWait_61x59;
+extern const Icon I_iButtonDolphinSuccess_109x60;

BIN
assets/icons/Animations/LaptopActive_128x52/frame_02.png


BIN
assets/icons/Animations/LaptopActive_128x52/frame_03.png


BIN
assets/icons/Animations/LaptopActive_128x52/frame_04.png


BIN
assets/icons/Animations/LaptopActive_128x52/frame_05.png


BIN
assets/icons/Animations/LaptopActive_128x52/frame_06.png


BIN
assets/icons/Animations/LaptopActive_128x52/frame_07.png


BIN
assets/icons/Animations/LaptopActive_128x52/frame_08.png


Some files were not shown because too many files changed in this diff