Просмотр исходного кода

Show manufacturer in config menu

zinongli 11 месяцев назад
Родитель
Сommit
7e488a9344
1 измененных файлов с 16 добавлено и 4 удалено
  1. 16 4
      key_copier.c

+ 16 - 4
key_copier.c

@@ -53,7 +53,8 @@ typedef struct {
     Widget* widget_about; 
     Widget* widget_about; 
     VariableItem* key_name_item; 
     VariableItem* key_name_item; 
     VariableItem* format_item;
     VariableItem* format_item;
-    char* temp_buffer; 
+    VariableItem* format_name_item;
+    char* temp_buffer;
     uint32_t temp_buffer_size;
     uint32_t temp_buffer_size;
 
 
     DialogsApp* dialogs;
     DialogsApp* dialogs;
@@ -146,9 +147,12 @@ static void key_copier_format_change(VariableItem* item) {
     }
     }
     model->data_loaded = false;
     model->data_loaded = false;
     variable_item_set_current_value_text(item, model->format.format_name);
     variable_item_set_current_value_text(item, model->format.format_name);
+    variable_item_set_current_value_text(app->format_name_item, model->format.manufacturer);
     model->format = all_formats[model->format_index];
     model->format = all_formats[model->format_index];
 }
 }
+
 static const char* format_config_label = "Key Format";
 static const char* format_config_label = "Key Format";
+static const char* format_name_config_label = "Brand";
 static void key_copier_config_enter_callback(void* context) {
 static void key_copier_config_enter_callback(void* context) {
     KeyCopierApp* app = (KeyCopierApp*)context;
     KeyCopierApp* app = (KeyCopierApp*)context;
     KeyCopierModel* my_model = view_get_model(app->view_measure);
     KeyCopierModel* my_model = view_get_model(app->view_measure);
@@ -161,8 +165,15 @@ static void key_copier_config_enter_callback(void* context) {
         key_copier_format_change,
         key_copier_format_change,
         app);
         app);
 
 
+    app->format_name_item = variable_item_list_add(
+        app->variable_item_list_config,
+       format_name_config_label,
+        0,
+        NULL,
+        NULL);
     View* view_config_i = variable_item_list_get_view(app->variable_item_list_config);
     View* view_config_i = variable_item_list_get_view(app->variable_item_list_config);
     variable_item_set_current_value_index(app->format_item, my_model->format_index);
     variable_item_set_current_value_index(app->format_item, my_model->format_index);
+    variable_item_set_current_value_text(app->format_name_item, my_model->format.manufacturer);
     key_copier_format_change(app->format_item);
     key_copier_format_change(app->format_item);
     view_set_previous_callback(view_config_i, key_copier_navigation_submenu_callback);
     view_set_previous_callback(view_config_i, key_copier_navigation_submenu_callback);
     view_dispatcher_remove_view(
     view_dispatcher_remove_view(
@@ -554,16 +565,17 @@ static KeyCopierApp* key_copier_app_alloc() {
     app->dialogs = furi_record_open(RECORD_DIALOGS);
     app->dialogs = furi_record_open(RECORD_DIALOGS);
     app->file_path = furi_string_alloc();
     app->file_path = furi_string_alloc();
     app->submenu = submenu_alloc();
     app->submenu = submenu_alloc();
+    submenu_set_header(app->submenu, "Key Copier v1.1");
     submenu_add_item(
     submenu_add_item(
-        app->submenu, "Measure", KeyCopierSubmenuIndexMeasure, key_copier_submenu_callback, app);
+        app->submenu, "Select Template", KeyCopierSubmenuIndexConfigure, key_copier_submenu_callback, app);
     submenu_add_item(
     submenu_add_item(
-        app->submenu, "Config", KeyCopierSubmenuIndexConfigure, key_copier_submenu_callback, app);
+        app->submenu, "Measure", KeyCopierSubmenuIndexMeasure, key_copier_submenu_callback, app);
     submenu_add_item(
     submenu_add_item(
         app->submenu, "Save", KeyCopierSubmenuIndexSave, key_copier_submenu_callback, app);
         app->submenu, "Save", KeyCopierSubmenuIndexSave, key_copier_submenu_callback, app);
     submenu_add_item(
     submenu_add_item(
         app->submenu, "Load", KeyCopierSubmenuIndexLoad, key_copier_submenu_callback, app);
         app->submenu, "Load", KeyCopierSubmenuIndexLoad, key_copier_submenu_callback, app);
     submenu_add_item(
     submenu_add_item(
-        app->submenu, "About", KeyCopierSubmenuIndexAbout, key_copier_submenu_callback, app);
+        app->submenu, "Help", KeyCopierSubmenuIndexAbout, key_copier_submenu_callback, app);
     view_set_previous_callback(
     view_set_previous_callback(
         submenu_get_view(app->submenu), key_copier_navigation_exit_callback);
         submenu_get_view(app->submenu), key_copier_navigation_exit_callback);
     view_dispatcher_add_view(
     view_dispatcher_add_view(