rename flip_social_messages and its methods

callback/callback.c

@@ -1,6 +1,6 @@
 #include <callback/callback.h>
 #include <callback/loader.h>
-#include <messages/flip_social_messages.h>
+#include <messages/messages.h>
 #include <friends/friends.h>
 #include <explore/explore.h>
 #include <feed/feed.h>
@@ -722,8 +722,8 @@ void callback_submenu_choices(void *context, uint32_t index)
             return;
         }
         // flipper_http_loading_task(
-        //     flip_social_get_message_users,        // get the message users
-        //     flip_social_parse_json_message_users, // parse the message users
+        //     messages_get_message_users,        // get the message users
+        //     messages_parse_json_message_users, // parse the message users
         //     FlipSocialViewSubmenu,                // switch to the messages submenu if successful
         //     FlipSocialViewLoggedInSubmenu,        // switch back to the main submenu if failed
         //     &app->view_dispatcher);               // view dispatcher
@@ -981,8 +981,8 @@ void callback_submenu_choices(void *context, uint32_t index)
             }
             flip_social_message_users->index = index - FlipSocialSubmenuLoggedInIndexMessagesUsersStart;
             // flipper_http_loading_task(
-            //     flip_social_get_messages_with_user,    // get the messages with the selected user
-            //     flip_social_parse_json_messages,       // parse the messages
+            //     messages_get_messages_with_user,    // get the messages with the selected user
+            //     messages_parse_json_messages,       // parse the messages
             //     FlipSocialViewMessagesDialog,          // switch to the messages process if successful
             //     FlipSocialViewLoggedInMessagesSubmenu, // switch back to the messages submenu if failed
             //     &app->view_dispatcher                  // view dispatcher
@@ -1878,7 +1878,7 @@ void callback_logged_in_messages_user_choice_message_updated(void *context)
     flip_social_message_users->count++;
 
     // redraw submenu
-    flip_social_update_messages_submenu();
+    messages_submenu_update();
     view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
 }
 
@@ -2031,7 +2031,7 @@ void callback_logged_in_message_users_updated(void *context)
     // get users
     // flipper_http_loading_task(
     //     explore_fetch_2,                             // get the explore users
-    //     flip_social_parse_json_message_user_choices, // parse the explore users
+    //     messages_parse_json_message_user_choices, // parse the explore users
     //     FlipSocialViewSubmenu,                       // switch to the explore submenu if successful
     //     FlipSocialViewLoggedInSubmenu,               // switch back to the main submenu if failed
     //     &app->view_dispatcher);                      // view dispatcher

messages/flip_social_messages.c → messages/messages.c

@@ -1,7 +1,7 @@
-#include "flip_social_messages.h"
+#include <messages/messages.h>
 #include <alloc/alloc.h>
 
-bool flip_social_update_messages_submenu()
+bool messages_submenu_update()
 {
     if (!app_instance)
     {
@@ -28,7 +28,7 @@ bool flip_social_update_messages_submenu()
     return true;
 }
 
-bool flip_social_update_submenu_user_choices()
+bool messages_update_submenu_user_choices()
 {
     if (app_instance == NULL)
     {
@@ -55,7 +55,7 @@ bool flip_social_update_submenu_user_choices()
 }
 
 // Get all the users that have sent messages to the logged in user
-bool flip_social_get_message_users(FlipperHTTP *fhttp)
+bool messages_get_message_users(FlipperHTTP *fhttp)
 {
     if (!app_instance)
     {
@@ -98,7 +98,7 @@ bool flip_social_get_message_users(FlipperHTTP *fhttp)
 }
 
 // Get all the messages between the logged in user and the selected user
-bool flip_social_get_messages_with_user(FlipperHTTP *fhttp)
+bool messages_get_messages_with_user(FlipperHTTP *fhttp)
 {
     if (!app_instance)
     {
@@ -148,7 +148,7 @@ bool flip_social_get_messages_with_user(FlipperHTTP *fhttp)
 }
 
 // Parse the users that have sent messages to the logged-in user
-bool flip_social_parse_json_message_users(FlipperHTTP *fhttp)
+bool messages_parse_json_message_users(FlipperHTTP *fhttp)
 {
     if (!fhttp)
     {
@@ -188,7 +188,7 @@ bool flip_social_parse_json_message_users(FlipperHTTP *fhttp)
     }
 
     // Add submenu items for the users
-    flip_social_update_messages_submenu();
+    messages_submenu_update();
 
     // Free the JSON data
     furi_string_free(message_data);
@@ -196,7 +196,7 @@ bool flip_social_parse_json_message_users(FlipperHTTP *fhttp)
 }
 
 // Parse the users that the logged in user can message
-bool flip_social_parse_json_message_user_choices(FlipperHTTP *fhttp)
+bool messages_parse_json_message_user_choices(FlipperHTTP *fhttp)
 {
     if (!fhttp)
     {
@@ -237,7 +237,7 @@ bool flip_social_parse_json_message_user_choices(FlipperHTTP *fhttp)
     }
 
     // Add submenu items for the users
-    flip_social_update_submenu_user_choices();
+    messages_update_submenu_user_choices();
 
     // Free the JSON data
     furi_string_free(user_data);
@@ -245,7 +245,7 @@ bool flip_social_parse_json_message_user_choices(FlipperHTTP *fhttp)
 }
 
 // parse messages between the logged in user and the selected user
-bool flip_social_parse_json_messages(FlipperHTTP *fhttp)
+bool messages_parse_json_messages(FlipperHTTP *fhttp)
 {
     if (!fhttp)
     {

messages/flip_social_messages.h → messages/messages.h

@@ -3,19 +3,19 @@
 
 #include "flip_social.h"
 
-bool flip_social_update_messages_submenu();
-bool flip_social_update_submenu_user_choices();
+bool messages_submenu_update();
+bool messages_update_submenu_user_choices();
 // Get all the users that have sent messages to the logged in user
-bool flip_social_get_message_users(FlipperHTTP *fhttp);
+bool messages_get_message_users(FlipperHTTP *fhttp);
 // Get all the messages between the logged in user and the selected user
-bool flip_social_get_messages_with_user(FlipperHTTP *fhttp);
+bool messages_get_messages_with_user(FlipperHTTP *fhttp);
 // Parse the users that have sent messages to the logged-in user
-bool flip_social_parse_json_message_users(FlipperHTTP *fhttp);
+bool messages_parse_json_message_users(FlipperHTTP *fhttp);
 
 // Parse the users that the logged in user can message
-bool flip_social_parse_json_message_user_choices(FlipperHTTP *fhttp);
+bool messages_parse_json_message_user_choices(FlipperHTTP *fhttp);
 
 // parse messages between the logged in user and the selected user
-bool flip_social_parse_json_messages(FlipperHTTP *fhttp);
+bool messages_parse_json_messages(FlipperHTTP *fhttp);
 
 #endif