update 2021.04.14

Author: fenix-hub

.gitignore

@@ -5,6 +5,7 @@
 export.cfg
 export_presets.cfg
 override.cfg
+addons/
 
 #
 # Mono-specific ignores

main/res/shaders/lerp_shader.tres

@@ -110,7 +110,7 @@ void light() {
 
 }
 "
-graph_offset = Vector2( -795, 286 )
+graph_offset = Vector2( -915, 323 )
 mode = 1
 flags/light_only = false
 nodes/fragment/0/position = Vector2( 400, 120 )

main/res/shaders/round_avatar.tres

@@ -45,7 +45,7 @@ void light() {
 
 }
 "
-graph_offset = Vector2( -435, 214 )
+graph_offset = Vector2( -428, 247 )
 mode = 1
 flags/light_only = false
 nodes/fragment/2/node = SubResource( 1 )

main/scn/app/main.gd

@@ -1,11 +1,12 @@
 extends Control
 
-const version : String = "1.3"
+const version : String = "1.4"
 
 onready var activities : Control = $Main/Activities
 onready var topbar : HBoxContainer = $TopBar
 onready var loading : Control = $Main/Loading
-onready var error_lbl : Label = $Main/ERROR
+onready var error_container : AspectRatioContainer = $Main/ErrorContainer
+onready var error_lbl : Label = error_container.get_node("ERROR")
 
 onready var user_id_lbl : Label = $Main/AppInfo/UserId
 onready var version_lbl : Label = $Main/AppInfo/Version
@@ -47,17 +48,17 @@ func _on_signin_completed():
     activities.add_child(Activities.home)
 
 func _on_show_error(error : String):
+    error_container.set_size(Vector2())
     error_lbl.set_text(error)
-    error_lbl.rect_size = error_lbl.rect_min_size
-    animator.interpolate_property(error_lbl, "rect_position", 
-    Vector2(rect_size.x/2 - error_lbl.rect_size.x/2, rect_size.y + 10), 
-    Vector2(rect_size.x/2 - error_lbl.rect_size.x/2, rect_size.y - error_lbl.rect_size.y - 50), 
+    animator.interpolate_property(error_container, "rect_position", 
+    Vector2(rect_size.x/2 - error_container.rect_size.x/2, rect_size.y + 10), 
+    Vector2(rect_size.x/2 - error_container.rect_size.x/2, rect_size.y - error_container.rect_size.y), 
     0.3, Tween.TRANS_QUAD, Tween.EASE_OUT)
     animator.start()
-    yield(get_tree().create_timer(8), "timeout")
-    animator.interpolate_property(error_lbl, "rect_position", 
-    error_lbl.rect_position, 
-    Vector2(rect_size.x/2 - error_lbl.rect_size.x/2, rect_size.y + 10), 
+    yield(get_tree().create_timer(9), "timeout")
+    animator.interpolate_property(error_container, "rect_position", 
+    error_container.rect_position, 
+    Vector2(rect_size.x/2 - error_container.rect_size.x/2, rect_size.y + 10), 
     0.3, Tween.TRANS_QUAD, Tween.EASE_OUT)
     animator.start()
 

main/scn/app/main.tscn

@@ -281,18 +281,28 @@ __meta__ = {
 [node name="Timer" type="Timer" parent="MainContainer/Main/Loading"]
 wait_time = 0.7
 
-[node name="ERROR" type="Label" parent="MainContainer/Main"]
+[node name="ErrorContainer" type="AspectRatioContainer" parent="MainContainer/Main"]
 anchor_left = 0.5
 anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
-margin_left = -330.5
-margin_top = 10.5
-margin_right = 330.5
-margin_bottom = 37.5
+margin_left = -250.0
+margin_top = 8.0
+margin_right = 250.0
+margin_bottom = 40.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
+alignment_vertical = 0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ERROR" type="Label" parent="MainContainer/Main/ErrorContainer"]
+margin_right = 500.0
+margin_bottom = 32.0
 grow_horizontal = 2
-grow_vertical = 2
-rect_min_size = Vector2( 400, 0 )
+rect_min_size = Vector2( 500, 0 )
+size_flags_horizontal = 3
 custom_styles/normal = SubResource( 9 )
 custom_colors/font_color = Color( 1, 0, 0.235294, 1 )
 align = 1

main/scn/friend_list/friend_list.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://main/scn/friend_list/friend_list.gd" type="Script" id=1]
 
-[sub_resource type="StyleBoxEmpty" id=1]
+[sub_resource type="StyleBoxEmpty" id=7]
 content_margin_left = 7.0
 content_margin_right = 7.0
 
@@ -28,7 +28,7 @@ margin_right = 1024.0
 margin_bottom = 600.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-custom_styles/bg = SubResource( 1 )
+custom_styles/bg = SubResource( 7 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

main/scn/home/home.gd

@@ -3,18 +3,19 @@ extends PanelContainer
 signal show_error()
 signal loading()
 
-onready var posts_section : VBoxContainer = $HomeContainer/Sections/Posts
-onready var post_box : VBoxContainer = posts_section.get_node("ScrollPost/PostContainer")
+onready var sections_container : VBoxContainer = $HomeContainer/Sections
+onready var posts_section : VBoxContainer = sections_container.get_node("Posts")
+onready var users_list_section : VBoxContainer = sections_container.get_node("UsersList")
+onready var settings_section : VBoxContainer = sections_container.get_node("Settings")
+onready var profile_section : VBoxContainer = sections_container.get_node("Profile")
 
-onready var profile_section : VBoxContainer = $HomeContainer/Sections/Profile
+onready var post_box : VBoxContainer = posts_section.get_node("ScrollPost/PostContainer")
 onready var profile_post_container : VBoxContainer = profile_section.get_node("ScrollPost/PostContainer")
 
 onready var menu : VBoxContainer = $HomeContainer/Menu
 onready var side_bar : VBoxContainer = $HomeContainer/SideBar
 onready var friend_list : VBoxContainer = side_bar.get_node("FriendList")
 
-onready var users_list_section : VBoxContainer = $HomeContainer/Sections/UsersList
-onready var settings_section : VBoxContainer = $HomeContainer/Sections/Settings
 
 onready var chat_container : GridContainer = $AspectRatioContainer/ChatContainer
 
@@ -28,6 +29,8 @@ var friend_posts : Array = []
 
 var posts_db_reference : FirebaseDatabaseReference 
 
+var window_size : Vector2
+
 func _connect_signals():
     connect("item_rect_changed", self, "_on_Home_item_rect_changed")
     $ShareSomethingContainer.connect("share_post", self, "add_shared_post")
@@ -173,10 +176,7 @@ func _on_show_user_profile(user_id : String, user_name : String):
     show_section(profile_section)
     profile_section.load_profile(user_id, user_name)
     emit_signal("loading", false)
-    
 
-func display_post(post_document : Dictionary):
-    pass
 
 func _on_ShareBtn_pressed():
     $ShareSomethingContainer.show()
@@ -201,7 +201,7 @@ func _on_show_chat(chat_node : ChatNode):
 
 
 func show_section(section : Control) -> void:
-    for _section in $HomeContainer/Sections.get_children():
+    for _section in sections_container.get_children():
         _section.hide()
     section.show()
 
@@ -234,6 +234,9 @@ func _on_NotificationsBtn_pressed():
     pass
 
 func _on_Home_item_rect_changed():
+    update_chat_container()
+
+func update_chat_container():
     if chat_container == null:
         return
     chat_container.set_columns(floor(rect_size.x / 300))