Part 4 / 5

applications/settings/about/about.c

@@ -99,7 +99,7 @@ static DialogMessageButton hw_version_screen(DialogsApp* dialogs, DialogMessage*
         furi_string_cat_printf(buffer, "%02X", uid[i]);
     }
 
-    dialog_message_set_header(message, "HW Version Info:", 0, 0, AlignLeft, AlignTop);
+    dialog_message_set_header(message, "Hardware Info:", 0, 0, AlignLeft, AlignTop);
     dialog_message_set_text(message, furi_string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
     result = dialog_message_show(dialogs, message);
     dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
@@ -135,8 +135,8 @@ static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage*
             version_get_gitbranch(ver));
     }
 
-    dialog_message_set_header(message, "FW Version Info:", 0, 0, AlignLeft, AlignTop);
-    dialog_message_set_text(message, furi_string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
+    dialog_message_set_header(message, "Firmware Info:", 0, 0, AlignLeft, AlignTop);
+    dialog_message_set_text(message, "XFW - Xtreme Firmware\nGithub.com/ClaraCrazy/Flipper-Xtreme", 0, 13, AlignLeft, AlignTop);
     result = dialog_message_show(dialogs, message);
     dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
     dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop);
@@ -147,12 +147,13 @@ static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage*
 
 const AboutDialogScreen about_screens[] = {
     product_screen,
-    compliance_screen,
-    address_screen,
+    hw_version_screen,
+    fw_version_screen,
     icon1_screen,
     icon2_screen,
-    hw_version_screen,
-    fw_version_screen};
+    compliance_screen,
+    address_screen};
+
 
 const size_t about_screens_count = sizeof(about_screens) / sizeof(AboutDialogScreen);
 

applications/settings/dolphin_passport/passport.c

@@ -9,40 +9,27 @@
 #include "../desktop_settings/desktop_settings_app.h"
 #include "math.h"
 
-#define MOODS_TOTAL 1
-#define BUTTHURT_MAX 14
+#define MOODS_TOTAL 3
+#define BUTTHURT_MAX 3
 
-static const Icon* const portrait_happy[7] = {
+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};
-// static const Icon* const portrait_ok[MOODS_TOTAL] = {
 // &I_passport_okay1_46x49,
 // &I_passport_okay2_46x49,
 // &I_passport_okay3_46x49};
-// static const Icon* const portrait_bad[MOODS_TOTAL] = {
+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* portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad};
-static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy};
-
-static const char* const moods[16] = {
-    "Stoned",
-    "Baked",
-    "Ripped",
-    "Joyful",
-    "Happy",
-    "Satisfied",
-    "Relaxed",
-    "Nostalgic",
-    "Okay",
-    "Tired",
-    "Bored",
-    "Sad",
-    "Annoyed",
-    "Upset",
-    "Angry",
-    "Furious"};
+static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy, portrait_ok, portrait_bad};
+// static const Icon* const* portraits[MOODS_TOTAL] = {portrait_happy};
 
 static void input_callback(InputEvent* input, void* ctx) {
     FuriSemaphore* semaphore = ctx;
@@ -54,17 +41,21 @@ static void input_callback(InputEvent* input, void* ctx) {
 
 static void render_callback(Canvas* canvas, void* ctx) {
     DolphinStats* stats = ctx;
-    DesktopSettings* desktop_settings = malloc(sizeof(DesktopSettings));
-    DESKTOP_SETTINGS_LOAD(desktop_settings);
 
-    char level_str[12];
-    char xp_str[12];
-    char mood_str[20];
+    char level_str[20];
+    char mood_str[32];
     uint8_t mood = 0;
-    uint8_t moodStrIndex = stats->butthurt;
-    if(desktop_settings->is_dumbmode) moodStrIndex = moodStrIndex + 4;
-    snprintf(mood_str, 20, "Mood: %s", moods[moodStrIndex]);
-    mood = 0; // DONT NEED DIFFERENT PICS BASED ON MOOD
+
+    if(stats->butthurt <= 4) {
+        mood = 0;
+        snprintf(mood_str, 20, "Mood: Wet");
+    } else if(stats->butthurt <= 9) {
+        mood = 1;
+        snprintf(mood_str, 20, "Mood: Horny");
+    } else {
+        mood = 2;
+        snprintf(mood_str, 20, "Mood: Desperate");
+    }
 
     uint32_t xp_progress = 0;
     uint32_t xp_to_levelup = dolphin_state_xp_to_levelup(stats->icounter);

applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c

@@ -12,7 +12,7 @@ void power_settings_scene_power_off_on_enter(void* context) {
 
     dialog_ex_set_header(dialog, "Turn Off Device?", 64, 2, AlignCenter, AlignTop);
     dialog_ex_set_text(
-        dialog, "   I will be\nwaiting for\n you here...", 78, 16, AlignLeft, AlignTop);
+        dialog, "   I will be\nwaiting for\n you master", 78, 16, AlignLeft, AlignTop);
     dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52);
     dialog_ex_set_left_button_text(dialog, "Back");
     dialog_ex_set_right_button_text(dialog, "OFF");

assets/dolphin/external/lvl_18/meta.txt

@@ -4,11 +4,11 @@ Version: 1
 Width: 128
 Height: 64
 Passive frames: 23
-Active frames: 18
-Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
-Active cycles: 1
-Frame rate: 2
+Active frames: 0
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
+Active cycles: 0
+Frame rate: 6
 Duration: 3600
-Active cooldown: 7
+Active cooldown: 0
 
-Bubble slots: 0
+Bubble slots: 0

assets/dolphin/external/lvl_19/meta.txt

@@ -0,0 +1,14 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 22
+Active frames: 0
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
+Active cycles: 0
+Frame rate: 6
+Duration: 3600
+Active cooldown: 0
+
+Bubble slots: 0

assets/dolphin/external/lvl_26/meta.txt

@@ -3,11 +3,11 @@ Version: 1
 
 Width: 128
 Height: 64
-Passive frames: 8
+Passive frames: 12
 Active frames: 0
-Frames order: 0 1 2 3 4 5 6 7
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11
 Active cycles: 0
-Frame rate: 3
+Frame rate: 6
 Duration: 3600
 Active cooldown: 0
 

assets/dolphin/external/lvl_27/meta.txt

@@ -0,0 +1,14 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 22
+Active frames: 0
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
+Active cycles: 0
+Frame rate: 6
+Duration: 3600
+Active cooldown: 0
+
+Bubble slots: 0