Revert "Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev"

This reverts commit 708dd167c8.
This commit is contained in:
Willy-JL
2023-02-10 20:50:30 +00:00
parent 176c01c0da
commit 6555082e2a
2348 changed files with 216 additions and 298 deletions
@@ -1,5 +1,5 @@
#include "../u2f_app_i.h"
#include "../../../settings/xtreme_settings/xtreme_settings.h"
#include "../../../settings/xtreme_settings/xtreme_assets.h"
static void u2f_scene_error_event_callback(GuiButtonType result, InputType type, void* context) {
furi_assert(context);
@@ -27,7 +27,7 @@ void u2f_scene_error_on_enter(void* context) {
app->widget, GuiButtonTypeLeft, "Back", u2f_scene_error_event_callback, app);
} else if(app->error == U2fAppErrorCloseRpc) {
widget_add_icon_element(app->widget, 78, 0, &I_ActiveConnection_50x64);
if(XTREME_SETTINGS()->nsfw_mode) {
if(XTREME_ASSETS()->is_nsfw) {
widget_add_string_multiline_element(
app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "I am not\na whore!");
widget_add_string_multiline_element(