Rename frequencies menus to freqs to avoid scroll

applications/main/xtreme_app/scenes/xtreme_app_scene_config.h

@@ -7,10 +7,10 @@ ADD_SCENE(xtreme_app, interface_lockscreen, InterfaceLockscreen)
 ADD_SCENE(xtreme_app, interface_statusbar, InterfaceStatusbar)
 ADD_SCENE(xtreme_app, interface_common, InterfaceCommon)
 ADD_SCENE(xtreme_app, protocols, Protocols)
-ADD_SCENE(xtreme_app, protocols_frequencies, ProtocolsFrequencies)
+ADD_SCENE(xtreme_app, protocols_freqs, ProtocolsFreqs)
-ADD_SCENE(xtreme_app, protocols_frequencies_static, ProtocolsFrequenciesStatic)
+ADD_SCENE(xtreme_app, protocols_freqs_static, ProtocolsFreqsStatic)
-ADD_SCENE(xtreme_app, protocols_frequencies_hopper, ProtocolsFrequenciesHopper)
+ADD_SCENE(xtreme_app, protocols_freqs_hopper, ProtocolsFreqsHopper)
-ADD_SCENE(xtreme_app, protocols_frequencies_add, ProtocolsFrequenciesAdd)
+ADD_SCENE(xtreme_app, protocols_freqs_add, ProtocolsFreqsAdd)
 ADD_SCENE(xtreme_app, misc, Misc)
 ADD_SCENE(xtreme_app, misc_screen, MiscScreen)
 ADD_SCENE(xtreme_app, misc_dolphin, MiscDolphin)

applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c

@@ -3,7 +3,7 @@
 enum VarItemListIndex {
     VarItemListIndexBadkbMode,
     VarItemListIndexBadbtRemember,
-    VarItemListIndexSubghzFrequencies,
+    VarItemListIndexSubghzFreqs,
     VarItemListIndexSubghzExtend,
 };
 
@@ -55,7 +55,7 @@ void xtreme_app_scene_protocols_on_enter(void* context) {
     variable_item_set_current_value_index(item, xtreme_settings->bad_bt_remember);
     variable_item_set_current_value_text(item, xtreme_settings->bad_bt_remember ? "ON" : "OFF");
 
-    item = variable_item_list_add(var_item_list, "SubGHz Frequencies", 0, NULL, app);
+    item = variable_item_list_add(var_item_list, "SubGHz Freqs", 0, NULL, app);
     variable_item_set_current_value_text(item, ">");
 
     item = variable_item_list_add(
@@ -80,8 +80,8 @@ bool xtreme_app_scene_protocols_on_event(void* context, SceneManagerEvent event)
         scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneProtocols, event.event);
         consumed = true;
         switch(event.event) {
-        case VarItemListIndexSubghzFrequencies:
+        case VarItemListIndexSubghzFreqs:
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFrequencies);
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqs);
             break;
         default:
             break;

applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs.c

@@ -2,24 +2,24 @@
 
 enum VarItemListIndex {
     VarItemListIndexUseDefaults,
-    VarItemListIndexStaticFrequencies,
+    VarItemListIndexStaticFreqs,
-    VarItemListIndexHopperFrequencies,
+    VarItemListIndexHopperFreqs,
 };
 
-void xtreme_app_scene_protocols_frequencies_var_item_list_callback(void* context, uint32_t index) {
+void xtreme_app_scene_protocols_freqs_var_item_list_callback(void* context, uint32_t index) {
     XtremeApp* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
 }
 
-static void xtreme_app_scene_protocols_frequencies_use_defaults_changed(VariableItem* item) {
+static void xtreme_app_scene_protocols_freqs_use_defaults_changed(VariableItem* item) {
     XtremeApp* app = variable_item_get_context(item);
     bool value = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, value ? "ON" : "OFF");
     app->subghz_use_defaults = value;
-    app->save_subghz_frequencies = true;
+    app->save_subghz_freqs = true;
 }
 
-void xtreme_app_scene_protocols_frequencies_on_enter(void* context) {
+void xtreme_app_scene_protocols_freqs_on_enter(void* context) {
     XtremeApp* app = context;
     VariableItemList* var_item_list = app->var_item_list;
     VariableItem* item;
@@ -28,41 +28,41 @@ void xtreme_app_scene_protocols_frequencies_on_enter(void* context) {
         var_item_list,
         "Use Defaults",
         2,
-        xtreme_app_scene_protocols_frequencies_use_defaults_changed,
+        xtreme_app_scene_protocols_freqs_use_defaults_changed,
         app);
     variable_item_set_current_value_index(item, app->subghz_use_defaults);
     variable_item_set_current_value_text(item, app->subghz_use_defaults ? "ON" : "OFF");
 
-    item = variable_item_list_add(var_item_list, "Static Frequencies", 0, NULL, app);
+    item = variable_item_list_add(var_item_list, "Static Freqs", 0, NULL, app);
     variable_item_set_current_value_text(item, ">");
 
-    item = variable_item_list_add(var_item_list, "Hopper Frequencies", 0, NULL, app);
+    item = variable_item_list_add(var_item_list, "Hopper Freqs", 0, NULL, app);
     variable_item_set_current_value_text(item, ">");
 
     variable_item_list_set_enter_callback(
-        var_item_list, xtreme_app_scene_protocols_frequencies_var_item_list_callback, app);
+        var_item_list, xtreme_app_scene_protocols_freqs_var_item_list_callback, app);
 
     variable_item_list_set_selected_item(
         var_item_list,
-        scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneProtocolsFrequencies));
+        scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneProtocolsFreqs));
 
     view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList);
 }
 
-bool xtreme_app_scene_protocols_frequencies_on_event(void* context, SceneManagerEvent event) {
+bool xtreme_app_scene_protocols_freqs_on_event(void* context, SceneManagerEvent event) {
     XtremeApp* app = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
         scene_manager_set_scene_state(
-            app->scene_manager, XtremeAppSceneProtocolsFrequencies, event.event);
+            app->scene_manager, XtremeAppSceneProtocolsFreqs, event.event);
         consumed = true;
         switch(event.event) {
-        case VarItemListIndexStaticFrequencies:
+        case VarItemListIndexStaticFreqs:
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFrequenciesStatic);
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsStatic);
             break;
-        case VarItemListIndexHopperFrequencies:
+        case VarItemListIndexHopperFreqs:
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFrequenciesHopper);
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsHopper);
             break;
         default:
             break;
@@ -72,7 +72,7 @@ bool xtreme_app_scene_protocols_frequencies_on_event(void* context, SceneManager
     return consumed;
 }
 
-void xtreme_app_scene_protocols_frequencies_on_exit(void* context) {
+void xtreme_app_scene_protocols_freqs_on_exit(void* context) {
     XtremeApp* app = context;
     variable_item_list_reset(app->var_item_list);
 }

applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_add.c

@@ -5,7 +5,7 @@ enum TextInputResult {
     TextInputResultError,
 };
 
-static void xtreme_app_scene_protocols_frequencies_add_text_input_callback(void* context) {
+static void xtreme_app_scene_protocols_freqs_add_text_input_callback(void* context) {
     XtremeApp* app = context;
 
     char* end;
@@ -15,17 +15,17 @@ static void xtreme_app_scene_protocols_frequencies_add_text_input_callback(void*
         return;
     }
     bool is_hopper =
-        scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneProtocolsFrequenciesAdd);
+        scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneProtocolsFreqsAdd);
     if(is_hopper) {
         FrequencyList_push_back(app->subghz_hopper_freqs, value);
     } else {
         FrequencyList_push_back(app->subghz_static_freqs, value);
     }
-    app->save_subghz_frequencies = true;
+    app->save_subghz_freqs = true;
     view_dispatcher_send_custom_event(app->view_dispatcher, TextInputResultOk);
 }
 
-void xtreme_app_scene_protocols_frequencies_add_on_enter(void* context) {
+void xtreme_app_scene_protocols_freqs_add_on_enter(void* context) {
     XtremeApp* app = context;
     TextInput* text_input = app->text_input;
 
@@ -35,7 +35,7 @@ void xtreme_app_scene_protocols_frequencies_add_on_enter(void* context) {
 
     text_input_set_result_callback(
         text_input,
-        xtreme_app_scene_protocols_frequencies_add_text_input_callback,
+        xtreme_app_scene_protocols_freqs_add_text_input_callback,
         app,
         app->subghz_freq_buffer,
         XTREME_SUBGHZ_FREQ_BUFFER_SIZE,
@@ -49,7 +49,7 @@ void callback_return(void* context) {
     scene_manager_previous_scene(app->scene_manager);
 }
 
-bool xtreme_app_scene_protocols_frequencies_add_on_event(void* context, SceneManagerEvent event) {
+bool xtreme_app_scene_protocols_freqs_add_on_event(void* context, SceneManagerEvent event) {
     XtremeApp* app = context;
     bool consumed = false;
 
@@ -77,7 +77,7 @@ bool xtreme_app_scene_protocols_frequencies_add_on_event(void* context, SceneMan
     return consumed;
 }
 
-void xtreme_app_scene_protocols_frequencies_add_on_exit(void* context) {
+void xtreme_app_scene_protocols_freqs_add_on_exit(void* context) {
     XtremeApp* app = context;
     text_input_reset(app->text_input);
 }

applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_hopper.c

@@ -6,14 +6,12 @@ enum VarItemListIndex {
     VarItemListIndexAddHopperFreq,
 };
 
-void xtreme_app_scene_protocols_frequencies_hopper_var_item_list_callback(
+void xtreme_app_scene_protocols_freqs_hopper_var_item_list_callback(void* context, uint32_t index) {
-    void* context,
-    uint32_t index) {
     XtremeApp* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
 }
 
-static void xtreme_app_scene_protocols_frequencies_hopper_frequency_changed(VariableItem* item) {
+static void xtreme_app_scene_protocols_freqs_hopper_frequency_changed(VariableItem* item) {
     XtremeApp* app = variable_item_get_context(item);
     app->subghz_hopper_index = variable_item_get_current_value_index(item);
     uint32_t value = *FrequencyList_get(app->subghz_hopper_freqs, app->subghz_hopper_index);
@@ -22,7 +20,7 @@ static void xtreme_app_scene_protocols_frequencies_hopper_frequency_changed(Vari
     variable_item_set_current_value_text(item, text);
 }
 
-void xtreme_app_scene_protocols_frequencies_hopper_on_enter(void* context) {
+void xtreme_app_scene_protocols_freqs_hopper_on_enter(void* context) {
     XtremeApp* app = context;
     VariableItemList* var_item_list = app->var_item_list;
     VariableItem* item;
@@ -31,7 +29,7 @@ void xtreme_app_scene_protocols_frequencies_hopper_on_enter(void* context) {
         var_item_list,
         "Hopper Freq",
         FrequencyList_size(app->subghz_hopper_freqs),
-        xtreme_app_scene_protocols_frequencies_hopper_frequency_changed,
+        xtreme_app_scene_protocols_freqs_hopper_frequency_changed,
         app);
     app->subghz_hopper_index = 0;
     variable_item_set_current_value_index(item, app->subghz_hopper_index);
@@ -49,23 +47,22 @@ void xtreme_app_scene_protocols_frequencies_hopper_on_enter(void* context) {
     variable_item_list_add(var_item_list, "Add Hopper Freq", 0, NULL, app);
 
     variable_item_list_set_enter_callback(
-        var_item_list, xtreme_app_scene_protocols_frequencies_hopper_var_item_list_callback, app);
+        var_item_list, xtreme_app_scene_protocols_freqs_hopper_var_item_list_callback, app);
 
     variable_item_list_set_selected_item(
         var_item_list,
-        scene_manager_get_scene_state(
+        scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneProtocolsFreqsHopper));
-            app->scene_manager, XtremeAppSceneProtocolsFrequenciesHopper));
 
     view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList);
 }
 
-bool xtreme_app_scene_protocols_frequencies_hopper_on_event(void* context, SceneManagerEvent event) {
+bool xtreme_app_scene_protocols_freqs_hopper_on_event(void* context, SceneManagerEvent event) {
     XtremeApp* app = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
         scene_manager_set_scene_state(
-            app->scene_manager, XtremeAppSceneProtocolsFrequenciesHopper, event.event);
+            app->scene_manager, XtremeAppSceneProtocolsFreqsHopper, event.event);
         consumed = true;
         switch(event.event) {
         case VarItemListIndexRemoveHopperFreq:
@@ -81,14 +78,14 @@ bool xtreme_app_scene_protocols_frequencies_hopper_on_event(void* context, Scene
                     FrequencyList_next(it);
                 }
             }
-            app->save_subghz_frequencies = true;
+            app->save_subghz_freqs = true;
             scene_manager_previous_scene(app->scene_manager);
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFrequenciesHopper);
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsHopper);
             break;
         case VarItemListIndexAddHopperFreq:
             scene_manager_set_scene_state(
-                app->scene_manager, XtremeAppSceneProtocolsFrequenciesAdd, true);
+                app->scene_manager, XtremeAppSceneProtocolsFreqsAdd, true);
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFrequenciesAdd);
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsAdd);
             break;
         default:
             break;
@@ -98,7 +95,7 @@ bool xtreme_app_scene_protocols_frequencies_hopper_on_event(void* context, Scene
     return consumed;
 }
 
-void xtreme_app_scene_protocols_frequencies_hopper_on_exit(void* context) {
+void xtreme_app_scene_protocols_freqs_hopper_on_exit(void* context) {
     XtremeApp* app = context;
     variable_item_list_reset(app->var_item_list);
 }

applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_static.c

@@ -6,14 +6,12 @@ enum VarItemListIndex {
     VarItemListIndexAddStaticFreq,
 };
 
-void xtreme_app_scene_protocols_frequencies_static_var_item_list_callback(
+void xtreme_app_scene_protocols_freqs_static_var_item_list_callback(void* context, uint32_t index) {
-    void* context,
-    uint32_t index) {
     XtremeApp* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
 }
 
-static void xtreme_app_scene_protocols_frequencies_static_frequency_changed(VariableItem* item) {
+static void xtreme_app_scene_protocols_freqs_static_frequency_changed(VariableItem* item) {
     XtremeApp* app = variable_item_get_context(item);
     app->subghz_static_index = variable_item_get_current_value_index(item);
     uint32_t value = *FrequencyList_get(app->subghz_static_freqs, app->subghz_static_index);
@@ -22,7 +20,7 @@ static void xtreme_app_scene_protocols_frequencies_static_frequency_changed(Vari
     variable_item_set_current_value_text(item, text);
 }
 
-void xtreme_app_scene_protocols_frequencies_static_on_enter(void* context) {
+void xtreme_app_scene_protocols_freqs_static_on_enter(void* context) {
     XtremeApp* app = context;
     VariableItemList* var_item_list = app->var_item_list;
     VariableItem* item;
@@ -31,7 +29,7 @@ void xtreme_app_scene_protocols_frequencies_static_on_enter(void* context) {
         var_item_list,
         "Static Freq",
         FrequencyList_size(app->subghz_static_freqs),
-        xtreme_app_scene_protocols_frequencies_static_frequency_changed,
+        xtreme_app_scene_protocols_freqs_static_frequency_changed,
         app);
     app->subghz_static_index = 0;
     variable_item_set_current_value_index(item, app->subghz_static_index);
@@ -49,23 +47,22 @@ void xtreme_app_scene_protocols_frequencies_static_on_enter(void* context) {
     variable_item_list_add(var_item_list, "Add Static Freq", 0, NULL, app);
 
     variable_item_list_set_enter_callback(
-        var_item_list, xtreme_app_scene_protocols_frequencies_static_var_item_list_callback, app);
+        var_item_list, xtreme_app_scene_protocols_freqs_static_var_item_list_callback, app);
 
     variable_item_list_set_selected_item(
         var_item_list,
-        scene_manager_get_scene_state(
+        scene_manager_get_scene_state(app->scene_manager, XtremeAppSceneProtocolsFreqsStatic));
-            app->scene_manager, XtremeAppSceneProtocolsFrequenciesStatic));
 
     view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList);
 }
 
-bool xtreme_app_scene_protocols_frequencies_static_on_event(void* context, SceneManagerEvent event) {
+bool xtreme_app_scene_protocols_freqs_static_on_event(void* context, SceneManagerEvent event) {
     XtremeApp* app = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
         scene_manager_set_scene_state(
-            app->scene_manager, XtremeAppSceneProtocolsFrequenciesStatic, event.event);
+            app->scene_manager, XtremeAppSceneProtocolsFreqsStatic, event.event);
         consumed = true;
         switch(event.event) {
         case VarItemListIndexRemoveStaticFreq:
@@ -81,14 +78,14 @@ bool xtreme_app_scene_protocols_frequencies_static_on_event(void* context, Scene
                     FrequencyList_next(it);
                 }
             }
-            app->save_subghz_frequencies = true;
+            app->save_subghz_freqs = true;
             scene_manager_previous_scene(app->scene_manager);
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFrequenciesStatic);
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsStatic);
             break;
         case VarItemListIndexAddStaticFreq:
             scene_manager_set_scene_state(
-                app->scene_manager, XtremeAppSceneProtocolsFrequenciesAdd, false);
+                app->scene_manager, XtremeAppSceneProtocolsFreqsAdd, false);
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFrequenciesAdd);
+            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsAdd);
             break;
         default:
             break;
@@ -98,7 +95,7 @@ bool xtreme_app_scene_protocols_frequencies_static_on_event(void* context, Scene
     return consumed;
 }
 
-void xtreme_app_scene_protocols_frequencies_static_on_exit(void* context) {
+void xtreme_app_scene_protocols_freqs_static_on_exit(void* context) {
     XtremeApp* app = context;
     variable_item_list_reset(app->var_item_list);
 }

applications/main/xtreme_app/xtreme_app.c

@@ -27,7 +27,7 @@ bool xtreme_app_apply(XtremeApp* app) {
         stream_free(stream);
     }
 
-    if(app->save_subghz_frequencies) {
+    if(app->save_subghz_freqs) {
         FlipperFormat* file = flipper_format_file_alloc(storage);
         do {
             FrequencyList_it_t it;

applications/main/xtreme_app/xtreme_app.h

@@ -57,7 +57,7 @@ typedef struct {
     FuriString* version_tag;
 
     bool save_mainmenu_apps;
-    bool save_subghz_frequencies;
+    bool save_subghz_freqs;
     bool save_subghz;
     bool save_name;
     bool save_level;