chat updates

Author: fenix-hub

main/scn/chat_node/chat_node.gd

@@ -11,6 +11,7 @@ var send_message_scene : PackedScene = preload("res://main/scn/message_node/send
 
 var chat_id : String
 
+var user : UsersManager.User
 var user_id : String
 var user_name : String
 var user_avatar : ImageTexture
@@ -49,7 +50,10 @@ func _ready():
 func create_chat(document : FirestoreDocument):
     set_user_id(document.doc_name)
     set_user_name(document.doc_fields.username)
-    set_user_avatar(UsersManager.get_user_by_id(document.doc_name).picture)
+    user = UsersManager.get_user_by_id(document.doc_name)
+    if not user.is_connected("update_picture", self, "set_user_avatar"):
+        user.connect("update_picture", self, "set_user_avatar")
+    set_user_avatar(user.picture)
     # If friend doesn't have a chat with me and 
     if not document.doc_fields.chats.has(UserData.user_id):
         # If I don't have a chat with friend
@@ -91,9 +95,13 @@ func add_message(key : String, message : Dictionary) -> Label:
         lbl = send_message_scene.instance()
     else:
         lbl = received_message_scene.instance()
-    lbl.set_text(message.content)
     history_messages.add_child(lbl)
+    lbl.set_text(message.content)
     lbl.set_name(key)
+    yield(get_tree(), "idle_frame")
+    lbl.show()
+    yield(get_tree(), "idle_frame")
+    $ChatContainer/History.scroll_vertical = $ChatContainer/History.get_v_scrollbar().max_value
     return lbl
 
 func _on_db_data(resource : FirebaseResource):
@@ -108,8 +116,6 @@ func _on_db_data(resource : FirebaseResource):
             else:
                 RequestsManager.read_message(resource, db_reference)
     add_message(resource.key, resource.data.message)
-    yield(get_tree(), "idle_frame")
-    $ChatContainer/History.scroll_vertical = $ChatContainer/History.get_v_scrollbar().max_value
 
 
 func _on_CloseBtn_pressed():

main/scn/chat_node/chat_node.tscn

@@ -1,11 +1,12 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://main/scn/buttons/normal_btn/button.gd" type="Script" id=1]
 [ext_resource path="res://main/res/icons/050-cancel.svg" type="Texture" id=2]
 [ext_resource path="res://main/scn/chat_node/chat_node.gd" type="Script" id=3]
 [ext_resource path="res://main/res/icons/settings-24px.svg" type="Texture" id=4]
 [ext_resource path="res://main/res/themes/main.tres" type="Theme" id=5]
 [ext_resource path="res://main/res/shaders/round_avatar.tres" type="Material" id=6]
+[ext_resource path="res://main/res/imgs/avatar.svg" type="Texture" id=7]
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 10.0
@@ -39,7 +40,7 @@ bg_color = Color( 0, 0, 0, 0.588235 )
 
 [node name="ChatNode" type="PanelContainer"]
 margin_right = 300.0
-margin_bottom = 322.0
+margin_bottom = 302.0
 rect_min_size = Vector2( 300, 0 )
 size_flags_horizontal = 8
 size_flags_vertical = 10
@@ -54,7 +55,7 @@ __meta__ = {
 margin_left = 10.0
 margin_top = 10.0
 margin_right = 290.0
-margin_bottom = 312.0
+margin_bottom = 292.0
 custom_constants/separation = 10
 
 [node name="Header" type="HBoxContainer" parent="ChatContainer"]
@@ -66,6 +67,7 @@ material = ExtResource( 6 )
 margin_right = 35.0
 margin_bottom = 35.0
 rect_min_size = Vector2( 35, 35 )
+texture = ExtResource( 7 )
 expand = true
 stretch_mode = 1
 
@@ -117,9 +119,8 @@ color = Color( 0.913725, 0.0980392, 0.286275, 1 )
 [node name="History" type="ScrollContainer" parent="ChatContainer"]
 margin_top = 45.0
 margin_right = 280.0
-margin_bottom = 265.0
+margin_bottom = 245.0
 rect_min_size = Vector2( 0, 200 )
-size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_styles/bg = SubResource( 2 )
 scroll_horizontal_enabled = false
@@ -128,15 +129,15 @@ scroll_horizontal_enabled = false
 margin_left = 5.0
 margin_top = 5.0
 margin_right = 275.0
-margin_bottom = 215.0
+margin_bottom = 195.0
 size_flags_horizontal = 3
 size_flags_vertical = 11
 custom_constants/separation = 6
 
 [node name="Box" type="LineEdit" parent="ChatContainer"]
-margin_top = 275.0
+margin_top = 255.0
 margin_right = 280.0
-margin_bottom = 302.0
+margin_bottom = 282.0
 
 [node name="Settings" type="VBoxContainer" parent="."]
 visible = false

main/scn/home/home.gd

@@ -19,6 +19,8 @@ onready var chat_container : GridContainer = $AspectRatioContainer/ChatContainer
 
 onready var show_post : Control = $ShowPost
 
+onready var notification_lbl : Label = $HomeContainer/Menu/NotificationsBtn/Notification
+
 var fr_posts : FirestoreCollection = Firebase.Firestore.collection("posts")
 
 var friend_posts : Array = []
@@ -35,6 +37,7 @@ func _connect_signals():
     $HomeContainer/Menu/HomeBtn.connect("pressed", self, "_on_HomeBtn_pressed")
     $HomeContainer/Menu/ShareBtn.connect("pressed", self, "_on_ShareBtn_pressed")
     $HomeContainer/Menu/UsersListBtn.connect("pressed", self, "_on_UsersListBtn_pressed")
+    $HomeContainer/Menu/NotificationsBtn.connect("pressed", self, "_on_NotificationsBtn_pressed")
 
 func _ready():
     _connect_signals()
@@ -226,7 +229,8 @@ func _on_Name_pressed():
 func _on_open_post(post : PostsManager.Post):
     show_post.show_post(post, UsersManager.get_user_by_id(post.user_id))
 
-
+func _on_NotificationsBtn_pressed():
+    pass
 
 func _on_Home_item_rect_changed():
     if chat_container == null:

main/scn/home/home.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=22 format=2]
 
 [ext_resource path="res://main/scn/home/home.gd" type="Script" id=1]
 [ext_resource path="res://main/res/fonts/roboto/Roboto-Black.ttf" type="DynamicFontData" id=2]
@@ -14,9 +14,20 @@
 [ext_resource path="res://main/res/icons/015-user-1.svg" type="Texture" id=12]
 [ext_resource path="res://main/scn/show_post/show_post.tscn" type="PackedScene" id=13]
 [ext_resource path="res://main/scn/friend_list/friend_list.tscn" type="PackedScene" id=14]
+[ext_resource path="res://main/res/icons/055-notification.svg" type="Texture" id=15]
 
 [sub_resource type="StyleBoxEmpty" id=1]
 
+[sub_resource type="StyleBoxFlat" id=5]
+bg_color = Color( 1, 0.352941, 0.247059, 1 )
+corner_radius_top_left = 40
+corner_radius_top_right = 40
+corner_radius_bottom_right = 40
+corner_radius_bottom_left = 40
+corner_detail = 20
+
+[sub_resource type="DynamicFont" id=6]
+
 [sub_resource type="StyleBoxEmpty" id=2]
 
 [sub_resource type="DynamicFont" id=3]
@@ -122,10 +133,37 @@ texture_active = ExtResource( 12 )
 texture_inactive = ExtResource( 12 )
 color = Color( 1, 0.627451, 0.294118, 1 )
 
-[node name="HSeparator2" type="HSeparator" parent="HomeContainer/Menu"]
+[node name="NotificationsBtn" parent="HomeContainer/Menu" instance=ExtResource( 10 )]
+margin_left = 15.0
 margin_top = 245.0
+margin_right = 195.0
+margin_bottom = 280.0
+rect_min_size = Vector2( 180, 30 )
+size_flags_horizontal = 4
+text = "Notifications"
+icon = ExtResource( 15 )
+texture_active = ExtResource( 15 )
+texture_inactive = ExtResource( 15 )
+color = Color( 1, 0.627451, 0.294118, 1 )
+
+[node name="Notification" type="Label" parent="HomeContainer/Menu/NotificationsBtn"]
+visible = false
+margin_right = 10.0
+margin_bottom = 10.0
+rect_min_size = Vector2( 10, 10 )
+size_flags_horizontal = 0
+size_flags_vertical = 0
+custom_styles/normal = SubResource( 5 )
+custom_fonts/font = SubResource( 6 )
+autowrap = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="HSeparator2" type="HSeparator" parent="HomeContainer/Menu"]
+margin_top = 295.0
 margin_right = 210.0
-margin_bottom = 255.0
+margin_bottom = 305.0
 custom_styles/separator = SubResource( 2 )
 custom_constants/separation = 10
 

main/scn/message_node/received_message.tscn

@@ -1,4 +1,6 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://main/scn/message_node/message.gd" type="Script" id=1]
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 6.0
@@ -16,9 +18,10 @@ shadow_offset = Vector2( 0, 2 )
 
 [node name="Message" type="Label"]
 margin_right = 13.0
-margin_bottom = 26.0
+margin_bottom = 37.0
 size_flags_horizontal = 0
 custom_styles/normal = SubResource( 1 )
+script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

main/scn/message_node/send_message.tscn

@@ -1,11 +1,13 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://main/scn/message_node/message.gd" type="Script" id=1]
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 6.0
 content_margin_right = 6.0
 content_margin_top = 6.0
 content_margin_bottom = 6.0
-bg_color = Color( 1, 1, 1, 0.196078 )
+bg_color = Color( 0.623529, 0.623529, 0.623529, 0.470588 )
 corner_radius_top_left = 10
 corner_radius_top_right = 10
 corner_radius_bottom_left = 10
@@ -17,12 +19,14 @@ shadow_offset = Vector2( 0, 2 )
 [node name="Message" type="Label"]
 anchor_left = 1.0
 anchor_right = 1.0
-margin_left = -9.0
-margin_bottom = 22.0
+margin_left = -13.0
+margin_bottom = 37.0
 grow_horizontal = 0
-size_flags_horizontal = 8
+size_flags_horizontal = 10
 custom_styles/normal = SubResource( 1 )
 align = 2
+autowrap = true
+script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

main/scn/share/share.gd

@@ -56,7 +56,7 @@ func _on_AddImageBtn_pressed():
 
 func _on_ShareBtn_pressed():
     Activities.loading(true)
-    var share_task : FirestoreTask = RequestsManager.add_post_doc(post_description.get_text().c_escape(), image_path)
+    var share_task : FirestoreTask = RequestsManager.add_post_doc(post_description.get_text(), image_path)
     var post_doc : FirestoreDocument = yield(share_task, "task_finished")
     if image != null:
         var image_task : StorageTask = RequestsManager.add_post_image(post_doc.doc_name, image_path, image.get_data().save_png_to_buffer())

project.godot

@@ -119,6 +119,11 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://main/scn/header/interactive/interactive_header.gd"
 }, {
+"base": "Label",
+"class": "Message",
+"language": "GDScript",
+"path": "res://main/scn/message_node/message.gd"
+}, {
 "base": "PanelContainer",
 "class": "PostContainer",
 "language": "GDScript",
@@ -162,6 +167,7 @@ _global_script_class_icons={
 "FirestoreTileMap": "",
 "FriendButton": "",
 "InteractiveHeader": "",
+"Message": "",
 "PostContainer": "",
 "StorageReference": "",
 "StorageTask": "",