Просмотр исходного кода

Merge totp from https://github.com/xMasterX/all-the-plugins

Willy-JL 1 год назад
Родитель
Сommit
11c9033228

+ 1 - 1
totp/services/config/config.c

@@ -71,7 +71,7 @@ static char* totp_config_file_backup_i(Storage* storage) {
         return NULL;
         return NULL;
     }
     }
 
 
-    FuriHalRtcDateTime current_datetime;
+    DateTime current_datetime;
     furi_hal_rtc_get_datetime(&current_datetime);
     furi_hal_rtc_get_datetime(&current_datetime);
 
 
     uint8_t backup_path_size = sizeof(CONFIG_FILE_BACKUP_BASE_PATH) + 14;
     uint8_t backup_path_size = sizeof(CONFIG_FILE_BACKUP_BASE_PATH) + 14;

+ 0 - 7
totp/ui/scenes/authenticate/totp_scene_authenticate.c

@@ -1,9 +1,6 @@
 #include "totp_scene_authenticate.h"
 #include "totp_scene_authenticate.h"
 #include <dialogs/dialogs.h>
 #include <dialogs/dialogs.h>
 #include <totp_icons.h>
 #include <totp_icons.h>
-#if __has_include(<assets_icons.h>)
-#include <assets_icons.h>
-#endif
 #include "../../../types/common.h"
 #include "../../../types/common.h"
 #include "../../constants.h"
 #include "../../constants.h"
 #include "../../../services/config/config.h"
 #include "../../../services/config/config.h"
@@ -150,11 +147,7 @@ bool totp_scene_authenticate_handle_event(
                     SCREEN_HEIGHT_CENTER - 5,
                     SCREEN_HEIGHT_CENTER - 5,
                     AlignCenter,
                     AlignCenter,
                     AlignCenter);
                     AlignCenter);
-#if __has_include(<assets_icons.h>)
-                dialog_message_set_icon(message, &I_WarningDolphinFlip_45x42, 83, 22);
-#else
                 dialog_message_set_icon(message, &I_DolphinCommon_56x48, 72, 17);
                 dialog_message_set_icon(message, &I_DolphinCommon_56x48, 72, 17);
-#endif
                 dialog_message_show(plugin_state->dialogs_app, message);
                 dialog_message_show(plugin_state->dialogs_app, message);
                 dialog_message_free(message);
                 dialog_message_free(message);
             }
             }

+ 1 - 8
totp/ui/scenes/standby/standby.c

@@ -1,21 +1,14 @@
 #include "standby.h"
 #include "standby.h"
-#if __has_include(<assets_icons.h>)
-#include <assets_icons.h>
-#endif
 #include <totp_icons.h>
 #include <totp_icons.h>
 #include "../../constants.h"
 #include "../../constants.h"
 
 
 #include <assets_icons.h>
 #include <assets_icons.h>
 
 
 void totp_scene_standby_render(Canvas* const canvas) {
 void totp_scene_standby_render(Canvas* const canvas) {
-#if __has_include(<assets_icons.h>)
-    canvas_draw_icon(canvas, SCREEN_WIDTH - 50, SCREEN_HEIGHT - 44, &I_WarningDolphinFlip_45x42);
-#else
     canvas_draw_icon(canvas, SCREEN_WIDTH - 56, SCREEN_HEIGHT - 48, &I_DolphinCommon_56x48);
     canvas_draw_icon(canvas, SCREEN_WIDTH - 56, SCREEN_HEIGHT - 48, &I_DolphinCommon_56x48);
-#endif
 
 
     canvas_set_font(canvas, FontPrimary);
     canvas_set_font(canvas, FontPrimary);
     canvas_draw_str_aligned(canvas, 5, 10, AlignLeft, AlignTop, "CLI command");
     canvas_draw_str_aligned(canvas, 5, 10, AlignLeft, AlignTop, "CLI command");
 
 
     canvas_draw_str_aligned(canvas, 5, 24, AlignLeft, AlignTop, "is running now");
     canvas_draw_str_aligned(canvas, 5, 24, AlignLeft, AlignTop, "is running now");
-}
+}