rename flip_social_free to free_

alloc/alloc.c

@@ -38,7 +38,7 @@ bool messages_dialog_alloc(bool free_first)
 {
     if (free_first)
     {
-        flip_social_free_messages_dialog();
+        free_messages_dialog();
     }
     if (!app_instance->dialog_messages)
     {
@@ -367,7 +367,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
         }
         // switch view, free dialog, re-alloc dialog, switch back to dialog
         view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewWidgetResult);
-        flip_social_free_feed_view();
+        free_feed_view();
         // load feed item
         if (!flip_social_load_feed_post(flip_feed_info->ids[flip_feed_info->index]))
         {
@@ -412,7 +412,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
             flipper_http_free(fhttp);
             // switch view, free dialog, re-alloc dialog, switch back to dialog
             view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewWidgetResult);
-            flip_social_free_feed_view();
+            free_feed_view();
             // load feed item
             if (!flip_social_load_feed_post(flip_feed_info->ids[flip_feed_info->index]))
             {
@@ -435,7 +435,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
         }
         // switch view, free dialog, re-alloc dialog, switch back to dialog
         view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewWidgetResult);
-        flip_social_free_feed_view();
+        free_feed_view();
         // load feed item
         if (!flip_social_load_feed_post(flip_feed_info->ids[flip_feed_info->index]))
         {
@@ -501,7 +501,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
         }
         // switch view, free dialog, re-alloc dialog, switch back to dialog
         view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewWidgetResult);
-        flip_social_free_feed_view();
+        free_feed_view();
         // load feed item
         if (!flip_social_load_feed_post(flip_feed_info->ids[flip_feed_info->index]))
         {
@@ -534,7 +534,7 @@ bool feed_view_alloc()
         FURI_LOG_E(TAG, "Feed item is NULL");
         return false;
     }
-    flip_social_free_feed_view();
+    free_feed_view();
     if (!app_instance->view_feed)
     {
         if (!easy_flipper_set_view(

alloc/free.c

@@ -7,7 +7,7 @@ void free_all(bool should_free_variable_item_list, bool should_free_submenu, voi
 
     if (should_free_submenu)
     {
-        flip_social_free_explore();
+        free_explore();
         free_submenu();
     }
     if (should_free_variable_item_list)
@@ -15,13 +15,13 @@ void free_all(bool should_free_variable_item_list, bool should_free_submenu, voi
         free_variable_item_list();
     }
     free_text_input();
-    flip_social_free_friends();
-    flip_social_free_messages();
-    flip_social_free_feed_view();
-    flip_social_free_compose_dialog();
-    flip_social_free_explore_dialog();
-    flip_social_free_friends_dialog();
-    flip_social_free_messages_dialog();
+    free_friends();
+    free_messages();
+    free_feed_view();
+    free_compose_dialog();
+    free_explore_dialog();
+    free_friends_dialog();
+    free_messages_dialog();
     flip_feed_info_free();
     free_about_widget(true);
     free_about_widget(false);
@@ -44,7 +44,7 @@ void free_text_input()
         view_dispatcher_remove_view(app_instance->view_dispatcher, FlipSocialViewTextInput);
     }
 }
-void flip_social_free_explore_dialog()
+void free_explore_dialog()
 {
     if (app_instance->dialog_explore)
     {
@@ -53,7 +53,7 @@ void flip_social_free_explore_dialog()
         view_dispatcher_remove_view(app_instance->view_dispatcher, FlipSocialViewExploreDialog);
     }
 }
-void flip_social_free_friends_dialog()
+void free_friends_dialog()
 {
     if (app_instance->dialog_friends)
     {
@@ -62,7 +62,7 @@ void flip_social_free_friends_dialog()
         view_dispatcher_remove_view(app_instance->view_dispatcher, FlipSocialViewFriendsDialog);
     }
 }
-void flip_social_free_messages_dialog()
+void free_messages_dialog()
 {
     if (app_instance->dialog_messages)
     {
@@ -72,7 +72,7 @@ void flip_social_free_messages_dialog()
         return;
     }
 }
-void flip_social_free_compose_dialog()
+void free_compose_dialog()
 {
     if (app_instance->dialog_compose)
     {
@@ -81,7 +81,7 @@ void flip_social_free_compose_dialog()
         view_dispatcher_remove_view(app_instance->view_dispatcher, FlipSocialViewComposeDialog);
     }
 }
-void flip_social_free_feed_view()
+void free_feed_view()
 {
     if (app_instance->view_feed)
     {
@@ -107,7 +107,7 @@ void free_about_widget(bool is_logged_in)
     }
 }
 
-void flip_social_free_friends(void)
+void free_friends(void)
 {
     if (!flip_social_friends)
     {

alloc/free.h

@@ -3,13 +3,13 @@
 #include <callback/callback.h>
 void free_all(bool should_free_variable_item_list, bool should_free_submenu, void *context);
 void free_text_input();
-void flip_social_free_explore_dialog();
-void flip_social_free_friends_dialog();
-void flip_social_free_messages_dialog();
-void flip_social_free_compose_dialog();
-void flip_social_free_feed_view();
+void free_explore_dialog();
+void free_friends_dialog();
+void free_messages_dialog();
+void free_compose_dialog();
+void free_feed_view();
 void free_about_widget(bool is_logged_in);
-void flip_social_free_friends(void);
+void free_friends(void);
 void flip_feed_info_free(void);
 void free_variable_item_list(void);
 void free_submenu(void);

callback/callback.c

@@ -197,8 +197,8 @@ uint32_t flip_social_callback_to_submenu_logged_in(void *context)
     UNUSED(context);
     free_about_widget(false);
     //
-    flip_social_free_friends();
-    flip_social_free_message_users();
+    free_friends();
+    free_message_users();
     flip_feed_info_free();
     if (flip_feed_item)
     {
@@ -207,10 +207,10 @@ uint32_t flip_social_callback_to_submenu_logged_in(void *context)
     }
     // free the about widget if it exists
     free_about_widget(true);
-    flip_social_free_explore_dialog();
-    flip_social_free_friends_dialog();
-    flip_social_free_messages_dialog();
-    flip_social_free_compose_dialog();
+    free_explore_dialog();
+    free_friends_dialog();
+    free_messages_dialog();
+    free_compose_dialog();
 
     return FlipSocialViewLoggedInSubmenu;
 }
@@ -376,7 +376,7 @@ void explore_dialog_callback(DialogExResult result, void *context)
             auth_headers_alloc();
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/remove-friend/", auth_headers, remove_payload);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
-            flip_social_free_explore_dialog();
+            free_explore_dialog();
             furi_delay_ms(1000);
             flipper_http_free(fhttp);
         }
@@ -392,7 +392,7 @@ void explore_dialog_callback(DialogExResult result, void *context)
             auth_headers_alloc();
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/add-friend/", auth_headers, add_payload);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
-            flip_social_free_explore_dialog();
+            free_explore_dialog();
             furi_delay_ms(1000);
             flipper_http_free(fhttp);
         }
@@ -413,7 +413,7 @@ static void friends_dialog_callback(DialogExResult result, void *context)
             auth_headers_alloc();
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/remove-friend/", auth_headers, remove_payload);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
-            flip_social_free_friends_dialog();
+            free_friends_dialog();
             furi_delay_ms(1000);
             flipper_http_free(fhttp);
         }
@@ -439,7 +439,7 @@ void messages_dialog_callback(DialogExResult result, void *context)
             dialog_ex_set_center_button_text(app->dialog_messages, "Create");
             // switch view, free dialog, re-alloc dialog, switch back to dialog
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewWidgetResult);
-            flip_social_free_messages_dialog();
+            free_messages_dialog();
             messages_dialog_alloc(false);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewMessagesDialog);
         }
@@ -460,7 +460,7 @@ void messages_dialog_callback(DialogExResult result, void *context)
             dialog_ex_set_center_button_text(app->dialog_messages, "Create");
             // switch view, free dialog, re-alloc dialog, switch back to dialog
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewWidgetResult);
-            flip_social_free_messages_dialog();
+            free_messages_dialog();
             messages_dialog_alloc(false);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewMessagesDialog);
         }
@@ -522,7 +522,7 @@ static void compose_dialog_callback(DialogExResult result, void *context)
         view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
 
         // Free the dialog resources
-        flip_social_free_compose_dialog();
+        free_compose_dialog();
     }
 
     else if (result == DialogExResultRight) // Post
@@ -575,7 +575,7 @@ static void compose_dialog_callback(DialogExResult result, void *context)
         }
         if (flip_social_load_initial_feed(false, 1))
         {
-            flip_social_free_compose_dialog();
+            free_compose_dialog();
         }
         else
         {
@@ -828,7 +828,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
                 FURI_LOG_E(TAG, "Selected message is NULL");
                 return;
             }
-            flip_social_free_compose_dialog();
+            free_compose_dialog();
             if (!app->dialog_compose)
             {
                 if (!easy_flipper_set_dialog_ex(
@@ -875,7 +875,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
             }
             // if (flipper_http_process_response_async(flip_social_get_user_info, flip_social_parse_user_info))
             // {
-            //     flip_social_free_explore_dialog();
+            //     free_explore_dialog();
             //     if (!app->dialog_explore)
             //     {
             //         if (!easy_flipper_set_dialog_ex(
@@ -902,7 +902,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
             // }
             // else
             // {
-            //     flip_social_free_explore_dialog();
+            //     free_explore_dialog();
             //     if (!app->dialog_explore)
             //     {
             //         if (!easy_flipper_set_dialog_ex(
@@ -938,7 +938,7 @@ void flip_social_callback_submenu_choices(void *context, uint32_t index)
                 return;
             }
             flip_social_friends->index = index - FlipSocialSubmenuLoggedInIndexFriendsStart;
-            flip_social_free_friends_dialog();
+            free_friends_dialog();
             if (!app->dialog_friends)
             {
                 if (!easy_flipper_set_dialog_ex(

explore/flip_social_explore.c

@@ -12,7 +12,7 @@ FlipSocialModel *flip_social_explore_alloc(void)
     return explore;
 }
 
-void flip_social_free_explore(void)
+void free_explore(void)
 {
     if (flip_social_explore)
     {

explore/flip_social_explore.h

@@ -3,7 +3,7 @@
 #include "flip_social.h"
 #include <callback/callback.h>
 FlipSocialModel *flip_social_explore_alloc();
-void flip_social_free_explore();
+void free_explore();
 bool flip_social_get_explore(FlipperHTTP *fhttp);
 bool flip_social_get_explore_2(FlipperHTTP *fhttp);
 bool flip_social_parse_json_explore(FlipperHTTP *fhttp);

messages/flip_social_messages.c

@@ -24,7 +24,7 @@ FlipSocialMessage *flip_social_user_messages_alloc()
     return messages;
 }
 
-void flip_social_free_message_users()
+void free_message_users()
 {
     if (flip_social_message_users == NULL)
     {
@@ -34,7 +34,7 @@ void flip_social_free_message_users()
     flip_social_message_users = NULL;
 }
 
-void flip_social_free_messages()
+void free_messages()
 {
     if (flip_social_messages == NULL)
     {

messages/flip_social_messages.h

@@ -7,8 +7,8 @@
 
 FlipSocialModel2 *flip_social_messages_alloc();
 FlipSocialMessage *flip_social_user_messages_alloc();
-void flip_social_free_message_users();
-void flip_social_free_messages();
+void free_message_users();
+void free_messages();
 bool flip_social_update_messages_submenu();
 bool flip_social_update_submenu_user_choices();
 // Get all the users that have sent messages to the logged in user