Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-07 19:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move is_nsfw to xtreme_assets struct

Browse Source
This commit is contained in:
Willy-JL
2024-01-14 00:16:26 +00:00
parent 23ad52944b
commit f475bdd522
8 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/bad_kb/views/bad_kb_view.c
+3 -3
View File
@@ -48,7 +48,7 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) {
if((state == BadKbStateIdle) || (state == BadKbStateDone) ||
(state == BadKbStateNotConnected)) {
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
elements_button_center(canvas, "Cum");
} else {
elements_button_center(canvas, "Run");
@@ -71,7 +71,7 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) {
if(state == BadKbStateNotConnected) {
canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
canvas_set_font(canvas, FontPrimary);
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Plug me");
canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "in, Daddy");
} else {
@@ -81,7 +81,7 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) {
} else if(state == BadKbStateWillRun) {
canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
canvas_set_font(canvas, FontPrimary);
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will cum");
} else {
canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will run");
applications/main/u2f/views/u2f_view.c
+5 -5
View File
@@ -21,7 +21,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
if(model->display_msg == U2fMsgNotConnected) {
canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31);
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy");
} else {
@@ -32,7 +32,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31);
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!");
} else if(model->display_msg == U2fMsgRegister) {
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
elements_button_center(canvas, "CUM");
canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31);
canvas_draw_str_aligned(
@@ -44,7 +44,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register");
}
} else if(model->display_msg == U2fMsgAuth) {
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
elements_button_center(canvas, "CUM");
canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31);
canvas_draw_str_aligned(
@@ -57,7 +57,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
}
} else if(model->display_msg == U2fMsgSuccess) {
canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31);
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~");
} else {
canvas_draw_str_aligned(
@@ -65,7 +65,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
}
} else if(model->display_msg == U2fMsgError) {
canvas_draw_icon(canvas, 22, 15, &I_Error_62x31);
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum");
} else {
canvas_draw_str_aligned(
applications/services/desktop/scenes/desktop_scene_fault.c
+1 -1
View File
@@ -15,7 +15,7 @@ void desktop_scene_fault_on_enter(void* context) {
Popup* popup = desktop->hw_mismatch_popup;
popup_set_context(popup, desktop);
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
popup_set_header(
popup,
"Slut passed out\n but is now back",
applications/settings/dolphin_passport/passport.c
+1 -1
View File
@@ -38,7 +38,7 @@ static void render_callback(Canvas* canvas, void* _ctx) {
const char* mood_str = NULL;
const Icon* portrait = NULL;
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
if(stats->butthurt <= 4) {
portrait = &I_passport_happy_46x49;
mood_str = "Status: Wet";
applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
+1 -1
View File
@@ -12,7 +12,7 @@ void power_settings_scene_power_off_on_enter(void* context) {
DialogEx* dialog = app->dialog;
dialog_ex_set_header(dialog, "Turn Off Device?", 64, 2, AlignCenter, AlignTop);
if(xtreme_settings.is_nsfw) {
if(xtreme_assets.is_nsfw) {
dialog_ex_set_text(
dialog, " I will be\nwaiting for\n you master", 78, 16, AlignLeft, AlignTop);
} else {
lib/xtreme/assets.c
+5 -1
View File
@@ -9,6 +9,10 @@
#define ICONS_FMT XTREME_ASSETS_PATH "/%s/Icons/%s"
XtremeAssets xtreme_assets = {
.is_nsfw = false,
};
void load_icon_animated(const Icon* replace, const char* name, FuriString* path, File* file) {
const char* pack = xtreme_settings.asset_pack;
furi_string_printf(path, ICONS_FMT "/meta", pack, name);
@@ -103,7 +107,7 @@ void free_icon(const Icon* icon) {
void XTREME_ASSETS_LOAD() {
const char* pack = xtreme_settings.asset_pack;
xtreme_settings.is_nsfw = !strncmp(pack, "NSFW", strlen("NSFW"));
xtreme_assets.is_nsfw = !strncmp(pack, "NSFW", strlen("NSFW"));
if(pack[0] == '\0') return;
Storage* storage = furi_record_open(RECORD_STORAGE);
lib/xtreme/xtreme.h
+5 -2
View File
@@ -51,8 +51,6 @@ typedef enum {
} UARTChannel;
typedef struct {
bool is_nsfw; // TODO: replace with packs text support
char asset_pack[XTREME_ASSETS_PACK_NAME_LEN];
uint32_t anim_speed;
int32_t cycle_anims;
@@ -91,12 +89,17 @@ typedef struct {
UARTChannel uart_general_channel;
} XtremeSettings;
typedef struct {
bool is_nsfw; // TODO: replace with packs text support
} XtremeAssets;
void XTREME_SETTINGS_LOAD();
void XTREME_SETTINGS_SAVE();
extern XtremeSettings xtreme_settings;
void XTREME_ASSETS_LOAD();
void XTREME_ASSETS_FREE();
extern XtremeAssets xtreme_assets;
#ifdef __cplusplus
}
targets/f7/api_symbols.csv
+1
View File
@@ -4037,4 +4037,5 @@ Variable,+,usb_cdc_single,FuriHalUsbInterface,
Variable,+,usb_hid,FuriHalUsbInterface,
Variable,+,usb_hid_u2f,FuriHalUsbInterface,
Variable,+,usbd_devfs,const usbd_driver,
Variable,+,xtreme_assets,XtremeAssets,
Variable,+,xtreme_settings,XtremeSettings,
1 entry status name type params
4037 Variable + usb_hid FuriHalUsbInterface
4038 Variable + usb_hid_u2f FuriHalUsbInterface
4039 Variable + usbd_devfs const usbd_driver
4040 Variable + xtreme_assets XtremeAssets
4041 Variable + xtreme_settings XtremeSettings