Added ui files for messages and automated some debug entries

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

6 files changed, 149 insertions, 12 deletions

diff --git a/src/ui/chat_entry.c b/src/ui/chat_entry.c
index 5ff7063..b314211 100644
--- a/src/ui/chat_entry.c
+++ b/src/ui/chat_entry.c
@@ -35,20 +35,24 @@ ui_chat_entry_new(void)
       gtk_builder_get_object(builder, "entry_box")
   );
 
-  handle->avatar = HDY_AVATAR(
-      gtk_builder_get_object(builder, "avatar")
+  handle->entry_avatar = HDY_AVATAR(
+      gtk_builder_get_object(builder, "entry_avatar")
   );
 
-  handle->title = GTK_LABEL(
-      gtk_builder_get_object(builder, "title")
+  handle->title_label = GTK_LABEL(
+      gtk_builder_get_object(builder, "title_label")
   );
 
-  handle->timestamp = GTK_LABEL(
-      gtk_builder_get_object(builder, "timestamp")
+  handle->timestamp_label = GTK_LABEL(
+      gtk_builder_get_object(builder, "timestamp_label")
   );
 
-  handle->text = GTK_LABEL(
-      gtk_builder_get_object(builder, "text")
+  handle->text_label = GTK_LABEL(
+      gtk_builder_get_object(builder, "text_label")
+  );
+
+  handle->read_receipt_image = GTK_IMAGE(
+      gtk_builder_get_object(builder, "read_receipt_image")
   );
 
   return handle;
diff --git a/src/ui/chat_entry.h b/src/ui/chat_entry.h
index 48f2fb7..2315686 100644
--- a/src/ui/chat_entry.h
+++ b/src/ui/chat_entry.h
@@ -34,12 +34,13 @@ typedef struct UI_CHAT_ENTRY_Handle
 {
   GtkWidget* entry_box;
 
-  HdyAvatar* avatar;
+  HdyAvatar* entry_avatar;
 
-  GtkLabel* title;
-  GtkLabel* timestamp;
+  GtkLabel* title_label;
+  GtkLabel* timestamp_label;
 
-  GtkLabel* text;
+  GtkLabel* text_label;
+  GtkImage* read_receipt_image;
 } UI_CHAT_ENTRY_Handle;
 
 UI_CHAT_ENTRY_Handle*
diff --git a/src/ui/message.c b/src/ui/message.c
new file mode 100644
index 0000000..f48bbaa
--- /dev/null
+++ b/src/ui/message.c
@@ -0,0 +1,74 @@
+/*
+   This file is part of GNUnet.
+   Copyright (C) 2021 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   SPDX-License-Identifier: AGPL3.0-or-later
+ */
+/*
+ * @author Tobias Frisch
+ * @file ui/message.c
+ */
+
+#include "message.h"
+
+#include "../application.h"
+
+UI_MESSAGE_Handle*
+ui_message_new(MESSENGER_Application *app,
+               bool sent)
+{
+  UI_MESSAGE_Handle* handle = g_malloc(sizeof(UI_MESSAGE_Handle));
+  GtkBuilder* builder;
+
+  if (sent)
+    builder = gtk_builder_new_from_file("resources/ui/message-sent.ui");
+  else
+    builder = gtk_builder_new_from_file("resources/ui/message.ui");
+
+  handle->message_box = GTK_WIDGET(
+      gtk_builder_get_object(builder, "message_box")
+  );
+
+  handle->sender_avatar = HDY_AVATAR(
+      gtk_builder_get_object(builder, "sender_avatar")
+  );
+
+  handle->sender_label = GTK_LABEL(
+      gtk_builder_get_object(builder, "sender_label")
+  );
+
+  if (sent)
+  {
+    const char *sender = GNUNET_CHAT_get_name(app->chat.messenger.handle);
+
+    hdy_avatar_set_text(handle->sender_avatar, sender);
+    gtk_label_set_text(handle->sender_label, sender);
+  }
+
+  handle->text_label = GTK_LABEL(
+      gtk_builder_get_object(builder, "text_label")
+  );
+
+  handle->timestamp_label = GTK_LABEL(
+      gtk_builder_get_object(builder, "timestamp_label")
+  );
+
+  handle->read_receipt_image = GTK_IMAGE(
+      gtk_builder_get_object(builder, "read_receipt_image")
+  );
+
+  return handle;
+}
diff --git a/src/ui/message.h b/src/ui/message.h
new file mode 100644
index 0000000..b55cb8d
--- /dev/null
+++ b/src/ui/message.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of GNUnet.
+   Copyright (C) 2021 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   SPDX-License-Identifier: AGPL3.0-or-later
+ */
+/*
+ * @author Tobias Frisch
+ * @file ui/message.h
+ */
+
+#ifndef UI_MESSAGE_H_
+#define UI_MESSAGE_H_
+
+#include <stdbool.h>
+
+#include <gtk-3.0/gtk/gtk.h>
+#include <libhandy-1/handy.h>
+
+typedef struct MESSENGER_Application MESSENGER_Application;
+
+typedef struct UI_MESSAGE_Handle
+{
+  GtkWidget* message_box;
+
+  HdyAvatar* sender_avatar;
+  GtkLabel* sender_label;
+
+  GtkLabel* text_label;
+
+  GtkLabel* timestamp_label;
+  GtkImage* read_receipt_image;
+} UI_MESSAGE_Handle;
+
+UI_MESSAGE_Handle*
+ui_message_new(MESSENGER_Application *app,
+               bool sent);
+
+#endif /* UI_MESSAGE_H_ */
diff --git a/src/ui/messenger.c b/src/ui/messenger.c
index 37827d8..196b00a 100644
--- a/src/ui/messenger.c
+++ b/src/ui/messenger.c
@@ -279,6 +279,10 @@ ui_messenger_init(MESSENGER_Application *app,
       handle->flap_chat_details
   );
 
+  handle->messages_listbox = GTK_LIST_BOX(
+      gtk_builder_get_object(builder, "messages_listbox")
+  );
+
   gtk_widget_show(GTK_WIDGET(handle->main_window));
 
   g_signal_connect(
diff --git a/src/ui/messenger.h b/src/ui/messenger.h
index 4174754..e923964 100644
--- a/src/ui/messenger.h
+++ b/src/ui/messenger.h
@@ -67,6 +67,8 @@ typedef struct UI_MESSENGER_Handle
   GtkButton *chat_details_button;
 
   GtkButton *hide_chat_details_button;
+
+  GtkListBox *messages_listbox;
 } UI_MESSENGER_Handle;
 
 void