mirror of
https://github.com/hobbesjaap/wellbeingapp.git
synced 2024-11-08 19:52:59 +00:00
continued UI work - User Info screen + fonts added
This commit is contained in:
parent
aafcd9c67e
commit
b52041d6d1
BIN
godot/Assets/fonts/NotoSansDisplay-Black.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-Black.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-BlackItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-BlackItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-Bold.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-Bold.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-BoldItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-BoldItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraBold.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraBold.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraBoldItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraBoldItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraLight.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraLight.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraLightItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-ExtraLightItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-Italic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-Italic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-Light.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-Light.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-LightItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-LightItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-Medium.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-Medium.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-MediumItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-MediumItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-Regular.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-Regular.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-SemiBold.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-SemiBold.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-SemiBoldItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-SemiBoldItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-Thin.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-Thin.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
godot/Assets/fonts/NotoSansDisplay-ThinItalic.ttf
(Stored with Git LFS)
Normal file
BIN
godot/Assets/fonts/NotoSansDisplay-ThinItalic.ttf
(Stored with Git LFS)
Normal file
Binary file not shown.
16
godot/birthday_selector.gd
Normal file
16
godot/birthday_selector.gd
Normal file
@ -0,0 +1,16 @@
|
||||
extends GridContainer
|
||||
|
||||
|
||||
# Declare member variables here. Examples:
|
||||
# var a = 2
|
||||
# var b = "text"
|
||||
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
pass # Replace with function body.
|
||||
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
#func _process(delta):
|
||||
# pass
|
@ -7,8 +7,8 @@ onready var user_menu = get_node("/root/main_screen/UI/top_container/user_detail
|
||||
onready var daily_prompts = get_node("/root/main_screen/UI/top_container/daily_prompts")
|
||||
|
||||
|
||||
onready var user_name = get_node("/root/main_screen/UI/top_container/user_details/user_menu/textbox_user_name")
|
||||
onready var first_time_label = get_node("/root/main_screen/UI/top_container/user_details/user_menu/label_first_time")
|
||||
onready var user_name = get_node("/root/main_screen/UI/top_container/user_details/user_menu/green_panel/textbox_user_name")
|
||||
onready var first_time_label = get_node("/root/main_screen/UI/top_container/user_details/user_menu/green_panel/label_first_time")
|
||||
onready var welcome_label = get_node("/root/main_screen/UI/top_container/start_menu/welcome_title")
|
||||
|
||||
|
||||
|
@ -37,9 +37,9 @@ margin_bottom = -48.0
|
||||
theme = ExtResource( 5 )
|
||||
|
||||
[node name="start_menu" parent="UI/top_container" instance=ExtResource( 3 )]
|
||||
visible = false
|
||||
|
||||
[node name="user_details" parent="UI/top_container" instance=ExtResource( 2 )]
|
||||
visible = false
|
||||
|
||||
[node name="daily_prompts" parent="UI/top_container" instance=ExtResource( 4 )]
|
||||
visible = false
|
||||
|
@ -1,47 +1,89 @@
|
||||
[gd_scene load_steps=3 format=2]
|
||||
[gd_scene load_steps=4 format=2]
|
||||
|
||||
[ext_resource path="res://button_user_save.gd" type="Script" id=1]
|
||||
[ext_resource path="res://wb_theme.tres" type="Theme" id=2]
|
||||
[ext_resource path="res://birthday_selector.gd" type="Script" id=3]
|
||||
|
||||
[node name="user_details" type="CanvasLayer"]
|
||||
|
||||
[node name="user_menu" type="VBoxContainer" parent="."]
|
||||
margin_left = 10.0
|
||||
margin_top = 55.0
|
||||
margin_right = 1270.0
|
||||
margin_bottom = 665.0
|
||||
rect_min_size = Vector2( 1260, 610 )
|
||||
|
||||
[node name="label_first_time" type="Label" parent="user_menu"]
|
||||
unique_name_in_owner = true
|
||||
margin_right = 1260.0
|
||||
margin_bottom = 34.0
|
||||
[node name="user_menu" type="PanelContainer" parent="."]
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
margin_left = -500.0
|
||||
margin_top = -300.0
|
||||
margin_right = 500.0
|
||||
margin_bottom = 300.0
|
||||
theme = ExtResource( 2 )
|
||||
text = "First time user: Please fill in your FIRST NAME only below."
|
||||
|
||||
[node name="textbox_user_name" type="LineEdit" parent="user_menu"]
|
||||
[node name="green_panel" type="Panel" parent="user_menu"]
|
||||
margin_right = 1000.0
|
||||
margin_bottom = 600.0
|
||||
theme = ExtResource( 2 )
|
||||
|
||||
[node name="label_first_time" type="Label" parent="user_menu/green_panel"]
|
||||
unique_name_in_owner = true
|
||||
margin_top = 42.0
|
||||
margin_right = 1260.0
|
||||
margin_bottom = 76.0
|
||||
anchor_right = 1.0
|
||||
margin_top = 3.0
|
||||
margin_bottom = 37.0
|
||||
theme = ExtResource( 2 )
|
||||
text = "First time user: Please fill in your first name below."
|
||||
align = 1
|
||||
|
||||
[node name="textbox_user_name" type="LineEdit" parent="user_menu/green_panel"]
|
||||
unique_name_in_owner = true
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
margin_left = -350.0
|
||||
margin_top = 41.0
|
||||
margin_right = 350.0
|
||||
margin_bottom = 75.0
|
||||
theme = ExtResource( 2 )
|
||||
caret_blink = true
|
||||
caret_blink_speed = 0.5
|
||||
|
||||
[node name="button_user_save" type="Button" parent="user_menu"]
|
||||
margin_top = 84.0
|
||||
margin_right = 1260.0
|
||||
margin_bottom = 118.0
|
||||
theme = ExtResource( 2 )
|
||||
text = "OK"
|
||||
script = ExtResource( 1 )
|
||||
[node name="birthday_selector" type="GridContainer" parent="user_menu/green_panel"]
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
margin_left = -134.0
|
||||
margin_top = -150.0
|
||||
margin_right = 133.0
|
||||
margin_bottom = -116.0
|
||||
columns = 2
|
||||
script = ExtResource( 3 )
|
||||
|
||||
[node name="button_birth_day" type="MenuButton" parent="user_menu"]
|
||||
margin_top = 126.0
|
||||
margin_right = 1260.0
|
||||
margin_bottom = 160.0
|
||||
[node name="button_birth_month" type="MenuButton" parent="user_menu/green_panel/birthday_selector"]
|
||||
margin_right = 130.0
|
||||
margin_bottom = 34.0
|
||||
size_flags_horizontal = 3
|
||||
text = "Month"
|
||||
items = [ "January", null, 0, false, false, 1, 0, null, "", false, "February", null, 0, false, false, 2, 0, null, "", false, "March", null, 0, false, false, 3, 0, null, "", false, "April", null, 0, false, false, 4, 0, null, "", false, "May", null, 0, false, false, 5, 0, null, "", false, "June", null, 0, false, false, 6, 0, null, "", false, "July", null, 0, false, false, 7, 0, null, "", false, "August", null, 0, false, false, 8, 0, null, "", false, "September", null, 0, false, false, 9, 0, null, "", false, "October", null, 0, false, false, 10, 0, null, "", false, "November", null, 0, false, false, 11, 0, null, "", false, "December", null, 0, false, false, 12, 0, null, "", false ]
|
||||
|
||||
[node name="button_birth_day" type="MenuButton" parent="user_menu/green_panel/birthday_selector"]
|
||||
margin_left = 138.0
|
||||
margin_right = 267.0
|
||||
margin_bottom = 34.0
|
||||
focus_mode = 2
|
||||
size_flags_horizontal = 3
|
||||
theme = ExtResource( 2 )
|
||||
text = "Day"
|
||||
items = [ "1", null, 0, false, false, 1, 0, null, "", false, "2", null, 0, false, false, 2, 0, null, "", false, "3", null, 0, false, false, 3, 0, null, "", false, "4", null, 0, false, false, 4, 0, null, "", false, "5", null, 0, false, false, 5, 0, null, "", false, "6", null, 0, false, false, 6, 0, null, "", false, "7", null, 0, false, false, 7, 0, null, "", false, "8", null, 0, false, false, 8, 0, null, "", false, "9", null, 0, false, false, 9, 0, null, "", false, "10", null, 0, false, false, 10, 0, null, "", false, "11", null, 0, false, false, 11, 0, null, "", false, "12", null, 0, false, false, 12, 0, null, "", false, "13", null, 0, false, false, 13, 0, null, "", false, "14", null, 0, false, false, 14, 0, null, "", false, "15", null, 0, false, false, 15, 0, null, "", false, "16", null, 0, false, false, 16, 0, null, "", false, "17", null, 0, false, false, 17, 0, null, "", false, "18", null, 0, false, false, 18, 0, null, "", false, "19", null, 0, false, false, 19, 0, null, "", false, "20", null, 0, false, false, 20, 0, null, "", false, "21", null, 0, false, false, 21, 0, null, "", false, "22", null, 0, false, false, 22, 0, null, "", false, "23", null, 0, false, false, 23, 0, null, "", false, "24", null, 0, false, false, 24, 0, null, "", false, "25", null, 0, false, false, 25, 0, null, "", false, "26", null, 0, false, false, 26, 0, null, "", false, "27", null, 0, false, false, 27, 0, null, "", false, "28", null, 0, false, false, 28, 0, null, "", false, "29", null, 0, false, false, 29, 0, null, "", false, "30", null, 0, false, false, 30, 0, null, "", false, "31", null, 0, false, false, 31, 0, null, "", false ]
|
||||
|
||||
[connection signal="pressed" from="user_menu/button_user_save" to="user_menu/button_user_save" method="_on_button_user_save_pressed"]
|
||||
[node name="button_user_save" type="Button" parent="user_menu/green_panel"]
|
||||
anchor_left = 0.5
|
||||
anchor_top = 1.0
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 1.0
|
||||
margin_left = -74.0
|
||||
margin_top = -49.0
|
||||
margin_right = 74.5701
|
||||
margin_bottom = -15.0
|
||||
theme = ExtResource( 2 )
|
||||
text = "Done"
|
||||
expand_icon = true
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[connection signal="pressed" from="user_menu/green_panel/button_user_save" to="user_menu/green_panel/button_user_save" method="_on_button_user_save_pressed"]
|
||||
|
@ -1,4 +1,4 @@
|
||||
[gd_resource type="Theme" load_steps=12 format=2]
|
||||
[gd_resource type="Theme" load_steps=14 format=2]
|
||||
|
||||
[ext_resource path="res://Assets/fonts/noto_sans_display_bold.ttf" type="DynamicFontData" id=1]
|
||||
[ext_resource path="res://Assets/fonts/noto_sans_display.ttf" type="DynamicFontData" id=2]
|
||||
@ -22,7 +22,7 @@ corner_radius_bottom_right = 10
|
||||
corner_radius_bottom_left = 10
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=6]
|
||||
bg_color = Color( 0.462745, 0.662745, 0.560784, 1 )
|
||||
bg_color = Color( 0.941176, 0.772549, 0.517647, 1 )
|
||||
corner_radius_top_left = 10
|
||||
corner_radius_top_right = 10
|
||||
corner_radius_bottom_right = 10
|
||||
@ -59,6 +59,20 @@ corner_radius_top_right = 10
|
||||
corner_radius_bottom_right = 10
|
||||
corner_radius_bottom_left = 10
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id=11]
|
||||
bg_color = Color( 0.462745, 0.662745, 0.560784, 1 )
|
||||
border_width_left = 2
|
||||
border_width_top = 2
|
||||
border_width_right = 2
|
||||
border_width_bottom = 2
|
||||
border_color = Color( 0.207843, 0.219608, 0.317647, 1 )
|
||||
corner_radius_top_left = 10
|
||||
corner_radius_top_right = 10
|
||||
corner_radius_bottom_right = 10
|
||||
corner_radius_bottom_left = 10
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=12]
|
||||
|
||||
[resource]
|
||||
Button/fonts/font = SubResource( 1 )
|
||||
Button/styles/disabled = SubResource( 4 )
|
||||
@ -69,3 +83,5 @@ Button/styles/pressed = SubResource( 7 )
|
||||
Label/fonts/font = SubResource( 3 )
|
||||
LineEdit/fonts/font = SubResource( 8 )
|
||||
LineEdit/styles/normal = SubResource( 9 )
|
||||
Panel/styles/panel = SubResource( 11 )
|
||||
PanelContainer/styles/panel = SubResource( 12 )
|
||||
|
Loading…
Reference in New Issue
Block a user