Add header api to var item list

applications/services/gui/modules/variable_item_list.c

@@ -29,6 +29,7 @@ struct VariableItemList {
 
 typedef struct {
     VariableItemArray_t items;
+    FuriString* header;
     uint8_t position;
     uint8_t window_position;
     size_t scroll_counter;
@@ -41,6 +42,11 @@ static void variable_item_list_process_left(VariableItemList* variable_item_list
 static void variable_item_list_process_right(VariableItemList* variable_item_list);
 static void variable_item_list_process_ok(VariableItemList* variable_item_list);
 
+static size_t variable_item_list_items_on_screen(bool header) {
+    size_t res = 4;
+    return (header) ? res - 1 : res;
+}
+
 static void variable_item_list_draw_callback(Canvas* canvas, void* _model) {
     VariableItemListModel* model = _model;
 
@@ -49,6 +55,11 @@ static void variable_item_list_draw_callback(Canvas* canvas, void* _model) {
 
     canvas_clear(canvas);
 
+    if(!furi_string_empty(model->header)) {
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str(canvas, 4, 11, furi_string_get_cstr(model->header));
+    }
+
     canvas_set_font(canvas, FontSecondary);
 
     uint8_t position = 0;
@@ -56,8 +67,9 @@ static void variable_item_list_draw_callback(Canvas* canvas, void* _model) {
     for(VariableItemArray_it(it, model->items); !VariableItemArray_end_p(it);
         VariableItemArray_next(it)) {
         uint8_t item_position = position - model->window_position;
-        uint8_t items_on_screen = 4;
-        uint8_t y_offset = 0;
+        uint8_t items_on_screen =
+            variable_item_list_items_on_screen(!furi_string_empty(model->header));
+        uint8_t y_offset = furi_string_empty(model->header) ? 0 : item_height;
 
         if(item_position < items_on_screen) {
             const VariableItem* item = VariableItemArray_cref(it);
@@ -152,7 +164,8 @@ void variable_item_list_set_selected_item(VariableItemList* variable_item_list,
                 model->window_position -= 1;
             }
 
-            uint8_t items_on_screen = 4;
+            uint8_t items_on_screen =
+                variable_item_list_items_on_screen(!furi_string_empty(model->header));
 
             if(items_size <= items_on_screen) {
                 model->window_position = 0;
@@ -173,6 +186,22 @@ uint8_t variable_item_list_get_selected_item_index(VariableItemList* variable_it
     return idx;
 }
 
+void variable_item_list_set_header(VariableItemList* variable_item_list, const char* header) {
+    furi_assert(variable_item_list);
+
+    with_view_model(
+        variable_item_list->view,
+        VariableItemListModel * model,
+        {
+            if(header == NULL) {
+                furi_string_reset(model->header);
+            } else {
+                furi_string_set_str(model->header, header);
+            }
+        },
+        true);
+}
+
 static bool variable_item_list_input_callback(InputEvent* event, void* context) {
     VariableItemList* variable_item_list = context;
     furi_assert(variable_item_list);
@@ -248,7 +277,8 @@ void variable_item_list_process_up(VariableItemList* variable_item_list) {
         variable_item_list->view,
         VariableItemListModel * model,
         {
-            uint8_t items_on_screen = 4;
+            uint8_t items_on_screen =
+                variable_item_list_items_on_screen(!furi_string_empty(model->header));
             if(model->position > 0) {
                 model->position--;
 
@@ -271,7 +301,8 @@ void variable_item_list_process_down(VariableItemList* variable_item_list) {
         variable_item_list->view,
         VariableItemListModel * model,
         {
-            uint8_t items_on_screen = 4;
+            uint8_t items_on_screen =
+                variable_item_list_items_on_screen(!furi_string_empty(model->header));
             if(model->position < (VariableItemArray_size(model->items) - 1)) {
                 model->position++;
                 if((model->position - model->window_position) > (items_on_screen - 2) &&
@@ -405,6 +436,7 @@ VariableItemList* variable_item_list_alloc() {
             VariableItemArray_init(model->items);
             model->position = 0;
             model->window_position = 0;
+            model->header = furi_string_alloc();
             model->scroll_counter = 0;
         },
         true);
@@ -422,6 +454,7 @@ void variable_item_list_free(VariableItemList* variable_item_list) {
         variable_item_list->view,
         VariableItemListModel * model,
         {
+            furi_string_free(model->header);
             VariableItemArray_it_t it;
             for(VariableItemArray_it(it, model->items); !VariableItemArray_end_p(it);
                 VariableItemArray_next(it)) {
@@ -455,6 +488,7 @@ void variable_item_list_reset(VariableItemList* variable_item_list) {
                 furi_string_free(VariableItemArray_ref(it)->locked_message);
             }
             VariableItemArray_reset(model->items);
+            furi_string_reset(model->header);
         },
         false);
 }

applications/services/gui/modules/variable_item_list.h

@@ -74,6 +74,14 @@ void variable_item_list_set_selected_item(VariableItemList* variable_item_list,
 
 uint8_t variable_item_list_get_selected_item_index(VariableItemList* variable_item_list);
 
+/** Set optional header for variable item list
+ * Must be called before adding items OR after adding items but also call set_selected_item() after set_header()
+ *
+ * @param      variable_item_list  VariableItemList instance
+ * @param      header              header to set
+ */
+void variable_item_list_set_header(VariableItemList* variable_item_list, const char* header);
+
 /** Set item current selected index
  *
  * @param      item                 VariableItem* instance

firmware/targets/f7/api_symbols.csv

@@ -3141,6 +3141,7 @@ Function,+,variable_item_list_get_selected_item_index,uint8_t,VariableItemList*
 Function,+,variable_item_list_get_view,View*,VariableItemList*
 Function,+,variable_item_list_reset,void,VariableItemList*
 Function,+,variable_item_list_set_enter_callback,void,"VariableItemList*, VariableItemListEnterCallback, void*"
+Function,+,variable_item_list_set_header,void,"VariableItemList*, const char*"
 Function,+,variable_item_list_set_selected_item,void,"VariableItemList*, uint8_t"
 Function,+,variable_item_set_current_value_index,void,"VariableItem*, uint8_t"
 Function,+,variable_item_set_current_value_text,void,"VariableItem*, const char*"