diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index 12e18be4a..8132b17c2 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -12,19 +12,15 @@ #define MOODS_TOTAL 3 #define BUTTHURT_MAX 3 -static const Icon* const portrait_happy[BUTTHURT_MAX] = {&I_flipper}; -// &I_passport_happy1_46x49, -// &I_passport_happy2_46x49, -// &I_passport_happy3_46x49}; -static const Icon* const portrait_ok[BUTTHURT_MAX] = {&I_flipper}; -// &I_passport_okay1_46x49, -// &I_passport_okay2_46x49, -// &I_passport_okay3_46x49}; -static const Icon* const portrait_bad[BUTTHURT_MAX] = {&I_flipper}; -// &I_passport_bad1_46x49, -// &I_passport_bad2_46x49, -// &I_passport_bad3_46x49}; +static const Icon* const portrait_happy_sfw[BUTTHURT_MAX] = {&I_flipper_sfw}; +static const Icon* const portrait_ok_sfw[BUTTHURT_MAX] = {&I_flipper_sfw}; +static const Icon* const portrait_bad_sfw[BUTTHURT_MAX] = {&I_flipper_sfw}; +static const Icon* const portrait_happy[BUTTHURT_MAX] = {&I_flipper}; +static const Icon* const portrait_ok[BUTTHURT_MAX] = {&I_flipper}; +static const Icon* const portrait_bad[BUTTHURT_MAX] = {&I_flipper}; + +static const Icon* const* portraits_sfw[MOODS_TOTAL] = {portrait_happy_sfw, portrait_ok_sfw, portrait_bad_sfw}; static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad}; // static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy}; @@ -83,12 +79,22 @@ static void render_callback(Canvas* canvas, void* ctx) { } // multipass - canvas_draw_icon(canvas, 0, 0, &I_passport_DB); + if (settings->sfw_mode) { + canvas_draw_icon(canvas, 0, 0, &I_passport_DB_sfw); + } + else { + canvas_draw_icon(canvas, 0, 0, &I_passport_DB); + } // portrait furi_assert((stats->level > 0) && (stats->level <= 30)); uint16_t tmpLvl = 0; - canvas_draw_icon(canvas, 11, 2, portraits[mood][tmpLvl]); + if (settings->sfw_mode) { + canvas_draw_icon(canvas, 11, 2, portraits_sfw[mood][tmpLvl]); + } + else { + canvas_draw_icon(canvas, 11, 2, portraits[mood][tmpLvl]); + } const char* my_name = furi_hal_version_get_name_ptr(); snprintf(level_str, 12, "Level: %hu", stats->level); diff --git a/assets/icons/Passport/flipper_sfw.png b/assets/icons/Passport/flipper_sfw.png new file mode 100644 index 000000000..198ba5436 Binary files /dev/null and b/assets/icons/Passport/flipper_sfw.png differ diff --git a/assets/icons/Passport/passport_DB_sfw.png b/assets/icons/Passport/passport_DB_sfw.png new file mode 100644 index 000000000..69b2ac9ad Binary files /dev/null and b/assets/icons/Passport/passport_DB_sfw.png differ diff --git a/assets/resources/dolphin/lvl_1/frame_13.bm b/assets/resources/dolphin/lvl_1/frame_13.bm index d56ded472..c93bbb357 100644 Binary files a/assets/resources/dolphin/lvl_1/frame_13.bm and b/assets/resources/dolphin/lvl_1/frame_13.bm differ diff --git a/assets/resources/dolphin/lvl_1/frame_16.bm b/assets/resources/dolphin/lvl_1/frame_16.bm index 4f15db492..fad6d98d0 100644 Binary files a/assets/resources/dolphin/lvl_1/frame_16.bm and b/assets/resources/dolphin/lvl_1/frame_16.bm differ diff --git a/assets/resources/dolphin/lvl_1/frame_17.bm b/assets/resources/dolphin/lvl_1/frame_17.bm index a82613f83..923dcccc4 100644 Binary files a/assets/resources/dolphin/lvl_1/frame_17.bm and b/assets/resources/dolphin/lvl_1/frame_17.bm differ diff --git a/assets/resources/dolphin/lvl_1/frame_18.bm b/assets/resources/dolphin/lvl_1/frame_18.bm index c9bf0d8c3..0a60f3b79 100644 Binary files a/assets/resources/dolphin/lvl_1/frame_18.bm and b/assets/resources/dolphin/lvl_1/frame_18.bm differ