From ca89d7af941a5776771905e83a372194645ad040 Mon Sep 17 00:00:00 2001
From: SebasKoedam <Sebas@koedam.info>
Date: Wed, 24 Apr 2024 15:18:22 +0200
Subject: [PATCH] Update Fitbot project files and add robot conversation in
 MainActivity.java

---
 .../Fitbot/.idea/deploymentTargetDropDown.xml |  2 +-
 .../java/com/example/fitbot/MainActivity.java | 21 +++++++++++++------
 .../sebas/onderzoekEthiek/formulier.md        |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml
index 24e256e..a5abdd5 100644
--- a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml
+++ b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2024-04-24T09:24:05.698446800Z" />
+    <timeTargetWasSelectedWithDropDown value="2024-04-24T11:45:40.185922Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
index 16f9f66..f11358b 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
@@ -9,6 +9,7 @@ import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
 import com.aldebaran.qi.sdk.builder.SayBuilder;
 import com.aldebaran.qi.sdk.design.activity.RobotActivity;
 import com.aldebaran.qi.sdk.design.activity.conversationstatus.SpeechBarDisplayStrategy;
+import com.aldebaran.qi.sdk.object.conversation.Phrase;
 import com.aldebaran.qi.sdk.object.conversation.Say;
 
 
@@ -30,13 +31,21 @@ public class MainActivity extends RobotActivity implements RobotLifecycleCallbac
 
     @Override
     public void onRobotFocusGained(QiContext qiContext) {
-        // Create a new say action.
-        Say say = SayBuilder.with(qiContext) // Create the builder with the context.
-                .withText("Hallo hoe gaat het?") // Set the text to say.
-                .build(); // Build the say action.
+        String locationName = ("de Hogeschool van Amsterdam");
+        String locationDescription = ("de Hogeschool van Amsterdam");
 
-        // Execute the action.
-        say.run();
+        Phrase namePhrase = new Phrase("This location is " + locationName);
+        Say sayName = SayBuilder.with(qiContext)
+                .withPhrase(namePhrase)
+                .build();
+
+        Phrase descriptionPhrase = new Phrase(locationDescription);
+        Say sayDescription = SayBuilder.with(qiContext)
+                .withPhrase(descriptionPhrase)
+                .build();
+
+        sayName.run();
+        sayDescription.run();
     }
 
     @Override
diff --git a/docs/personalDocs/sebas/onderzoekEthiek/formulier.md b/docs/personalDocs/sebas/onderzoekEthiek/formulier.md
index 39c2e88..592df66 100644
--- a/docs/personalDocs/sebas/onderzoekEthiek/formulier.md
+++ b/docs/personalDocs/sebas/onderzoekEthiek/formulier.md
@@ -13,7 +13,7 @@ Betoog op basis van literatuuronderzoek van minimaal 1000 tot maximaal 1500 woor
 
 Waar gaat je betoog over?
 
-Het helpen van ouderen met fitness door middel van robots.
+Hoe ethisch verantwoord is het om robots in te zetten in de ouderenzorg om ouderen te helpen met fitness?
 
 **B. AANLEIDING** – De aanleiding en/of context van het thema/vraagstuk is:
 
@@ -43,7 +43,7 @@ Waar liggen de grenzen van de inzet van robots in de zorg voor ouderen wat fitne
 
 Welke vraag ga je beantwoorden in je betoog?
 
-In hoeverre kunnen robots worden ingezet om ouderen te helpen met fitness?
+In hoeverre is het etisch verantwoord om robots in te zetten in de ouderenzorg om ouderen te helpen met fitness?
 
 **H. BEGRIPSOMSCHRIJVING** – De volgende begrippen uit mijn vraagstelling definieer ik als: