From 0482c2b38693693c4b88d05971e10726b6650d1a Mon Sep 17 00:00:00 2001 From: SebasKoedam Date: Wed, 24 Apr 2024 12:35:32 +0200 Subject: [PATCH] Add deploymentTargetDropDown.xml file for Fitbot project --- .../Fitbot/.idea/deploymentTargetDropDown.xml | 17 +++++++++++++++++ code/src/Fitbot/.idea/misc.xml | 2 ++ .../java/com/example/fitbot/MainActivity.java | 12 ++++++++++-- .../main/res/layout/activity_main_screen.xml | 4 ++-- docs/personalDocs/sebas/dailyUpdates.md | 7 +++++-- 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 code/src/Fitbot/.idea/deploymentTargetDropDown.xml diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..24e256e --- /dev/null +++ b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index 0a1d973..dd81bb1 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -6,7 +6,9 @@ + + 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 b9aa01a..16f9f66 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 @@ -6,8 +6,10 @@ import android.os.Bundle; import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.QiSDK; 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.Say; public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks { @@ -28,12 +30,18 @@ public class MainActivity extends RobotActivity implements RobotLifecycleCallbac @Override public void onRobotFocusGained(QiContext qiContext) { - // The robot focus is gained. + // 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. + + // Execute the action. + say.run(); } @Override public void onRobotFocusLost() { - // The robot focus is lost. + // Nothing here. } @Override diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml index a9df308..fa77aa1 100644 --- a/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml +++ b/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/docs/personalDocs/sebas/dailyUpdates.md b/docs/personalDocs/sebas/dailyUpdates.md index 5b69716..e33b2f0 100644 --- a/docs/personalDocs/sebas/dailyUpdates.md +++ b/docs/personalDocs/sebas/dailyUpdates.md @@ -91,16 +91,19 @@ To do - Finish issues for sprint 1 - Start app design - Possibly prepare expert review + - Setup android studio for pepper Done - - + - Finish issues for sprint 1 + - Setup android studio for pepper **24 April** To do - - + - Start app design + - Start working on pepper Done