diff --git a/applications/plugins/dice/dice.c b/applications/plugins/dice/dice.c index cb85008f4..61aa7b4f5 100644 --- a/applications/plugins/dice/dice.c +++ b/applications/plugins/dice/dice.c @@ -5,7 +5,6 @@ #include #include #include -#include "applications/settings/xtreme_settings/xtreme_settings.h" #define TAG "Dice Roller" @@ -477,8 +476,6 @@ int32_t dice_app(void* p) { gui_add_view_port(gui, view_port, GuiLayerFullscreen); furi_timer_start(timer, furi_kernel_get_tick_frequency()); - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - // Main loop PluginEvent event; for(bool processing = true; processing;) { @@ -509,11 +506,7 @@ int32_t dice_app(void* p) { } else if(plugin_state->diceSelect == 20) { plugin_state->diceSelect = 100; } else if(plugin_state->diceSelect == 100) { - if(xtreme_settings->sfw_mode) { - plugin_state->diceSelect = 231; - } else { - plugin_state->diceSelect = 230; - } + plugin_state->diceSelect = 230; } else if(plugin_state->diceSelect == 230) { plugin_state->playerOneScore = 0; plugin_state->playerTwoScore = 0; @@ -523,11 +516,7 @@ int32_t dice_app(void* p) { } else if(plugin_state->diceSelect == 229) { plugin_state->diceSelect = 228; } else if(plugin_state->diceSelect == 228) { - if(xtreme_settings->sfw_mode) { - plugin_state->diceSelect = 59; - } else { - plugin_state->diceSelect = 232; - } + plugin_state->diceSelect = 232; } else if(plugin_state->diceSelect == 232) { plugin_state->diceSelect = 59; } else if(plugin_state->diceSelect == 59) { diff --git a/applications/plugins/pocsag_pager/images/Scanning_123x52.png b/applications/plugins/pocsag_pager/images/Scanning_123x52.png index a48c5330e..ec785948d 100644 Binary files a/applications/plugins/pocsag_pager/images/Scanning_123x52.png and b/applications/plugins/pocsag_pager/images/Scanning_123x52.png differ diff --git a/applications/plugins/pocsag_pager/images/Scanning_123x52_sfw.png b/applications/plugins/pocsag_pager/images/Scanning_123x52_sfw.png deleted file mode 100644 index ec785948d..000000000 Binary files a/applications/plugins/pocsag_pager/images/Scanning_123x52_sfw.png and /dev/null differ diff --git a/applications/plugins/pocsag_pager/images/WarningDolphin_45x42.png b/applications/plugins/pocsag_pager/images/WarningDolphin_45x42.png index db225de36..d766ffbb4 100644 Binary files a/applications/plugins/pocsag_pager/images/WarningDolphin_45x42.png and b/applications/plugins/pocsag_pager/images/WarningDolphin_45x42.png differ diff --git a/applications/plugins/pocsag_pager/images/WarningDolphin_45x42_sfw.png b/applications/plugins/pocsag_pager/images/WarningDolphin_45x42_sfw.png deleted file mode 100644 index d766ffbb4..000000000 Binary files a/applications/plugins/pocsag_pager/images/WarningDolphin_45x42_sfw.png and /dev/null differ diff --git a/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c b/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c index ec6075612..972c8dafb 100644 --- a/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c +++ b/applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c @@ -7,8 +7,6 @@ #include #include -#include "../../../settings/xtreme_settings/xtreme_assets.h" - #define FRAME_HEIGHT 12 #define MAX_LEN_PX 112 #define MENU_ITEMS 4u @@ -206,7 +204,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) { canvas_set_color(canvas, ColorBlack); if(model->history_item == 0) { - canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning); + canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Scanning..."); canvas_draw_line(canvas, 46, 51, 125, 51); @@ -228,11 +226,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) { canvas_draw_icon(canvas, 65, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 80, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 95, 42, &I_Pin_back_arrow_10x8); - if(XTREME_SETTINGS()->sfw_mode) { - canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42_sfw); - } else { - canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42); - } + canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42); canvas_draw_dot(canvas, 17, 61); break; case PCSGReceiverBarShowUnlock: diff --git a/applications/plugins/weather_station/images/Scanning_123x52.png b/applications/plugins/weather_station/images/Scanning_123x52.png index a48c5330e..ec785948d 100644 Binary files a/applications/plugins/weather_station/images/Scanning_123x52.png and b/applications/plugins/weather_station/images/Scanning_123x52.png differ diff --git a/applications/plugins/weather_station/images/Scanning_123x52_sfw.png b/applications/plugins/weather_station/images/Scanning_123x52_sfw.png deleted file mode 100644 index ec785948d..000000000 Binary files a/applications/plugins/weather_station/images/Scanning_123x52_sfw.png and /dev/null differ diff --git a/applications/plugins/weather_station/images/WarningDolphin_45x42.png b/applications/plugins/weather_station/images/WarningDolphin_45x42.png index db225de36..d766ffbb4 100644 Binary files a/applications/plugins/weather_station/images/WarningDolphin_45x42.png and b/applications/plugins/weather_station/images/WarningDolphin_45x42.png differ diff --git a/applications/plugins/weather_station/images/WarningDolphin_45x42_sfw.png b/applications/plugins/weather_station/images/WarningDolphin_45x42_sfw.png deleted file mode 100644 index d766ffbb4..000000000 Binary files a/applications/plugins/weather_station/images/WarningDolphin_45x42_sfw.png and /dev/null differ diff --git a/applications/plugins/weather_station/views/weather_station_receiver.c b/applications/plugins/weather_station/views/weather_station_receiver.c index 01947455d..42a90b22d 100644 --- a/applications/plugins/weather_station/views/weather_station_receiver.c +++ b/applications/plugins/weather_station/views/weather_station_receiver.c @@ -7,8 +7,6 @@ #include #include -#include "../../../settings/xtreme_settings/xtreme_assets.h" - #define FRAME_HEIGHT 12 #define MAX_LEN_PX 112 #define MENU_ITEMS 4u @@ -202,7 +200,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) { canvas_set_color(canvas, ColorBlack); if(model->history_item == 0) { - canvas_draw_icon(canvas, 0, 0, XTREME_ASSETS()->subghz_scanning); + canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 63, 46, "Scanning..."); canvas_draw_line(canvas, 46, 51, 125, 51); @@ -224,11 +222,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) { canvas_draw_icon(canvas, 65, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 80, 42, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 95, 42, &I_Pin_back_arrow_10x8); - if(XTREME_SETTINGS()->sfw_mode) { - canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42_sfw); - } else { - canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42); - } + canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42); canvas_draw_dot(canvas, 17, 61); break; case WSReceiverBarShowUnlock: