Merge branch 'dev' into shutdown_idle

This commit is contained in:
あく
2022-10-29 02:36:31 +09:00
committed by GitHub
470 changed files with 4355 additions and 2385 deletions
+1
View File
@@ -3,6 +3,7 @@
#include <gui/gui.h>
#include <gui/view_dispatcher.h>
#include <gui/modules/empty_screen.h>
#include <assets_icons.h>
#include <furi_hal_version.h>
#include <furi_hal_region.h>
#include <furi_hal_bt.h>
@@ -6,6 +6,7 @@
#include <gui/view.h>
#include <gui/view_dispatcher.h>
#include <gui/scene_manager.h>
#include <assets_icons.h>
#include <gui/modules/variable_item_list.h>
#include <gui/modules/dialog_ex.h>
@@ -7,6 +7,7 @@
#include <gui/modules/submenu.h>
#include <gui/modules/variable_item_list.h>
#include <dialogs/dialogs.h>
#include <assets_icons.h>
#include <desktop/desktop_settings.h>
#include <desktop/views/desktop_view_pin_input.h>
@@ -6,6 +6,7 @@
#include <gui/view.h>
#include <gui/view_dispatcher.h>
#include <gui/scene_manager.h>
#include <assets_icons.h>
#include "views/battery_info.h"
#include <gui/modules/submenu.h>
@@ -1,6 +1,7 @@
#include "battery_info.h"
#include <furi.h>
#include <gui/elements.h>
#include <assets_icons.h>
struct BatteryInfo {
View* view;
@@ -24,7 +24,7 @@ void storage_settings_scene_factory_reset_on_enter(void* context) {
dialog_ex_set_header(dialog_ex, "Confirm Factory Reset", 64, 10, AlignCenter, AlignCenter);
dialog_ex_set_text(
dialog_ex,
"Internal storage will be erased\r\nData and setting will be lost!",
"Internal storage will be erased\r\nData and settings will be lost!",
64,
32,
AlignCenter,
@@ -4,6 +4,7 @@
#include <gui/view.h>
#include <gui/view_dispatcher.h>
#include <gui/scene_manager.h>
#include <assets_icons.h>
#include <notification/notification_messages.h>
#include <gui/modules/submenu.h>