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

rename callbacks to callback_xxx

jblanked 9 месяцев назад
Родитель
Сommit
e650888786
8 измененных файлов с 157 добавлено и 151 удалено
  1. 51 51
      alloc/alloc.c
  2. 6 1
      app.c
  3. 52 52
      callback/callback.c
  4. 40 39
      callback/callback.h
  5. 2 2
      callback/loader.c
  6. 1 1
      explore/flip_social_explore.c
  7. 2 2
      friends/flip_social_friends.c
  8. 3 3
      messages/flip_social_messages.c

+ 51 - 51
alloc/alloc.c

@@ -183,27 +183,27 @@ FlipSocialApp *flip_social_app_alloc()
     }
 
     // Allocate Submenu(s)
-    if (!easy_flipper_set_submenu(&app->submenu_logged_out, FlipSocialViewLoggedOutSubmenu, VERSION_TAG, flip_social_callback_exit_app, &app->view_dispatcher))
+    if (!easy_flipper_set_submenu(&app->submenu_logged_out, FlipSocialViewLoggedOutSubmenu, VERSION_TAG, callback_exit_app, &app->view_dispatcher))
     {
         return NULL;
     }
-    if (!easy_flipper_set_submenu(&app->submenu_logged_in, FlipSocialViewLoggedInSubmenu, VERSION_TAG, flip_social_callback_exit_app, &app->view_dispatcher))
+    if (!easy_flipper_set_submenu(&app->submenu_logged_in, FlipSocialViewLoggedInSubmenu, VERSION_TAG, callback_exit_app, &app->view_dispatcher))
     {
         return NULL;
     }
 
-    submenu_add_item(app->submenu_logged_out, "Login", FlipSocialSubmenuLoggedOutIndexLogin, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_out, "Register", FlipSocialSubmenuLoggedOutIndexRegister, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_out, "About", FlipSocialSubmenuLoggedOutIndexAbout, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_out, "Settings", FlipSocialSubmenuLoggedOutIndexWifiSettings, flip_social_callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_out, "Login", FlipSocialSubmenuLoggedOutIndexLogin, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_out, "Register", FlipSocialSubmenuLoggedOutIndexRegister, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_out, "About", FlipSocialSubmenuLoggedOutIndexAbout, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_out, "Settings", FlipSocialSubmenuLoggedOutIndexWifiSettings, callback_submenu_choices, app);
     //
-    submenu_add_item(app->submenu_logged_in, "Explore", FlipSocialSubmenuExploreIndex, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_in, "Feed", FlipSocialSubmenuLoggedInIndexFeed, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_in, "Post", FlipSocialSubmenuLoggedInIndexCompose, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_in, "Messages", FlipSocialSubmenuLoggedInIndexMessages, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_in, "Profile", FlipSocialSubmenuLoggedInIndexProfile, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_in, "Settings", FlipSocialSubmenuLoggedInIndexSettings, flip_social_callback_submenu_choices, app);
-    submenu_add_item(app->submenu_logged_in, "Sign Out", FlipSocialSubmenuLoggedInSignOutButton, flip_social_callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_in, "Explore", FlipSocialSubmenuExploreIndex, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_in, "Feed", FlipSocialSubmenuLoggedInIndexFeed, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_in, "Post", FlipSocialSubmenuLoggedInIndexCompose, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_in, "Messages", FlipSocialSubmenuLoggedInIndexMessages, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_in, "Profile", FlipSocialSubmenuLoggedInIndexProfile, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_in, "Settings", FlipSocialSubmenuLoggedInIndexSettings, callback_submenu_choices, app);
+    submenu_add_item(app->submenu_logged_in, "Sign Out", FlipSocialSubmenuLoggedInSignOutButton, callback_submenu_choices, app);
 
     // Load the settings
     if (!load_settings(app->wifi_ssid_logged_out,
@@ -487,8 +487,8 @@ bool messages_dialog_alloc(bool free_first)
                 flip_social_messages->index != 0 ? "Prev" : NULL,
                 flip_social_messages->index != flip_social_messages->count - 1 ? "Next" : NULL,
                 "Create",
-                messages_dialog_callback,
-                flip_social_callback_to_messages_logged_in,
+                callback_message_dialog,
+                callback_to_messages_logged_in,
                 &app_instance->view_dispatcher,
                 app_instance))
         {
@@ -975,7 +975,7 @@ bool feed_view_alloc()
                 FlipSocialViewLoggedInFeed,
                 flip_social_feed_draw_callback,
                 flip_social_feed_input_callback,
-                flip_social_callback_to_submenu_logged_in,
+                callback_to_submenu_logged_in,
                 &app_instance->view_dispatcher,
                 app_instance))
         {
@@ -998,112 +998,112 @@ bool alloc_text_input(uint32_t view_id)
         {
         case FlipSocialViewLoggedOutWifiSettingsSSIDInput:
             // memset(app_instance->wifi_ssid_logged_out_temp_buffer, 0, app_instance->wifi_ssid_logged_out_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter SSID", app_instance->wifi_ssid_logged_out_temp_buffer, app_instance->wifi_ssid_logged_out_temp_buffer_size, flip_social_logged_out_wifi_settings_ssid_updated, flip_social_callback_to_wifi_settings_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter SSID", app_instance->wifi_ssid_logged_out_temp_buffer, app_instance->wifi_ssid_logged_out_temp_buffer_size, callback_logged_out_wifi_settings_ssid_updated, callback_to_wifi_settings_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedOutWifiSettingsPasswordInput:
             // memset(app_instance->wifi_password_logged_out_temp_buffer, 0, app_instance->wifi_password_logged_out_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->wifi_password_logged_out_temp_buffer, app_instance->wifi_password_logged_out_temp_buffer_size, flip_social_logged_out_wifi_settings_password_updated, flip_social_callback_to_wifi_settings_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->wifi_password_logged_out_temp_buffer, app_instance->wifi_password_logged_out_temp_buffer_size, callback_logged_out_wifi_settings_password_updated, callback_to_wifi_settings_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedOutLoginUsernameInput:
             // memset(app_instance->login_username_logged_out_temp_buffer, 0, app_instance->login_username_logged_out_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username", app_instance->login_username_logged_out_temp_buffer, app_instance->login_username_logged_out_temp_buffer_size, flip_social_logged_out_login_username_updated, flip_social_callback_to_login_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username", app_instance->login_username_logged_out_temp_buffer, app_instance->login_username_logged_out_temp_buffer_size, callback_logged_out_login_username_updated, callback_to_login_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedOutLoginPasswordInput:
             // memset(app_instance->login_password_logged_out_temp_buffer, 0, app_instance->login_password_logged_out_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->login_password_logged_out_temp_buffer, app_instance->login_password_logged_out_temp_buffer_size, flip_social_logged_out_login_password_updated, flip_social_callback_to_login_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->login_password_logged_out_temp_buffer, app_instance->login_password_logged_out_temp_buffer_size, callback_logged_out_login_password_updated, callback_to_login_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedOutRegisterUsernameInput:
             memset(app_instance->register_username_logged_out_temp_buffer, 0, app_instance->register_username_logged_out_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username", app_instance->register_username_logged_out_temp_buffer, app_instance->register_username_logged_out_temp_buffer_size, flip_social_logged_out_register_username_updated, flip_social_callback_to_register_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username", app_instance->register_username_logged_out_temp_buffer, app_instance->register_username_logged_out_temp_buffer_size, callback_logged_out_register_username_updated, callback_to_register_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedOutRegisterPasswordInput:
             memset(app_instance->register_password_logged_out_temp_buffer, 0, app_instance->register_password_logged_out_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->register_password_logged_out_temp_buffer, app_instance->register_password_logged_out_temp_buffer_size, flip_social_logged_out_register_password_updated, flip_social_callback_to_register_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->register_password_logged_out_temp_buffer, app_instance->register_password_logged_out_temp_buffer_size, callback_logged_out_register_password_updated, callback_to_register_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedOutRegisterPassword2Input:
             memset(app_instance->register_password_2_logged_out_temp_buffer, 0, app_instance->register_password_2_logged_out_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Confirm Password", app_instance->register_password_2_logged_out_temp_buffer, app_instance->register_password_2_logged_out_temp_buffer_size, flip_social_logged_out_register_password_2_updated, flip_social_callback_to_register_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Confirm Password", app_instance->register_password_2_logged_out_temp_buffer, app_instance->register_password_2_logged_out_temp_buffer_size, callback_logged_out_register_password_2_updated, callback_to_register_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInChangePasswordInput:
             // memset(app_instance->change_password_logged_in_temp_buffer, 0, app_instance->change_password_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Change Password", app_instance->change_password_logged_in_temp_buffer, app_instance->change_password_logged_in_temp_buffer_size, flip_social_logged_in_profile_change_password_updated, flip_social_callback_to_profile_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Change Password", app_instance->change_password_logged_in_temp_buffer, app_instance->change_password_logged_in_temp_buffer_size, callback_logged_in_profile_change_password_updated, callback_to_profile_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInChangeBioInput:
             // memset(app_instance->change_bio_logged_in_temp_buffer, 0, app_instance->change_bio_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Bio", app_instance->change_bio_logged_in_temp_buffer, app_instance->change_bio_logged_in_temp_buffer_size, flip_social_logged_in_profile_change_bio_updated, flip_social_callback_to_profile_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Bio", app_instance->change_bio_logged_in_temp_buffer, app_instance->change_bio_logged_in_temp_buffer_size, callback_logged_in_profile_change_bio_updated, callback_to_profile_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInComposeAddPreSaveInput:
             memset(app_instance->compose_pre_save_logged_in_temp_buffer, 0, app_instance->compose_pre_save_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Pre-Save Message", app_instance->compose_pre_save_logged_in_temp_buffer, app_instance->compose_pre_save_logged_in_temp_buffer_size, flip_social_logged_in_compose_pre_save_updated, flip_social_callback_to_compose_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Pre-Save Message", app_instance->compose_pre_save_logged_in_temp_buffer, app_instance->compose_pre_save_logged_in_temp_buffer_size, callback_logged_in_compose_pre_save_updated, callback_to_compose_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInWifiSettingsSSIDInput:
             // memset(app_instance->wifi_ssid_logged_in_temp_buffer, 0, app_instance->wifi_ssid_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter SSID", app_instance->wifi_ssid_logged_in_temp_buffer, app_instance->wifi_ssid_logged_in_temp_buffer_size, flip_social_logged_in_wifi_settings_ssid_updated, flip_social_callback_to_wifi_settings_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter SSID", app_instance->wifi_ssid_logged_in_temp_buffer, app_instance->wifi_ssid_logged_in_temp_buffer_size, callback_logged_in_wifi_settings_ssid_updated, callback_to_wifi_settings_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInWifiSettingsPasswordInput:
             // memset(app_instance->wifi_password_logged_in_temp_buffer, 0, app_instance->wifi_password_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->wifi_password_logged_in_temp_buffer, app_instance->wifi_password_logged_in_temp_buffer_size, flip_social_logged_in_wifi_settings_password_updated, flip_social_callback_to_wifi_settings_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Password", app_instance->wifi_password_logged_in_temp_buffer, app_instance->wifi_password_logged_in_temp_buffer_size, callback_logged_in_wifi_settings_password_updated, callback_to_wifi_settings_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInMessagesNewMessageInput:
             memset(app_instance->messages_new_message_logged_in_temp_buffer, 0, app_instance->messages_new_message_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Message", app_instance->messages_new_message_logged_in_temp_buffer, app_instance->messages_new_message_logged_in_temp_buffer_size, flip_social_logged_in_messages_new_message_updated, flip_social_callback_to_messages_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Message", app_instance->messages_new_message_logged_in_temp_buffer, app_instance->messages_new_message_logged_in_temp_buffer_size, callback_logged_in_messages_new_message_updated, callback_to_messages_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInMessagesNewMessageUserChoicesInput:
             memset(app_instance->message_user_choice_logged_in_temp_buffer, 0, app_instance->message_user_choice_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Message", app_instance->message_user_choice_logged_in_temp_buffer, app_instance->message_user_choice_logged_in_temp_buffer_size, flip_social_logged_in_messages_user_choice_message_updated, flip_social_callback_to_messages_user_choices, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Message", app_instance->message_user_choice_logged_in_temp_buffer, app_instance->message_user_choice_logged_in_temp_buffer_size, callback_logged_in_messages_user_choice_message_updated, callback_to_messages_user_choices, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInExploreInput:
             memset(app_instance->explore_logged_in_temp_buffer, 0, app_instance->explore_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username or Keyword", app_instance->explore_logged_in_temp_buffer, app_instance->explore_logged_in_temp_buffer_size, flip_social_logged_in_explore_updated, flip_social_callback_to_submenu_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username or Keyword", app_instance->explore_logged_in_temp_buffer, app_instance->explore_logged_in_temp_buffer_size, callback_logged_in_explore_updated, callback_to_submenu_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
             break;
         case FlipSocialViewLoggedInMessageUsersInput:
             memset(app_instance->message_users_logged_in_temp_buffer, 0, app_instance->message_users_logged_in_temp_buffer_size);
-            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username or Keyword", app_instance->message_users_logged_in_temp_buffer, app_instance->message_users_logged_in_temp_buffer_size, flip_social_logged_in_message_users_updated, flip_social_callback_to_submenu_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_uart_text_input(&app_instance->text_input, FlipSocialViewTextInput, "Enter Username or Keyword", app_instance->message_users_logged_in_temp_buffer, app_instance->message_users_logged_in_temp_buffer_size, callback_logged_in_message_users_updated, callback_to_submenu_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
@@ -1121,14 +1121,14 @@ bool about_widget_alloc(bool is_logged_in)
     {
         if (!app_instance->widget_logged_out_about)
         {
-            return easy_flipper_set_widget(&app_instance->widget_logged_out_about, FlipSocialViewLoggedOutAbout, "Welcome to FlipSocial\n---\nThe social media app for\nFlipper Zero, created by\nJBlanked: www.jblanked.com/flipper\n---\nPress BACK to return.", flip_social_callback_to_submenu_logged_out, &app_instance->view_dispatcher);
+            return easy_flipper_set_widget(&app_instance->widget_logged_out_about, FlipSocialViewLoggedOutAbout, "Welcome to FlipSocial\n---\nThe social media app for\nFlipper Zero, created by\nJBlanked: www.jblanked.com/flipper\n---\nPress BACK to return.", callback_to_submenu_logged_out, &app_instance->view_dispatcher);
         }
     }
     else
     {
         if (!app_instance->widget_logged_in_about)
         {
-            return easy_flipper_set_widget(&app_instance->widget_logged_in_about, FlipSocialViewLoggedInSettingsAbout, "Welcome to FlipSocial\n---\nThe social media app for\nFlipper Zero, created by\nJBlanked: www.jblanked.com/flipper\n---\nPress BACK to return.", flip_social_callback_to_settings_logged_in, &app_instance->view_dispatcher);
+            return easy_flipper_set_widget(&app_instance->widget_logged_in_about, FlipSocialViewLoggedInSettingsAbout, "Welcome to FlipSocial\n---\nThe social media app for\nFlipper Zero, created by\nJBlanked: www.jblanked.com/flipper\n---\nPress BACK to return.", callback_to_settings_logged_in, &app_instance->view_dispatcher);
         }
     }
     return true;
@@ -1145,22 +1145,22 @@ bool alloc_submenu(uint32_t view_id)
         switch (view_id)
         {
         case FlipSocialViewLoggedInSettings:
-            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Settings", flip_social_callback_to_submenu_logged_in, &app_instance->view_dispatcher))
+            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Settings", callback_to_submenu_logged_in, &app_instance->view_dispatcher))
             {
                 return false;
             }
             submenu_reset(app_instance->submenu);
-            submenu_add_item(app_instance->submenu, "About", FlipSocialSubmenuLoggedInIndexAbout, flip_social_callback_submenu_choices, app_instance);
-            submenu_add_item(app_instance->submenu, "WiFi", FlipSocialSubmenuLoggedInIndexWifiSettings, flip_social_callback_submenu_choices, app_instance);
-            submenu_add_item(app_instance->submenu, "User", FlipSocialSubmenuLoggedInIndexUserSettings, flip_social_callback_submenu_choices, app_instance);
+            submenu_add_item(app_instance->submenu, "About", FlipSocialSubmenuLoggedInIndexAbout, callback_submenu_choices, app_instance);
+            submenu_add_item(app_instance->submenu, "WiFi", FlipSocialSubmenuLoggedInIndexWifiSettings, callback_submenu_choices, app_instance);
+            submenu_add_item(app_instance->submenu, "User", FlipSocialSubmenuLoggedInIndexUserSettings, callback_submenu_choices, app_instance);
             break;
         case FlipSocialViewLoggedInCompose:
-            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Create A Post", flip_social_callback_to_submenu_logged_in, &app_instance->view_dispatcher))
+            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Create A Post", callback_to_submenu_logged_in, &app_instance->view_dispatcher))
             {
                 return false;
             }
             submenu_reset(app_instance->submenu);
-            submenu_add_item(app_instance->submenu, "Add Pre-Save", FlipSocialSubmenuComposeIndexAddPreSave, flip_social_callback_submenu_choices, app_instance);
+            submenu_add_item(app_instance->submenu, "Add Pre-Save", FlipSocialSubmenuComposeIndexAddPreSave, callback_submenu_choices, app_instance);
 
             // Load the playlist
             if (load_playlist(&app_instance->pre_saved_messages))
@@ -1170,13 +1170,13 @@ bool alloc_submenu(uint32_t view_id)
                 {
                     if (app_instance->pre_saved_messages.messages[i][0] != '\0') // Check if the string is not empty
                     {
-                        submenu_add_item(app_instance->submenu, app_instance->pre_saved_messages.messages[i], FlipSocialSubemnuComposeIndexStartIndex + i, flip_social_callback_submenu_choices, app_instance);
+                        submenu_add_item(app_instance->submenu, app_instance->pre_saved_messages.messages[i], FlipSocialSubemnuComposeIndexStartIndex + i, callback_submenu_choices, app_instance);
                     }
                 }
             }
             break;
         case FlipSocialViewLoggedInFriendsSubmenu:
-            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Friends", flip_social_callback_to_profile_logged_in, &app_instance->view_dispatcher))
+            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Friends", callback_to_profile_logged_in, &app_instance->view_dispatcher))
             {
                 FURI_LOG_E(TAG, "Failed to set submenu for friends");
                 return false;
@@ -1185,7 +1185,7 @@ bool alloc_submenu(uint32_t view_id)
             went_to_friends = true;
             break;
         case FlipSocialViewLoggedInMessagesUserChoices:
-            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Users", flip_social_callback_to_messages_logged_in, &app_instance->view_dispatcher))
+            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Users", callback_to_messages_logged_in, &app_instance->view_dispatcher))
             {
                 FURI_LOG_E(TAG, "Failed to set submenu for user choices");
                 return false;
@@ -1193,14 +1193,14 @@ bool alloc_submenu(uint32_t view_id)
             submenu_reset(app_instance->submenu);
             break;
         case FlipSocialViewLoggedInMessagesSubmenu:
-            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Messages", flip_social_callback_to_submenu_logged_in, &app_instance->view_dispatcher))
+            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Messages", callback_to_submenu_logged_in, &app_instance->view_dispatcher))
             {
                 return false;
             }
             submenu_reset(app_instance->submenu);
             break;
         case FlipSocialViewLoggedInExploreSubmenu:
-            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Explore", flip_social_callback_to_submenu_logged_in, &app_instance->view_dispatcher))
+            if (!easy_flipper_set_submenu(&app_instance->submenu, FlipSocialViewSubmenu, "Explore", callback_to_submenu_logged_in, &app_instance->view_dispatcher))
             {
                 return false;
             }
@@ -1242,7 +1242,7 @@ bool alloc_variable_item_list(uint32_t view_id)
         switch (view_id)
         {
         case FlipSocialViewLoggedOutWifiSettings:
-            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, flip_social_text_input_logged_out_wifi_settings_item_selected, flip_social_callback_to_submenu_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, callback_logged_out_wifi_settings_item_selected, callback_to_submenu_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
@@ -1252,7 +1252,7 @@ bool alloc_variable_item_list(uint32_t view_id)
                 variable_item_set_current_value_text(app_instance->variable_item_logged_out_wifi_settings_ssid, app_instance->wifi_ssid_logged_out);
             return true;
         case FlipSocialViewLoggedOutLogin:
-            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, flip_social_text_input_logged_out_login_item_selected, flip_social_callback_to_submenu_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, callback_logged_out_login_item_selected, callback_to_submenu_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
@@ -1263,7 +1263,7 @@ bool alloc_variable_item_list(uint32_t view_id)
                 variable_item_set_current_value_text(app_instance->variable_item_logged_out_login_username, app_instance->login_username_logged_out);
             return true;
         case FlipSocialViewLoggedOutRegister:
-            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, flip_social_text_input_logged_out_register_item_selected, flip_social_callback_to_submenu_logged_out, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, callback_logged_out_register_item_selected, callback_to_submenu_logged_out, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
@@ -1273,7 +1273,7 @@ bool alloc_variable_item_list(uint32_t view_id)
             app_instance->variable_item_logged_out_register_button = variable_item_list_add(app_instance->variable_item_list, "Register", 0, NULL, app_instance);
             return true;
         case FlipSocialViewLoggedInProfile:
-            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, flip_social_text_input_logged_in_profile_item_selected, flip_social_callback_to_submenu_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, callback_logged_in_profile_item_selected, callback_to_submenu_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
@@ -1287,7 +1287,7 @@ bool alloc_variable_item_list(uint32_t view_id)
                 variable_item_set_current_value_text(app_instance->variable_item_logged_in_profile_change_bio, app_instance->change_bio_logged_in);
             return true;
         case FlipSocialViewLoggedInSettingsWifi:
-            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, flip_social_text_input_logged_in_wifi_settings_item_selected, flip_social_callback_to_settings_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, callback_logged_in_wifi_settings_item_selected, callback_to_settings_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }
@@ -1297,7 +1297,7 @@ bool alloc_variable_item_list(uint32_t view_id)
                 variable_item_set_current_value_text(app_instance->variable_item_logged_in_wifi_settings_ssid, app_instance->wifi_ssid_logged_in);
             return true;
         case FlipSocialViewLoggedInSettingsUser:
-            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, flip_social_logged_in_user_settings_item_selected, flip_social_callback_to_settings_logged_in, &app_instance->view_dispatcher, app_instance))
+            if (!easy_flipper_set_variable_item_list(&app_instance->variable_item_list, FlipSocialViewVariableItemList, callback_logged_in_user_settings_item_selected, callback_to_settings_logged_in, &app_instance->view_dispatcher, app_instance))
             {
                 return false;
             }

+ 6 - 1
app.c

@@ -63,8 +63,13 @@ int32_t main_flip_social(void *p)
             strcmp(is_notifications, "on") == 0 &&
             strcmp(is_logged_in, "true") == 0)
         {
-            flip_social_home_notification();
+            callback_home_notification();
         }
+
+        // if (update_is_ready(fhttp, true))
+        // {
+        //     easy_flipper_dialog("Update Status", "Complete.\nRestart your Flipper Zero.");
+        // }
     }
 
     flipper_http_free(fhttp);

+ 52 - 52
callback/callback.c

@@ -81,7 +81,7 @@ static void flip_social_login_switch_to_view(FlipSocialApp *app)
         FURI_LOG_E(TAG, "Failed to allocate view loader");
         return;
     }
-    loader_switch_to_view(app, "Logging in...", flip_social_login_fetch, flip_social_login_parse, 1, flip_social_callback_to_login_logged_out, FlipSocialViewLoader);
+    loader_switch_to_view(app, "Logging in...", flip_social_login_fetch, flip_social_login_parse, 1, callback_to_login_logged_out, FlipSocialViewLoader);
 }
 
 static bool flip_social_register_fetch(DataLoaderModel *model)
@@ -180,7 +180,7 @@ static void flip_social_register_switch_to_view(FlipSocialApp *app)
         FURI_LOG_E(TAG, "Failed to allocate view loader");
         return;
     }
-    loader_switch_to_view(app, "Registering...", flip_social_register_fetch, flip_social_register_parse, 1, flip_social_callback_to_register_logged_out, FlipSocialViewLoader);
+    loader_switch_to_view(app, "Registering...", flip_social_register_fetch, flip_social_register_parse, 1, callback_to_register_logged_out, FlipSocialViewLoader);
 }
 
 /**
@@ -188,7 +188,7 @@ static void flip_social_register_switch_to_view(FlipSocialApp *app)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutSubmenu)
  */
-uint32_t flip_social_callback_to_submenu_logged_out(void *context)
+uint32_t callback_to_submenu_logged_out(void *context)
 {
     UNUSED(context);
     return FlipSocialViewLoggedOutSubmenu;
@@ -199,7 +199,7 @@ uint32_t flip_social_callback_to_submenu_logged_out(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInSubmenu)
  */
-uint32_t flip_social_callback_to_submenu_logged_in(void *context)
+uint32_t callback_to_submenu_logged_in(void *context)
 {
     UNUSED(context);
     free_about_widget(false);
@@ -227,7 +227,7 @@ uint32_t flip_social_callback_to_submenu_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutLogin)
  */
-uint32_t flip_social_callback_to_login_logged_out(void *context)
+uint32_t callback_to_login_logged_out(void *context)
 {
     UNUSED(context);
     flip_social_sent_login_request = false;
@@ -240,7 +240,7 @@ uint32_t flip_social_callback_to_login_logged_out(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutRegister)
  */
-uint32_t flip_social_callback_to_register_logged_out(void *context)
+uint32_t callback_to_register_logged_out(void *context)
 {
     UNUSED(context);
     flip_social_sent_register_request = false;
@@ -253,7 +253,7 @@ uint32_t flip_social_callback_to_register_logged_out(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutWifiSettings)
  */
-uint32_t flip_social_callback_to_wifi_settings_logged_out(void *context)
+uint32_t callback_to_wifi_settings_logged_out(void *context)
 {
     UNUSED(context);
     return FlipSocialViewVariableItemList;
@@ -264,7 +264,7 @@ uint32_t flip_social_callback_to_wifi_settings_logged_out(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInSettingsWifi)
  */
-uint32_t flip_social_callback_to_wifi_settings_logged_in(void *context)
+uint32_t callback_to_wifi_settings_logged_in(void *context)
 {
     UNUSED(context);
     return FlipSocialViewVariableItemList;
@@ -275,7 +275,7 @@ uint32_t flip_social_callback_to_wifi_settings_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInSettingsWifi)
  */
-uint32_t flip_social_callback_to_settings_logged_in(void *context)
+uint32_t callback_to_settings_logged_in(void *context)
 {
     UNUSED(context);
     return FlipSocialViewSubmenu;
@@ -286,7 +286,7 @@ uint32_t flip_social_callback_to_settings_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInCompose)
  */
-uint32_t flip_social_callback_to_compose_logged_in(void *context)
+uint32_t callback_to_compose_logged_in(void *context)
 {
     UNUSED(context);
     return FlipSocialViewSubmenu;
@@ -297,7 +297,7 @@ uint32_t flip_social_callback_to_compose_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInProfile)
  */
-uint32_t flip_social_callback_to_profile_logged_in(void *context)
+uint32_t callback_to_profile_logged_in(void *context)
 {
     UNUSED(context);
     return FlipSocialViewVariableItemList;
@@ -308,7 +308,7 @@ uint32_t flip_social_callback_to_profile_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewSubmenu)
  */
-uint32_t flip_social_callback_to_explore_logged_in(void *context)
+uint32_t callback_to_explore_logged_in(void *context)
 {
     UNUSED(context);
     flip_social_dialog_stop = false;
@@ -325,7 +325,7 @@ uint32_t flip_social_callback_to_explore_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInFriendsSubmenu)
  */
-uint32_t flip_social_callback_to_friends_logged_in(void *context)
+uint32_t callback_to_friends_logged_in(void *context)
 {
     UNUSED(context);
     flip_social_dialog_stop = false;
@@ -339,7 +339,7 @@ uint32_t flip_social_callback_to_friends_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInMessagesSubmenu)
  */
-uint32_t flip_social_callback_to_messages_logged_in(void *context)
+uint32_t callback_to_messages_logged_in(void *context)
 {
     UNUSED(context);
     return FlipSocialViewSubmenu;
@@ -350,7 +350,7 @@ uint32_t flip_social_callback_to_messages_logged_in(void *context)
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInMessagesUserChoices)
  */
-uint32_t flip_social_callback_to_messages_user_choices(void *context)
+uint32_t callback_to_messages_user_choices(void *context)
 {
     UNUSED(context);
     return FlipSocialViewSubmenu;
@@ -361,7 +361,7 @@ uint32_t flip_social_callback_to_messages_user_choices(void *context)
  * @param context The context - unused
  * @return next view id (VIEW_NONE to exit the app)
  */
-uint32_t flip_social_callback_exit_app(void *context)
+uint32_t callback_exit_app(void *context)
 {
     // Exit the application
     free_all(true, true, context);
@@ -426,7 +426,7 @@ static void friends_dialog_callback(DialogExResult result, void *context)
         }
     }
 }
-void messages_dialog_callback(DialogExResult result, void *context)
+void callback_message_dialog(DialogExResult result, void *context)
 {
     furi_assert(context);
     FlipSocialApp *app = (FlipSocialApp *)context;
@@ -511,14 +511,14 @@ static void compose_dialog_callback(DialogExResult result, void *context)
 
         // Reset and rebuild the submenu
         submenu_reset(app_instance->submenu);
-        submenu_add_item(app_instance->submenu, "Add Pre-Save", FlipSocialSubmenuComposeIndexAddPreSave, flip_social_callback_submenu_choices, app);
+        submenu_add_item(app_instance->submenu, "Add Pre-Save", FlipSocialSubmenuComposeIndexAddPreSave, callback_submenu_choices, app);
 
         for (size_t i = 0; i < app_instance->pre_saved_messages.count; i++)
         {
             submenu_add_item(app_instance->submenu,
                              app_instance->pre_saved_messages.messages[i],
                              FlipSocialSubemnuComposeIndexStartIndex + i,
-                             flip_social_callback_submenu_choices,
+                             callback_submenu_choices,
                              app);
         }
 
@@ -657,7 +657,7 @@ bool flip_social_parse_user_info(FlipperHTTP *fhttp)
  * @param index The FlipSocialSubmenuIndex item that was clicked.
  * @return void
  */
-void flip_social_callback_submenu_choices(void *context, uint32_t index)
+void callback_submenu_choices(void *context, uint32_t index)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -851,7 +851,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
                         "Post",
                         NULL,
                         compose_dialog_callback,
-                        flip_social_callback_to_compose_logged_in,
+                        callback_to_compose_logged_in,
                         &app->view_dispatcher,
                         app))
                 {
@@ -898,7 +898,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
             //                 "Add",    // add if user is not a friend (future update)
             //                 NULL,
             //                 explore_dialog_callback,
-            //                 flip_social_callback_to_explore_logged_in,
+            //                 callback_to_explore_logged_in,
             //                 &app->view_dispatcher,
             //                 app))
             //         {
@@ -925,7 +925,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
             //                 "Add",    // add if user is not a friend (future update)
             //                 NULL,
             //                 explore_dialog_callback,
-            //                 flip_social_callback_to_explore_logged_in,
+            //                 callback_to_explore_logged_in,
             //                 &app->view_dispatcher,
             //                 app))
             //         {
@@ -961,7 +961,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
                         "",
                         NULL,
                         friends_dialog_callback,
-                        flip_social_callback_to_friends_logged_in,
+                        callback_to_friends_logged_in,
                         &app->view_dispatcher,
                         app))
                 {
@@ -1020,7 +1020,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_wifi_settings_ssid_updated(void *context)
+void callback_logged_out_wifi_settings_ssid_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1071,7 +1071,7 @@ void flip_social_logged_out_wifi_settings_ssid_updated(void *context)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_wifi_settings_password_updated(void *context)
+void callback_logged_out_wifi_settings_password_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1123,7 +1123,7 @@ void flip_social_logged_out_wifi_settings_password_updated(void *context)
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_out_wifi_settings_item_selected(void *context, uint32_t index)
+void callback_logged_out_wifi_settings_item_selected(void *context, uint32_t index)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1164,7 +1164,7 @@ void flip_social_text_input_logged_out_wifi_settings_item_selected(void *context
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_login_username_updated(void *context)
+void callback_logged_out_login_username_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1200,7 +1200,7 @@ void flip_social_logged_out_login_username_updated(void *context)
  * @return void
  */
 
-void flip_social_logged_out_login_password_updated(void *context)
+void callback_logged_out_login_password_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1237,7 +1237,7 @@ void flip_social_logged_out_login_password_updated(void *context)
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_out_login_item_selected(void *context, uint32_t index)
+void callback_logged_out_login_item_selected(void *context, uint32_t index)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1286,7 +1286,7 @@ void flip_social_text_input_logged_out_login_item_selected(void *context, uint32
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_register_username_updated(void *context)
+void callback_logged_out_register_username_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1314,7 +1314,7 @@ void flip_social_logged_out_register_username_updated(void *context)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_register_password_updated(void *context)
+void callback_logged_out_register_password_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1342,7 +1342,7 @@ void flip_social_logged_out_register_password_updated(void *context)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_register_password_2_updated(void *context)
+void callback_logged_out_register_password_2_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1371,7 +1371,7 @@ void flip_social_logged_out_register_password_2_updated(void *context)
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_out_register_item_selected(void *context, uint32_t index)
+void callback_logged_out_register_item_selected(void *context, uint32_t index)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1427,7 +1427,7 @@ void flip_social_text_input_logged_out_register_item_selected(void *context, uin
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_wifi_settings_ssid_updated(void *context)
+void callback_logged_in_wifi_settings_ssid_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1478,7 +1478,7 @@ void flip_social_logged_in_wifi_settings_ssid_updated(void *context)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_wifi_settings_password_updated(void *context)
+void callback_logged_in_wifi_settings_password_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1531,7 +1531,7 @@ void flip_social_logged_in_wifi_settings_password_updated(void *context)
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_in_wifi_settings_item_selected(void *context, uint32_t index)
+void callback_logged_in_wifi_settings_item_selected(void *context, uint32_t index)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1567,7 +1567,7 @@ void flip_social_text_input_logged_in_wifi_settings_item_selected(void *context,
     }
 }
 
-void flip_social_logged_in_user_settings_item_selected(void *context, uint32_t index)
+void callback_logged_in_user_settings_item_selected(void *context, uint32_t index)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1591,7 +1591,7 @@ void flip_social_logged_in_user_settings_item_selected(void *context, uint32_t i
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_compose_pre_save_updated(void *context)
+void callback_logged_in_compose_pre_save_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1626,7 +1626,7 @@ void flip_social_logged_in_compose_pre_save_updated(void *context)
         app->submenu,
         "Add Pre-Save",
         FlipSocialSubmenuComposeIndexAddPreSave,
-        flip_social_callback_submenu_choices,
+        callback_submenu_choices,
         app);
 
     for (size_t i = 0; i < app->pre_saved_messages.count; i++)
@@ -1635,7 +1635,7 @@ void flip_social_logged_in_compose_pre_save_updated(void *context)
             app->submenu,
             app->pre_saved_messages.messages[i],
             FlipSocialSubemnuComposeIndexStartIndex + i,
-            flip_social_callback_submenu_choices,
+            callback_submenu_choices,
             app);
     }
 
@@ -1651,7 +1651,7 @@ void flip_social_logged_in_compose_pre_save_updated(void *context)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_profile_change_password_updated(void *context)
+void callback_logged_in_profile_change_password_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1700,7 +1700,7 @@ void flip_social_logged_in_profile_change_password_updated(void *context)
     easy_flipper_dialog("Success", "Password updated successfully\n\n\nPress BACK to return :D");
 }
 
-void flip_social_logged_in_profile_change_bio_updated(void *context)
+void callback_logged_in_profile_change_bio_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1749,7 +1749,7 @@ void flip_social_logged_in_profile_change_bio_updated(void *context)
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_in_profile_item_selected(void *context, uint32_t index)
+void callback_logged_in_profile_item_selected(void *context, uint32_t index)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1812,7 +1812,7 @@ void flip_social_text_input_logged_in_profile_item_selected(void *context, uint3
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_messages_user_choice_message_updated(void *context)
+void callback_logged_in_messages_user_choice_message_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1887,7 +1887,7 @@ void flip_social_logged_in_messages_user_choice_message_updated(void *context)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_messages_new_message_updated(void *context)
+void callback_logged_in_messages_new_message_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1957,7 +1957,7 @@ void flip_social_logged_in_messages_new_message_updated(void *context)
     flipper_http_free(fhttp);
 }
 
-void flip_social_logged_in_explore_updated(void *context)
+void callback_logged_in_explore_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -1996,7 +1996,7 @@ void flip_social_logged_in_explore_updated(void *context)
     //     &app->view_dispatcher);         // view dispatcher
 }
 
-void flip_social_logged_in_message_users_updated(void *context)
+void callback_logged_in_message_users_updated(void *context)
 {
     FlipSocialApp *app = (FlipSocialApp *)context;
     if (!app)
@@ -2037,7 +2037,7 @@ void flip_social_logged_in_message_users_updated(void *context)
     //     &app->view_dispatcher);                      // view dispatcher
 }
 
-bool flip_social_get_home_notification(FlipperHTTP *fhttp)
+bool callback_get_home_notification(FlipperHTTP *fhttp)
 {
     if (!app_instance)
     {
@@ -2067,7 +2067,7 @@ bool flip_social_get_home_notification(FlipperHTTP *fhttp)
     fhttp->save_received_data = true;
     return flipper_http_request(fhttp, GET, "https://www.jblanked.com/flipper/api/flip-social-notifications/", auth_headers, NULL);
 }
-bool flip_social_parse_home_notification(FlipperHTTP *fhttp)
+bool callback_parse_home_notification(FlipperHTTP *fhttp)
 {
     if (!app_instance)
     {
@@ -2230,8 +2230,8 @@ bool flip_social_parse_home_notification(FlipperHTTP *fhttp)
 }
 
 // home notification
-bool flip_social_home_notification()
+bool callback_home_notification()
 {
-    // return flipper_http_process_response_async(flip_social_get_home_notification, flip_social_parse_home_notification);
+    // return flipper_http_process_response_async(callback_get_home_notification, callback_parse_home_notification);
     return true; // for now
 }

+ 40 - 39
callback/callback.h

@@ -8,98 +8,98 @@
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutSubmenu)
  */
-uint32_t flip_social_callback_to_submenu_logged_out(void *context);
+uint32_t callback_to_submenu_logged_out(void *context);
 
 /**
  * @brief Navigation callback to go back to the submenu Logged in.
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInSubmenu)
  */
-uint32_t flip_social_callback_to_submenu_logged_in(void *context);
+uint32_t callback_to_submenu_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the (Logged out) Login screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutLogin)
  */
-uint32_t flip_social_callback_to_login_logged_out(void *context);
+uint32_t callback_to_login_logged_out(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the (Logged out) Register screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutRegister)
  */
-uint32_t flip_social_callback_to_register_logged_out(void *context);
+uint32_t callback_to_register_logged_out(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the (Logged out) Wifi Settings screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedOutWifiSettings)
  */
-uint32_t flip_social_callback_to_wifi_settings_logged_out(void *context);
+uint32_t callback_to_wifi_settings_logged_out(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the (Logged in) Wifi Settings screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInSettingsWifi)
  */
-uint32_t flip_social_callback_to_wifi_settings_logged_in(void *context);
+uint32_t callback_to_wifi_settings_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the (Logged in) Settings screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInSettingsWifi)
  */
-uint32_t flip_social_callback_to_settings_logged_in(void *context);
+uint32_t callback_to_settings_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the (Logged in) Compose screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInCompose)
  */
-uint32_t flip_social_callback_to_compose_logged_in(void *context);
+uint32_t callback_to_compose_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the (Logged in) Profile screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInProfile)
  */
-uint32_t flip_social_callback_to_profile_logged_in(void *context);
+uint32_t callback_to_profile_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the Explore submenu
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInExploreSubmenu)
  */
-uint32_t flip_social_callback_to_explore_logged_in(void *context);
+uint32_t callback_to_explore_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the Friends submenu
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInFriendsSubmenu)
  */
-uint32_t flip_social_callback_to_friends_logged_in(void *context);
+uint32_t callback_to_friends_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the Messages submenu
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInMessagesSubmenu)
  */
-uint32_t flip_social_callback_to_messages_logged_in(void *context);
+uint32_t callback_to_messages_logged_in(void *context);
 
 /**
  * @brief Navigation callback to bring the user back to the User Choices screen
  * @param context The context - unused
  * @return next view id (FlipSocialViewLoggedInMessagesUserChoices)
  */
-uint32_t flip_social_callback_to_messages_user_choices(void *context);
+uint32_t callback_to_messages_user_choices(void *context);
 
 /**
  * @brief Navigation callback for exiting the application
  * @param context The context - unused
  * @return next view id (VIEW_NONE to exit the app)
  */
-uint32_t flip_social_callback_exit_app(void *context);
+uint32_t callback_exit_app(void *context);
 
 /**
  * @brief Handle ALL submenu item selections.
@@ -107,21 +107,21 @@ uint32_t flip_social_callback_exit_app(void *context);
  * @param index The FlipSocialSubmenuIndex item that was clicked.
  * @return void
  */
-void flip_social_callback_submenu_choices(void *context, uint32_t index);
+void callback_submenu_choices(void *context, uint32_t index);
 
 /**
  * @brief Text input callback for when the user finishes entering their SSID on the wifi settings (logged out) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_wifi_settings_ssid_updated(void *context);
+void callback_logged_out_wifi_settings_ssid_updated(void *context);
 
 /**
  * @brief Text input callback for when the user finishes entering their password on the wifi settings (logged out) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_wifi_settings_password_updated(void *context);
+void callback_logged_out_wifi_settings_password_updated(void *context);
 
 /**
  * @brief Callback when the user selects a menu item in the wifi settings (logged out) screen.
@@ -129,21 +129,21 @@ void flip_social_logged_out_wifi_settings_password_updated(void *context);
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_out_wifi_settings_item_selected(void *context, uint32_t index);
+void callback_logged_out_wifi_settings_item_selected(void *context, uint32_t index);
 
 /**
  * @brief Text input callback for when the user finishes entering their username on the login (logged out) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_login_username_updated(void *context);
+void callback_logged_out_login_username_updated(void *context);
 
 /**
  * @brief Text input callback for when the user finishes entering their password on the login (logged out) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_login_password_updated(void *context);
+void callback_logged_out_login_password_updated(void *context);
 
 /**
  * @brief Callback when the user selects a menu item in the login (logged out) screen.
@@ -151,42 +151,42 @@ void flip_social_logged_out_login_password_updated(void *context);
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_out_login_item_selected(void *context, uint32_t index);
+void callback_logged_out_login_item_selected(void *context, uint32_t index);
 
 /**
  * @brief Text input callback for when the user finishes entering their username on the register (logged out) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_register_username_updated(void *context);
+void callback_logged_out_register_username_updated(void *context);
 
 /**
  * @brief Text input callback for when the user finishes entering their password on the register (logged out) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_register_password_updated(void *context);
+void callback_logged_out_register_password_updated(void *context);
 
 /**
  * @brief Text input callback for when the user finishes entering their password 2 on the register (logged out) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_out_register_password_2_updated(void *context);
+void callback_logged_out_register_password_2_updated(void *context);
 
 /**
  * @brief Text input callback for when the user finishes entering their SSID on the wifi settings (logged in) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_wifi_settings_ssid_updated(void *context);
+void callback_logged_in_wifi_settings_ssid_updated(void *context);
 
 /**
  * @brief Text input callback for when the user finishes entering their password on the wifi settings (logged in) screen.
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_wifi_settings_password_updated(void *context);
+void callback_logged_in_wifi_settings_password_updated(void *context);
 
 /**
  * @brief Callback when the user selects a menu item in the wifi settings (logged in) screen.
@@ -194,21 +194,21 @@ void flip_social_logged_in_wifi_settings_password_updated(void *context);
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_in_wifi_settings_item_selected(void *context, uint32_t index);
+void callback_logged_in_wifi_settings_item_selected(void *context, uint32_t index);
 
 /**
  * @brief Text input callback for when the user finishes entering their message on the compose (logged in) screen for Add Text
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_compose_pre_save_updated(void *context);
+void callback_logged_in_compose_pre_save_updated(void *context);
 
 /**
  * @brief Text input callback for when the user finishes entering their message on the profile (logged in) screen for change password
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_profile_change_password_updated(void *context);
+void callback_logged_in_profile_change_password_updated(void *context);
 
 /**
  * @brief Callback when a user selects a menu item in the profile (logged in) screen.
@@ -216,21 +216,22 @@ void flip_social_logged_in_profile_change_password_updated(void *context);
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_logged_in_profile_change_bio_updated(void *context);
-void flip_social_text_input_logged_in_profile_item_selected(void *context, uint32_t index);
+void callback_logged_in_profile_change_bio_updated(void *context);
+void callback_logged_in_profile_item_selected(void *context, uint32_t index);
 
 /**
  * @brief Text input callback for when the user finishes entering their message to send to the selected user choice (user choice messages view)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_messages_user_choice_message_updated(void *context);
+void callback_logged_in_messages_user_choice_message_updated(void *context);
+
 /**
  * @brief Text input callback for when the user finishes entering their message to the selected user (messages view)
  * @param context The context - FlipSocialApp object.
  * @return void
  */
-void flip_social_logged_in_messages_new_message_updated(void *context);
+void callback_logged_in_messages_new_message_updated(void *context);
 
 /**
  * @brief Callback when the user selects a menu item in the register (logged out) screen.
@@ -238,12 +239,12 @@ void flip_social_logged_in_messages_new_message_updated(void *context);
  * @param index The index of the selected item.
  * @return void
  */
-void flip_social_text_input_logged_out_register_item_selected(void *context, uint32_t index);
-void flip_social_logged_in_user_settings_item_selected(void *context, uint32_t index);
-void flip_social_logged_in_explore_updated(void *context);
-void flip_social_logged_in_message_users_updated(void *context);
+void callback_logged_out_register_item_selected(void *context, uint32_t index);
+void callback_logged_in_user_settings_item_selected(void *context, uint32_t index);
+void callback_logged_in_explore_updated(void *context);
+void callback_logged_in_message_users_updated(void *context);
 
-void messages_dialog_callback(DialogExResult result, void *context);
+void callback_message_dialog(DialogExResult result, void *context);
 //
-bool flip_social_home_notification();
+bool callback_home_notification();
 #endif

+ 2 - 2
callback/loader.c

@@ -19,14 +19,14 @@ bool loader_view_alloc(void *context)
 
     view_dispatcher_set_custom_event_callback(app->view_dispatcher, loader_custom_event_callback);
 
-    if (!easy_flipper_set_view(&app->view_loader, FlipSocialViewLoader, loader_draw_callback, NULL, flip_social_callback_to_submenu_logged_in, &app->view_dispatcher, app))
+    if (!easy_flipper_set_view(&app->view_loader, FlipSocialViewLoader, loader_draw_callback, NULL, callback_to_submenu_logged_in, &app->view_dispatcher, app))
     {
         return false;
     }
 
     loader_init(app->view_loader);
 
-    return easy_flipper_set_widget(&app->widget_result, FlipSocialViewWidgetResult, "", flip_social_callback_to_submenu_logged_in, &app->view_dispatcher);
+    return easy_flipper_set_widget(&app->widget_result, FlipSocialViewWidgetResult, "", callback_to_submenu_logged_in, &app->view_dispatcher);
 }
 
 void loader_view_free(void *context)

+ 1 - 1
explore/flip_social_explore.c

@@ -117,7 +117,7 @@ bool flip_social_parse_json_explore(FlipperHTTP *fhttp)
             break;
         }
         snprintf(flip_social_explore->usernames[i], MAX_USER_LENGTH, "%s", furi_string_get_cstr(username));
-        submenu_add_item(app_instance->submenu, flip_social_explore->usernames[i], FlipSocialSubmenuExploreIndexStartIndex + i, flip_social_callback_submenu_choices, app_instance);
+        submenu_add_item(app_instance->submenu, flip_social_explore->usernames[i], FlipSocialSubmenuExploreIndexStartIndex + i, callback_submenu_choices, app_instance);
         flip_social_explore->count++;
         furi_string_free(username);
     }

+ 2 - 2
friends/flip_social_friends.c

@@ -60,7 +60,7 @@ bool flip_social_update_friends()
     submenu_set_header(app_instance->submenu, "Friends");
     for (int i = 0; i < flip_social_friends->count; i++)
     {
-        submenu_add_item(app_instance->submenu, flip_social_friends->usernames[i], FlipSocialSubmenuLoggedInIndexFriendsStart + i, flip_social_callback_submenu_choices, app_instance);
+        submenu_add_item(app_instance->submenu, flip_social_friends->usernames[i], FlipSocialSubmenuLoggedInIndexFriendsStart + i, callback_submenu_choices, app_instance);
     }
     return true;
 }
@@ -107,7 +107,7 @@ bool flip_social_parse_json_friends(FlipperHTTP *fhttp)
             break;
         }
         snprintf(flip_social_friends->usernames[i], MAX_USER_LENGTH, "%s", furi_string_get_cstr(friend));
-        submenu_add_item(app_instance->submenu, flip_social_friends->usernames[i], FlipSocialSubmenuLoggedInIndexFriendsStart + i, flip_social_callback_submenu_choices, app_instance);
+        submenu_add_item(app_instance->submenu, flip_social_friends->usernames[i], FlipSocialSubmenuLoggedInIndexFriendsStart + i, callback_submenu_choices, app_instance);
         flip_social_friends->count++;
         furi_string_free(friend);
     }

+ 3 - 3
messages/flip_social_messages.c

@@ -20,10 +20,10 @@ bool flip_social_update_messages_submenu()
     }
     submenu_reset(app_instance->submenu);
     submenu_set_header(app_instance->submenu, "Messages");
-    submenu_add_item(app_instance->submenu, "[New Message]", FlipSocialSubmenuLoggedInIndexMessagesNewMessage, flip_social_callback_submenu_choices, app_instance);
+    submenu_add_item(app_instance->submenu, "[New Message]", FlipSocialSubmenuLoggedInIndexMessagesNewMessage, callback_submenu_choices, app_instance);
     for (int i = 0; i < flip_social_message_users->count; i++)
     {
-        submenu_add_item(app_instance->submenu, flip_social_message_users->usernames[i], FlipSocialSubmenuLoggedInIndexMessagesUsersStart + i, flip_social_callback_submenu_choices, app_instance);
+        submenu_add_item(app_instance->submenu, flip_social_message_users->usernames[i], FlipSocialSubmenuLoggedInIndexMessagesUsersStart + i, callback_submenu_choices, app_instance);
     }
     return true;
 }
@@ -49,7 +49,7 @@ bool flip_social_update_submenu_user_choices()
     submenu_set_header(app_instance->submenu, "Users");
     for (int i = 0; i < flip_social_explore->count; i++)
     {
-        submenu_add_item(app_instance->submenu, flip_social_explore->usernames[i], FlipSocialSubmenuLoggedInIndexMessagesUserChoicesIndexStart + i, flip_social_callback_submenu_choices, app_instance);
+        submenu_add_item(app_instance->submenu, flip_social_explore->usernames[i], FlipSocialSubmenuLoggedInIndexMessagesUserChoicesIndexStart + i, callback_submenu_choices, app_instance);
     }
     return true;
 }