diff --git a/godot/Assets/fonts/noto_sans_display_bold.ttf b/godot/Assets/fonts/noto_sans_display_bold.ttf new file mode 100644 index 0000000..0dadc86 --- /dev/null +++ b/godot/Assets/fonts/noto_sans_display_bold.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be531a8036d721a54555469ac64803d10ecc5f7095ba1551948b061bf46e5be0 +size 358984 diff --git a/godot/Assets/icons/main_icon.png b/godot/Assets/icons/main_icon.png new file mode 100644 index 0000000..abec645 --- /dev/null +++ b/godot/Assets/icons/main_icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d9bfdd6bfa6a89872cc6ea2a794a61811fc827081a4b025397271b073310793 +size 331171 diff --git a/godot/Assets/icons/main_icon_smaller.png b/godot/Assets/icons/main_icon_smaller.png new file mode 100644 index 0000000..39ce0f4 --- /dev/null +++ b/godot/Assets/icons/main_icon_smaller.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7e3b5c12c841f19d7589c9def5540ffa08231d5b2decce56ad8997590be8388 +size 76314 diff --git a/godot/icons/main_icon.png b/godot/icons/main_icon.png deleted file mode 100644 index c61bf28..0000000 Binary files a/godot/icons/main_icon.png and /dev/null differ diff --git a/godot/icons/main_icon_smaller.png b/godot/icons/main_icon_smaller.png deleted file mode 100644 index 8a86ee7..0000000 Binary files a/godot/icons/main_icon_smaller.png and /dev/null differ diff --git a/godot/project.godot b/godot/project.godot index cc39ac4..3ba669a 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -13,7 +13,7 @@ config_version=4 config/name="Wellbeing App" run/main_scene="res://start_screen.tscn" run/low_processor_mode=true -config/icon="res://icon.png" +config/icon="res://Assets/icons/main_icon.png" [autoload] diff --git a/godot/start_menu.tscn b/godot/start_menu.tscn index 3931084..3a0e99c 100644 --- a/godot/start_menu.tscn +++ b/godot/start_menu.tscn @@ -1,9 +1,14 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://start_menu.gd" type="Script" id=1] [ext_resource path="res://button_name.gd" type="Script" id=2] [ext_resource path="res://button_email_feedback.gd" type="Script" id=3] [ext_resource path="res://button_open_github.gd" type="Script" id=4] +[ext_resource path="res://wb_theme.tres" type="Theme" id=5] +[ext_resource path="res://Assets/fonts/noto_sans_display_italic.ttf" type="DynamicFontData" id=6] + +[sub_resource type="DynamicFont" id=1] +font_data = ExtResource( 6 ) [node name="start_menu" type="CanvasLayer"] script = ExtResource( 1 ) @@ -16,6 +21,7 @@ margin_left = -185.0 margin_top = 7.0 margin_right = 185.0 margin_bottom = 38.0 +theme = ExtResource( 5 ) text = "All your base are belong to us" [node name="HTTPRequest" type="HTTPRequest" parent="."] @@ -27,6 +33,8 @@ margin_left = 5.0 margin_top = -31.0 margin_right = 1280.0 margin_bottom = -1.0 +theme = ExtResource( 5 ) +custom_fonts/font = SubResource( 1 ) text = "Version" [node name="GridContainer" type="GridContainer" parent="."] @@ -41,6 +49,7 @@ margin_right = 626.0 margin_bottom = 198.0 size_flags_horizontal = 3 size_flags_vertical = 3 +theme = ExtResource( 5 ) text = "Daily Action" [node name="button_open_github" type="Button" parent="GridContainer"] @@ -49,6 +58,7 @@ margin_right = 1260.0 margin_bottom = 198.0 size_flags_horizontal = 3 size_flags_vertical = 3 +theme = ExtResource( 5 ) text = "GitHub" script = ExtResource( 4 ) @@ -58,6 +68,7 @@ margin_right = 626.0 margin_bottom = 404.0 size_flags_horizontal = 3 size_flags_vertical = 3 +theme = ExtResource( 5 ) text = "Feedback" script = ExtResource( 3 ) @@ -68,6 +79,7 @@ margin_right = 1260.0 margin_bottom = 404.0 size_flags_horizontal = 3 size_flags_vertical = 3 +theme = ExtResource( 5 ) text = "Name" script = ExtResource( 2 ) @@ -77,16 +89,18 @@ margin_right = 626.0 margin_bottom = 610.0 size_flags_horizontal = 3 size_flags_vertical = 3 +theme = ExtResource( 5 ) text = "Check for Updates" [node name="button_journal" type="Button" parent="GridContainer"] visible = false -margin_left = 230.0 -margin_top = 90.0 -margin_right = 332.0 -margin_bottom = 127.0 +margin_left = 634.0 +margin_top = 412.0 +margin_right = 1260.0 +margin_bottom = 610.0 size_flags_horizontal = 3 size_flags_vertical = 3 +theme = ExtResource( 5 ) text = "Journal" [connection signal="request_completed" from="HTTPRequest" to="." method="_on_HTTPRequest_request_completed"] diff --git a/godot/start_screen.tscn b/godot/start_screen.tscn index 50fbadd..27d4495 100644 --- a/godot/start_screen.tscn +++ b/godot/start_screen.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://main_screen.gd" type="Script" id=1] [ext_resource path="res://user_details.tscn" type="PackedScene" id=2] [ext_resource path="res://start_menu.tscn" type="PackedScene" id=3] [ext_resource path="res://apps/daily_prompts.tscn" type="PackedScene" id=4] +[ext_resource path="res://wb_theme.tres" type="Theme" id=5] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) @@ -33,6 +34,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 42.0 margin_bottom = -48.0 +theme = ExtResource( 5 ) [node name="start_menu" parent="UI/top_container" instance=ExtResource( 3 )] diff --git a/godot/wb_theme.tres b/godot/wb_theme.tres new file mode 100644 index 0000000..6dd7dc1 --- /dev/null +++ b/godot/wb_theme.tres @@ -0,0 +1,41 @@ +[gd_resource type="Theme" load_steps=10 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] + +[sub_resource type="DynamicFont" id=1] +size = 24 +font_data = ExtResource( 1 ) + +[sub_resource type="StyleBoxFlat" id=4] + +[sub_resource type="StyleBoxFlat" id=5] + +[sub_resource type="StyleBoxFlat" id=6] +bg_color = Color( 0.462745, 0.662745, 0.560784, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 + +[sub_resource type="StyleBoxFlat" id=2] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 + +[sub_resource type="StyleBoxFlat" id=7] + +[sub_resource type="DynamicFont" id=3] +size = 24 +font_data = ExtResource( 2 ) + +[resource] +Button/fonts/font = SubResource( 1 ) +Button/styles/disabled = SubResource( 4 ) +Button/styles/focus = SubResource( 5 ) +Button/styles/hover = SubResource( 6 ) +Button/styles/normal = SubResource( 2 ) +Button/styles/pressed = SubResource( 7 ) +Label/fonts/font = SubResource( 3 )