diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_error.c b/applications/main/bad_usb/scenes/bad_usb_scene_error.c index 4d4aa268b..2c707bbf1 100644 --- a/applications/main/bad_usb/scenes/bad_usb_scene_error.c +++ b/applications/main/bad_usb/scenes/bad_usb_scene_error.c @@ -32,18 +32,7 @@ void bad_usb_scene_error_on_enter(void* context) { app->widget, GuiButtonTypeLeft, "Back", bad_usb_scene_error_event_callback, app); } else if(app->error == BadUsbAppErrorCloseRpc) { widget_add_icon_element(app->widget, 78, 0, &I_ActiveConnection_50x64); - if(XTREME_SETTINGS()->sfw_mode) { - widget_add_string_multiline_element( - app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!"); - widget_add_string_multiline_element( - app->widget, - 3, - 30, - AlignLeft, - AlignTop, - FontSecondary, - "Disconnect from\nPC or phone to\nuse this function."); - } else { + if(XTREME_SETTINGS()->nsfw_mode) { widget_add_string_multiline_element( app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "I am not\na whore!"); widget_add_string_multiline_element( @@ -54,6 +43,17 @@ void bad_usb_scene_error_on_enter(void* context) { AlignTop, FontSecondary, "Pull out from\nPC or phone to\nuse me like this."); + } else { + widget_add_string_multiline_element( + app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!"); + widget_add_string_multiline_element( + app->widget, + 3, + 30, + AlignLeft, + AlignTop, + FontSecondary, + "Disconnect from\nPC or phone to\nuse this function."); } } diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c index 10e950a70..ad889cd1c 100644 --- a/applications/main/bad_usb/views/bad_usb_view.c +++ b/applications/main/bad_usb/views/bad_usb_view.c @@ -49,10 +49,10 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) { if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone) || (model->state.state == BadUsbStateNotConnected)) { - if(xtreme_settings->sfw_mode) { - elements_button_center(canvas, "Start"); - } else { + if(xtreme_settings->nsfw_mode) { elements_button_center(canvas, "Cum"); + } else { + elements_button_center(canvas, "Start"); } } else if((model->state.state == BadUsbStateRunning) || (model->state.state == BadUsbStateDelay)) { elements_button_center(canvas, "Stop"); @@ -68,20 +68,20 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) { if(model->state.state == BadUsbStateNotConnected) { canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18); canvas_set_font(canvas, FontPrimary); - if(xtreme_settings->sfw_mode) { - canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect to"); - canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "a device"); - } else { + if(xtreme_settings->nsfw_mode) { canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Plug me"); canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "in, Daddy"); + } else { + canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect to"); + canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "a device"); } } else if(model->state.state == BadUsbStateWillRun) { canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18); canvas_set_font(canvas, FontPrimary); - if(xtreme_settings->sfw_mode) { - canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will run"); - } else { + if(xtreme_settings->nsfw_mode) { canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will cum"); + } else { + canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will run"); } canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "on connect"); } else if(model->state.state == BadUsbStateFileError) { diff --git a/applications/main/u2f/scenes/u2f_scene_error.c b/applications/main/u2f/scenes/u2f_scene_error.c index 670b022ca..162faf2f1 100644 --- a/applications/main/u2f/scenes/u2f_scene_error.c +++ b/applications/main/u2f/scenes/u2f_scene_error.c @@ -27,18 +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()->sfw_mode) { - widget_add_string_multiline_element( - app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!"); - widget_add_string_multiline_element( - app->widget, - 3, - 30, - AlignLeft, - AlignTop, - FontSecondary, - "Disconnect from\nPC or phone to\nuse this function."); - } else { + if(XTREME_SETTINGS()->nsfw_mode) { widget_add_string_multiline_element( app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "I am not\na whore!"); widget_add_string_multiline_element( @@ -49,6 +38,17 @@ void u2f_scene_error_on_enter(void* context) { AlignTop, FontSecondary, "Pull out from\nPC or phone to\nuse me like this."); + } else { + widget_add_string_multiline_element( + app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!"); + widget_add_string_multiline_element( + app->widget, + 3, + 30, + AlignLeft, + AlignTop, + FontSecondary, + "Disconnect from\nPC or phone to\nuse this function."); } } diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c index 8fce28950..dadafe93d 100644 --- a/applications/main/u2f/views/u2f_view.c +++ b/applications/main/u2f/views/u2f_view.c @@ -21,55 +21,55 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { if(model->display_msg == U2fMsgNotConnected) { canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->connect_me); - if(XTREME_SETTINGS()->sfw_mode) { - canvas_draw_str_aligned( - canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device"); - } else { + if(XTREME_SETTINGS()->nsfw_mode) { canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy"); + } else { + canvas_draw_str_aligned( + canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device"); } } else if(model->display_msg == U2fMsgIdle) { canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->connected); canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!"); } else if(model->display_msg == U2fMsgRegister) { - if(XTREME_SETTINGS()->sfw_mode) { - elements_button_center(canvas, "OK"); - canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate); - canvas_draw_str_aligned( - canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); - } else { + if(XTREME_SETTINGS()->nsfw_mode) { elements_button_center(canvas, "CUM"); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to register"); - } - } else if(model->display_msg == U2fMsgAuth) { - if(XTREME_SETTINGS()->sfw_mode) { + } else { elements_button_center(canvas, "OK"); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate); canvas_draw_str_aligned( - canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate"); - } else { + canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); + } + } else if(model->display_msg == U2fMsgAuth) { + if(XTREME_SETTINGS()->nsfw_mode) { elements_button_center(canvas, "CUM"); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate); canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to authenticate"); + } else { + elements_button_center(canvas, "OK"); + canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate); + canvas_draw_str_aligned( + canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate"); } } else if(model->display_msg == U2fMsgSuccess) { canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->connected); - if(XTREME_SETTINGS()->sfw_mode) { + if(XTREME_SETTINGS()->nsfw_mode) { + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~"); + } else { canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!"); - } else { - canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~"); } } else if(model->display_msg == U2fMsgError) { canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->error); - if(XTREME_SETTINGS()->sfw_mode) { + if(XTREME_SETTINGS()->nsfw_mode) { + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum"); + } else { canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Certificate error"); - } else { - canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum"); } } } diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index c00679d04..c1eb50d59 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -571,7 +571,9 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio View* next_view = one_shot_view_get_view(animation_manager->one_shot_view); view_stack_remove_view(animation_manager->view_stack, prev_view); view_stack_add_view(animation_manager->view_stack, next_view); - if(XTREME_SETTINGS()->sfw_mode) { + if(XTREME_SETTINGS()->nsfw_mode) { + one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup1_128x64); + } else { if(stats.level <= 20) { one_shot_view_start_animation( animation_manager->one_shot_view, &A_Levelup1_128x64_sfw); @@ -581,8 +583,6 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio } else { furi_assert(0); } - } else { - one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup1_128x64); } } diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c index 4c7ef535a..ffa01d883 100644 --- a/applications/services/desktop/animations/animation_storage.c +++ b/applications/services/desktop/animations/animation_storage.c @@ -38,12 +38,12 @@ void animation_handler_select_manifest() { FURI_LOG_I(TAG, "Custom Manifest selected"); } else { furi_string_cat_str(anim_dir, BASE_ANIMATION_DIR); - if(xtreme_settings->sfw_mode) { - furi_string_cat_str(anim_dir, "/sfw"); - FURI_LOG_I(TAG, "SFW Manifest selected"); - } else { + if(xtreme_settings->nsfw_mode) { furi_string_cat_str(anim_dir, "/nsfw"); FURI_LOG_I(TAG, "NSFW Manifest selected"); + } else { + furi_string_cat_str(anim_dir, "/sfw"); + FURI_LOG_I(TAG, "SFW Manifest selected"); } } strlcpy(ANIMATION_DIR, furi_string_get_cstr(anim_dir), sizeof(ANIMATION_DIR)); diff --git a/applications/services/desktop/scenes/desktop_scene_fault.c b/applications/services/desktop/scenes/desktop_scene_fault.c index b0904c2b9..e4f5e788f 100644 --- a/applications/services/desktop/scenes/desktop_scene_fault.c +++ b/applications/services/desktop/scenes/desktop_scene_fault.c @@ -15,10 +15,10 @@ void desktop_scene_fault_on_enter(void* context) { Popup* popup = desktop->hw_mismatch_popup; popup_set_context(popup, desktop); - if(XTREME_SETTINGS()->sfw_mode) { + if(XTREME_SETTINGS()->nsfw_mode) { popup_set_header( popup, - "Flipper crashed\n but has been rebooted", + "Slut passed out\n but is now back", 60, 14 + STATUS_BAR_Y_SHIFT, AlignCenter, @@ -26,7 +26,7 @@ void desktop_scene_fault_on_enter(void* context) { } else { popup_set_header( popup, - "Slut passed out\n but is now back", + "Flipper crashed\n but has been rebooted", 60, 14 + STATUS_BAR_Y_SHIFT, AlignCenter, diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index 9fc1d5e76..8678a5d66 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -40,18 +40,7 @@ static void render_callback(Canvas* canvas, void* _ctx) { const char* mood_str = NULL; const Icon* portrait = NULL; - if(XTREME_SETTINGS()->sfw_mode) { - if(stats->butthurt <= 4) { - portrait = xtreme_assets->passport_happy; - mood_str = "Mood: Happy"; - } else if(stats->butthurt <= 9) { - portrait = xtreme_assets->passport_okay; - mood_str = "Mood: Okay"; - } else { - portrait = xtreme_assets->passport_angry; - mood_str = "Mood: Angry"; - } - } else { + if(XTREME_SETTINGS()->nsfw_mode) { if(stats->butthurt <= 4) { portrait = xtreme_assets->passport_happy; mood_str = "Status: Wet"; @@ -62,6 +51,17 @@ static void render_callback(Canvas* canvas, void* _ctx) { portrait = xtreme_assets->passport_angry; mood_str = "Status: Desperate"; } + } else { + if(stats->butthurt <= 4) { + portrait = xtreme_assets->passport_happy; + mood_str = "Mood: Happy"; + } else if(stats->butthurt <= 9) { + portrait = xtreme_assets->passport_okay; + mood_str = "Mood: Okay"; + } else { + portrait = xtreme_assets->passport_angry; + mood_str = "Mood: Angry"; + } } uint32_t xp_progress = 0; uint32_t xp_need = dolphin_state_xp_to_levelup(stats->icounter); diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c index b92662682..e870c3e05 100644 --- a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c +++ b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c @@ -12,12 +12,12 @@ 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()->sfw_mode) { - dialog_ex_set_text( - dialog, " I will be\nwaiting for\n you here", 78, 16, AlignLeft, AlignTop); - } else { + if(XTREME_SETTINGS()->nsfw_mode) { dialog_ex_set_text( dialog, " I will be\nwaiting for\n you master", 78, 16, AlignLeft, AlignTop); + } else { + dialog_ex_set_text( + dialog, " I will be\nwaiting for\n you here", 78, 16, AlignLeft, AlignTop); } dialog_ex_set_icon(dialog, 21, 13, XTREME_ASSETS()->dolphin_cry); dialog_ex_set_left_button_text(dialog, "Back"); diff --git a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c b/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c index 992c5b472..e5e7c0339 100644 --- a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c +++ b/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c @@ -5,8 +5,8 @@ static void xtreme_settings_scene_start_base_graphics_changed(VariableItem* item) { XtremeSettingsApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); - variable_item_set_current_value_text(item, value ? "SFW" : "NSFW"); - XTREME_SETTINGS()->sfw_mode = value; + variable_item_set_current_value_text(item, value ? "NSFW" : "SFW"); + XTREME_SETTINGS()->nsfw_mode = value; app->settings_changed = true; app->assets_changed = true; } @@ -143,8 +143,8 @@ void xtreme_settings_scene_start_on_enter(void* context) { 2, xtreme_settings_scene_start_base_graphics_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->sfw_mode); - variable_item_set_current_value_text(item, xtreme_settings->sfw_mode ? "SFW" : "NSFW"); + variable_item_set_current_value_index(item, xtreme_settings->nsfw_mode); + variable_item_set_current_value_text(item, xtreme_settings->nsfw_mode ? "NSFW" : "SFW"); item = variable_item_list_add( var_item_list, diff --git a/applications/settings/xtreme_settings/xtreme_assets.c b/applications/settings/xtreme_settings/xtreme_assets.c index 30383a5f3..5a79c65b2 100644 --- a/applications/settings/xtreme_settings/xtreme_assets.c +++ b/applications/settings/xtreme_settings/xtreme_assets.c @@ -17,30 +17,7 @@ void XTREME_ASSETS_LOAD() { xtreme_assets = malloc(sizeof(XtremeAssets)); XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - if (xtreme_settings->sfw_mode) { - xtreme_assets->authenticate = &I_Auth_62x31_sfw; - xtreme_assets->bt_pairing = &I_BLE_Pairing_128x64_sfw; - xtreme_assets->connect_me = &I_Connect_me_62x31_sfw; - xtreme_assets->connected = &I_Connected_62x31_sfw; - xtreme_assets->dolphin_common = &I_DolphinCommon_56x48_sfw; - xtreme_assets->dolphin_cry = &I_Cry_dolph_55x52_sfw; - xtreme_assets->dolphin_mafia = &I_DolphinMafia_115x62_sfw; - xtreme_assets->dolphin_nice = &I_DolphinNice_96x59_sfw; - xtreme_assets->dolphin_wait = &I_DolphinWait_61x59_sfw; - xtreme_assets->error = &I_Error_62x31_sfw; - xtreme_assets->ibutton_success = &I_iButtonDolphinVerySuccess_108x52_sfw; - xtreme_assets->ir_success = &I_DolphinReadingSuccess_59x63_sfw; - xtreme_assets->nfc_emulation = &I_NFC_dolphin_emulation_47x61_sfw; - xtreme_assets->rfid_receive = &I_RFIDDolphinReceive_97x61_sfw; - xtreme_assets->rfid_send = &I_RFIDDolphinSend_97x61_sfw; - xtreme_assets->rfid_success = &I_RFIDDolphinSuccess_108x57_sfw; - xtreme_assets->subghz_scanning = &I_Scanning_123x52_sfw; - - xtreme_assets->passport_angry = &I_passport_bad1_46x49_sfw; - xtreme_assets->passport_background = &I_passport_DB_sfw; - xtreme_assets->passport_happy = &I_passport_happy1_46x49_sfw; - xtreme_assets->passport_okay = &I_passport_okay1_46x49_sfw; - } else { + if (xtreme_settings->nsfw_mode) { xtreme_assets->authenticate = &I_Auth_62x31; xtreme_assets->bt_pairing = &I_BLE_Pairing_128x64; xtreme_assets->connect_me = &I_Connect_me_62x31; @@ -63,6 +40,29 @@ void XTREME_ASSETS_LOAD() { xtreme_assets->passport_background = &I_passport_DB; xtreme_assets->passport_happy = &I_flipper; xtreme_assets->passport_okay = &I_flipper; + } else { + xtreme_assets->authenticate = &I_Auth_62x31_sfw; + xtreme_assets->bt_pairing = &I_BLE_Pairing_128x64_sfw; + xtreme_assets->connect_me = &I_Connect_me_62x31_sfw; + xtreme_assets->connected = &I_Connected_62x31_sfw; + xtreme_assets->dolphin_common = &I_DolphinCommon_56x48_sfw; + xtreme_assets->dolphin_cry = &I_Cry_dolph_55x52_sfw; + xtreme_assets->dolphin_mafia = &I_DolphinMafia_115x62_sfw; + xtreme_assets->dolphin_nice = &I_DolphinNice_96x59_sfw; + xtreme_assets->dolphin_wait = &I_DolphinWait_61x59_sfw; + xtreme_assets->error = &I_Error_62x31_sfw; + xtreme_assets->ibutton_success = &I_iButtonDolphinVerySuccess_108x52_sfw; + xtreme_assets->ir_success = &I_DolphinReadingSuccess_59x63_sfw; + xtreme_assets->nfc_emulation = &I_NFC_dolphin_emulation_47x61_sfw; + xtreme_assets->rfid_receive = &I_RFIDDolphinReceive_97x61_sfw; + xtreme_assets->rfid_send = &I_RFIDDolphinSend_97x61_sfw; + xtreme_assets->rfid_success = &I_RFIDDolphinSuccess_108x57_sfw; + xtreme_assets->subghz_scanning = &I_Scanning_123x52_sfw; + + xtreme_assets->passport_angry = &I_passport_bad1_46x49_sfw; + xtreme_assets->passport_background = &I_passport_DB_sfw; + xtreme_assets->passport_happy = &I_passport_happy1_46x49_sfw; + xtreme_assets->passport_okay = &I_passport_okay1_46x49_sfw; } if (xtreme_settings->asset_pack[0] == '\0') return; diff --git a/applications/settings/xtreme_settings/xtreme_settings.h b/applications/settings/xtreme_settings/xtreme_settings.h index 0f13f0405..0a19ca643 100644 --- a/applications/settings/xtreme_settings/xtreme_settings.h +++ b/applications/settings/xtreme_settings/xtreme_settings.h @@ -18,7 +18,7 @@ typedef struct { int32_t cycle_anims; bool unlock_anims; - bool sfw_mode; + bool nsfw_mode; char asset_pack[MAX_PACK_NAME_LEN]; BatteryStyle battery_style; uint16_t anim_speed;