1 files changed, 88 insertions, 55 deletions

diff --git a/src/ui/messenger.c b/src/ui/messenger.c
index 4bf3164..37827d8 100644
--- a/src/ui/messenger.c
+++ b/src/ui/messenger.c
@@ -103,71 +103,85 @@ ui_messenger_init(MESSENGER_Application *app,
       GTK_WINDOW(handle->main_window)
   );
 
-  handle->profile_avatar = HDY_AVATAR(
-      gtk_builder_get_object(builder, "profile_avatar")
+  gtk_window_set_default_size(
+      GTK_WINDOW(handle->main_window),
+      1100, 700
   );
 
-  handle->profile_label = GTK_LABEL(
-      gtk_builder_get_object(builder, "profile_label")
+  handle->leaflet_chat = HDY_LEAFLET(
+      gtk_builder_get_object(builder, "leaflet_chat")
+  );
+
+  handle->flap_user_details = HDY_FLAP(
+      gtk_builder_get_object(builder, "flap_user_details")
+  );
+
+  handle->flap_chat_details = HDY_FLAP(
+      gtk_builder_get_object(builder, "flap_chat_details")
   );
 
   handle->title_bar = HDY_HEADER_BAR(
       gtk_builder_get_object(builder, "title_bar")
   );
 
-  handle->leaflet_chat = HDY_LEAFLET(
-      gtk_builder_get_object(builder, "leaflet_chat")
+  g_object_bind_property(
+      handle->leaflet_chat,
+      "folded",
+      handle->title_bar,
+      "show-close-button",
+      G_BINDING_INVERT_BOOLEAN
   );
 
   if (app->ui.mobile)
-  {
     g_object_bind_property(
-        handle->leaflet_chat,
-        "folded",
-        handle->title_bar,
-        "visible",
-        G_BINDING_SYNC_CREATE |
-        G_BINDING_INVERT_BOOLEAN
+      handle->leaflet_chat,
+      "folded",
+      handle->title_bar,
+      "visible",
+      G_BINDING_SYNC_CREATE |
+      G_BINDING_INVERT_BOOLEAN
     );
-  }
 
-  hdy_leaflet_set_homogeneous(handle->leaflet_chat, FALSE, GTK_ORIENTATION_HORIZONTAL, FALSE);
+  handle->back_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "back_button")
+  );
 
-  handle->chats_listbox = GTK_LIST_BOX(
-      gtk_builder_get_object(builder, "chats_listbox")
+  g_object_bind_property(
+      handle->leaflet_chat,
+      "folded",
+      handle->back_button,
+      "visible",
+      G_BINDING_SYNC_CREATE
   );
 
   g_signal_connect(
-      handle->chats_listbox,
-      "row-activated",
-      G_CALLBACK(handle_chats_listbox_row_activated),
+      handle->back_button,
+      "clicked",
+      G_CALLBACK(handle_back_button_click),
       handle->leaflet_chat
   );
 
-  handle->user_details_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "user_details_button")
+  handle->profile_avatar = HDY_AVATAR(
+      gtk_builder_get_object(builder, "profile_avatar")
   );
 
-  handle->hide_user_details_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "hide_user_details_button")
+  handle->profile_label = GTK_LABEL(
+      gtk_builder_get_object(builder, "profile_label")
   );
 
-  handle->flap_user_details = HDY_FLAP(
-      gtk_builder_get_object(builder, "flap_user_details")
+  handle->hide_user_details_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "hide_user_details_button")
   );
 
   g_signal_connect(
-      handle->user_details_button,
+      handle->hide_user_details_button,
       "clicked",
       G_CALLBACK(handle_flap_via_button_click),
       handle->flap_user_details
   );
 
-  g_signal_connect(
-      handle->hide_user_details_button,
-      "clicked",
-      G_CALLBACK(handle_flap_via_button_click),
-      handle->flap_user_details
+  handle->favourites_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "favourites_button")
   );
 
   handle->account_details_button = GTK_BUTTON(
@@ -185,35 +199,54 @@ ui_messenger_init(MESSENGER_Application *app,
       handle->account_details_revealer
   );
 
-  handle->back_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "back_button")
+  handle->accounts_listbox = GTK_LIST_BOX(
+      gtk_builder_get_object(builder, "accounts_listbox")
+  );
+
+  handle->new_contact_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "new_contact_button")
+  );
+
+  handle->new_group_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "new_group_button")
+  );
+
+  handle->new_platform_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "new_platform_button")
+  );
+
+  handle->contacts_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "contacts_button")
+  );
+
+  handle->settings_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "settings_button")
+  );
+
+  handle->user_details_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "user_details_button")
   );
 
   g_signal_connect(
-      handle->back_button,
+      handle->user_details_button,
       "clicked",
-      G_CALLBACK(handle_back_button_click),
-      handle->leaflet_chat
+      G_CALLBACK(handle_flap_via_button_click),
+      handle->flap_user_details
   );
 
-  g_object_bind_property(
-      handle->leaflet_chat,
-      "folded",
-      handle->back_button,
-      "visible",
-      G_BINDING_SYNC_CREATE
+  handle->chats_search = GTK_SEARCH_ENTRY(
+      gtk_builder_get_object(builder, "chats_search")
   );
 
-  g_object_bind_property(
-      handle->leaflet_chat,
-      "folded",
-      handle->title_bar,
-      "show-close-button",
-      G_BINDING_INVERT_BOOLEAN
+  handle->chats_listbox = GTK_LIST_BOX(
+      gtk_builder_get_object(builder, "chats_listbox")
   );
 
-  handle->flap_chat_details = HDY_FLAP(
-      gtk_builder_get_object(builder, "flap_chat_details")
+  g_signal_connect(
+      handle->chats_listbox,
+      "row-activated",
+      G_CALLBACK(handle_chats_listbox_row_activated),
+      handle->leaflet_chat
   );
 
   handle->chat_title = GTK_LABEL(
@@ -228,10 +261,6 @@ ui_messenger_init(MESSENGER_Application *app,
       gtk_builder_get_object(builder, "chat_details_button")
   );
 
-  handle->hide_chat_details_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "hide_chat_details_button")
-  );
-
   g_signal_connect(
       handle->chat_details_button,
       "clicked",
@@ -239,6 +268,10 @@ ui_messenger_init(MESSENGER_Application *app,
       handle->flap_chat_details
   );
 
+  handle->hide_chat_details_button = GTK_BUTTON(
+      gtk_builder_get_object(builder, "hide_chat_details_button")
+  );
+
   g_signal_connect(
       handle->hide_chat_details_button,
       "clicked",