diff --git a/README.md b/README.md index 2fbf1f7..37c96e9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# wellbeing_app +# Wellbeing App (currently unnamed) A freeware and open source wellbeing app. @@ -8,9 +8,13 @@ This app is being developed, researched and released using the following guiding 1. **Research-informed**: Wherever possible, any intervention or activity suggested by the app will be supported by academic research. An up-to-date list of academic references (APA style) will be kept within the app with a very brief description on what segment of the app it informed. A more detailed breakdown may appear on my private website, at some point. 2. **Agile practises**: I will try to adopt agile coding practises as I go through. This means I aim to release useful features as soon as possible and reiterate, refactor and improve based on feedback. Using the in-app feedback button to let me know how things work for you is therefore the best way to gather this information at this stage. -3. **Free, Open Source**: Inspired by the likes of the NOBA project, the Linux community and countless other highly successful Free, Open Source Software (FOSS) projects out there, my aim is to offer a wide-ranging wellbeing tool available for free to anyone who seeks to use this. +3. **Free, Open Source**: Inspired by the likes of the NOBA project, the Linux community and countless other highly successful Free, Open Source Software (FOSS) projects out there, my aim is to offer a wide-ranging wellbeing tool available for free to anyone who seeks to use this. The only exception may be future iOS versions, due to the requirement for a paid Developer account with Apple. Even then, this version will be available for a fixed cost, not based on a subscription model. 4. **Potentially informing my own research**: This guiding principle may develop into something cohesive or fall away completely. I am currently a student at Glasgow University, completing my Master's in Science in Psychology (online conversion). Depending on how successful I am with developing this project, I may end up designing a research project around it to inform my dissertation / thesis. This is an idea I'm toying with. If this pans out, the research project will run separate from this app, but I will seek volunteers to gather anonymous usage data from. I will not build *any* telemetry into this app. Ever. Any sampling and data collection will run through a separate platform (something like LimeSurvey or SurveyMonkey). ## Development Journals -My aim is to write a development journal (or potentially record one on YouTube now and again) whenever I have something meaningful to say. For example, questions like "Why Godot?" or "C# and GDScript? Tell us more" are questions I will aim to answer there. +My aim is to write a development journal (or potentially record one on YouTube now and again) whenever I have something meaningful to say. For example, questions like "Why Godot?" or "C# and GDScript? Tell us more..." are questions I will aim to answer there. + +## License + +Creative Commons Licence
This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. \ No newline at end of file diff --git a/godot/button_name.gd b/godot/button_name.gd new file mode 100644 index 0000000..a47ca84 --- /dev/null +++ b/godot/button_name.gd @@ -0,0 +1,26 @@ +extends Button + +# I'll use this script to call up the user details menu. +# This includes their name, but also topics of interest, etc. + +# referencing nodes for menu switching + +onready var start_menu = get_node("/root/main_screen/start_menu") +onready var user_details = get_node("/root/main_screen/user_details") + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass + + +# makes the start menu disappear and the user menu appear + +func _on_button_name_pressed(): + start_menu.visible = false + user_details.visible = true + diff --git a/godot/initialising.gd b/godot/initialising.gd index 4c38b2a..9f8f6cb 100644 --- a/godot/initialising.gd +++ b/godot/initialising.gd @@ -9,7 +9,7 @@ var user_first_name = "No name" # Called when the node enters the scene tree for the first time. func _ready(): - pass # Replace with function body. + $welcome_title.text = "Good morning " + user_first_name + "!" # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/godot/start_screen.tscn b/godot/start_screen.tscn index 4d7d5df..65dc469 100644 --- a/godot/start_screen.tscn +++ b/godot/start_screen.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://start_screen.cs" type="Script" id=1] [ext_resource path="res://button_open_github.gd" type="Script" id=2] [ext_resource path="res://button_email_feedback.gd" type="Script" id=3] [ext_resource path="res://initialising.gd" type="Script" id=4] +[ext_resource path="res://button_name.gd" type="Script" id=5] [node name="main_screen" type="Node2D"] script = ExtResource( 1 ) @@ -24,10 +25,11 @@ text = "Daily Action" [node name="welcome_title" type="RichTextLabel" parent="start_menu"] margin_left = 19.0 margin_top = 22.0 -margin_right = 277.0 +margin_right = 1007.0 margin_bottom = 53.0 text = "Good morning, Jaap! " +scroll_active = false [node name="button_open_github" type="Button" parent="start_menu"] margin_left = 98.0 @@ -45,5 +47,24 @@ margin_bottom = 157.0 text = "Feedback" script = ExtResource( 3 ) +[node name="button_name" type="Button" parent="start_menu"] +margin_left = 905.0 +margin_top = 19.0 +margin_right = 995.0 +margin_bottom = 56.0 +text = "Name" +script = ExtResource( 5 ) + +[node name="user_details" type="Node2D" parent="."] +visible = false + +[node name="Button" type="Button" parent="user_details"] +margin_left = 444.0 +margin_top = 279.0 +margin_right = 500.0 +margin_bottom = 316.0 +text = "OK" + [connection signal="pressed" from="start_menu/button_open_github" to="start_menu/button_open_github" method="_on_button_open_github_pressed"] [connection signal="pressed" from="start_menu/button_email_feedback" to="start_menu/button_email_feedback" method="_on_button_email_feedback_pressed"] +[connection signal="pressed" from="start_menu/button_name" to="start_menu/button_name" method="_on_button_name_pressed"]