From 9f47b499e4d9bbe33563ef1d1f12503e7dd57676 Mon Sep 17 00:00:00 2001
From: Willy-JL <willy.leslie@icloud.com>
Date: Tue, 17 Jan 2023 17:01:20 +0000
Subject: [PATCH] Rename cycle anims

---
 .../desktop/animations/animation_manager.c    | 12 +++++-----
 .../scenes/xtreme_settings_scene_start.c      | 22 +++++++++----------
 .../xtreme_settings/xtreme_settings.h         |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index 87a0eade7..61df65d42 100644
--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -203,10 +203,10 @@ static void animation_manager_start_new_idle(AnimationManager* animation_manager
     animation_manager->state = AnimationManagerStateIdle;
     XtremeSettings* xtreme = XTREME_SETTINGS();
     int32_t duration = 0;
-    if (xtreme->cycle_animation == 0) {
+    if (xtreme->cycle_anims == 0) {
         duration = bubble_animation->duration;
-    } else if (xtreme->cycle_animation != -1) {
-        duration = xtreme->cycle_animation;
+    } else if (xtreme->cycle_anims != -1) {
+        duration = xtreme->cycle_anims;
     }
     furi_timer_start(animation_manager->idle_animation_timer, duration * 1000);
 }
@@ -520,10 +520,10 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m
                             animation_manager->current_animation);
                         XtremeSettings* xtreme = XTREME_SETTINGS();
                         int32_t duration = 0;
-                        if (xtreme->cycle_animation == 0) {
+                        if (xtreme->cycle_anims == 0) {
                             duration = bubble_animation->duration;
-                        } else if (xtreme->cycle_animation != -1) {
-                            duration = xtreme->cycle_animation;
+                        } else if (xtreme->cycle_anims != -1) {
+                            duration = xtreme->cycle_anims;
                         }
                         furi_timer_start(
                             animation_manager->idle_animation_timer, duration * 1000);
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 11c574a88..42c643777 100644
--- a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c
+++ b/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c
@@ -1,8 +1,8 @@
 #include "../xtreme_settings_app.h"
 #include <lib/toolbox/value_index.h>
 
-#define CYCLE_ANIMATION_COUNT 13
-const char* const cycle_animation_names[CYCLE_ANIMATION_COUNT] = {
+#define CYCLE_ANIMS_COUNT 13
+const char* const cycle_anims_names[CYCLE_ANIMS_COUNT] = {
     "OFF",
     "Manifest",
     "30 S",
@@ -18,13 +18,13 @@ const char* const cycle_animation_names[CYCLE_ANIMATION_COUNT] = {
     "24 H",
 };
 
-const int32_t cycle_animation_values[CYCLE_ANIMATION_COUNT] =
+const int32_t cycle_anims_values[CYCLE_ANIMS_COUNT] =
     {-1, 0, 30, 60, 300, 600, 900, 1800, 3600, 7200, 21600, 43200, 86400};
 
-static void xtreme_settings_scene_start_cycle_animation_changed(VariableItem* item) {
+static void xtreme_settings_scene_start_cycle_anims_changed(VariableItem* item) {
     uint8_t index = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, cycle_animation_names[index]);
-    XTREME_SETTINGS()->cycle_animation = cycle_animation_values[index];
+    variable_item_set_current_value_text(item, cycle_anims_names[index]);
+    XTREME_SETTINGS()->cycle_anims = cycle_anims_values[index];
     XTREME_SETTINGS_SAVE();
 }
 
@@ -37,14 +37,14 @@ void xtreme_settings_scene_start_on_enter(void* context) {
 
     item = variable_item_list_add(
         var_item_list,
-        "Cycle Animation",
-        CYCLE_ANIMATION_COUNT,
-        xtreme_settings_scene_start_cycle_animation_changed,
+        "Cycle Anims",
+        CYCLE_ANIMS_COUNT,
+        xtreme_settings_scene_start_cycle_anims_changed,
         app);
     value_index = value_index_int32(
-        xtreme->unlock_animations, cycle_animation_values, CYCLE_ANIMATION_COUNT);
+        xtreme->cycle_anims, cycle_anims_values, CYCLE_ANIMS_COUNT);
     variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, cycle_animation_names[value_index]);
+    variable_item_set_current_value_text(item, cycle_anims_names[value_index]);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, XtremeSettingsAppViewVarItemList);
 }
diff --git a/applications/settings/xtreme_settings/xtreme_settings.h b/applications/settings/xtreme_settings/xtreme_settings.h
index 5df94c427..4bf0aa880 100644
--- a/applications/settings/xtreme_settings/xtreme_settings.h
+++ b/applications/settings/xtreme_settings/xtreme_settings.h
@@ -13,8 +13,8 @@
 #define XTREME_SETTINGS_MAGIC (0x69)
 
 typedef struct {
-    int32_t cycle_animation;
-    bool unlock_animations;
+    int32_t cycle_anims;
+    bool unlock_anims;
     // uint8_t sfw_mode;
 } XtremeSettings;