Update project files and remove unused files

code/Fitbot/.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

code/Fitbot/.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

code/Fitbot/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>

code/src/.idea/.name

@@ -1 +0,0 @@
-Fitbot

code/src/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

code/src/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

code/src/Fitbot/.idea/misc.xml

@@ -3,8 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Users/samho/muupooviixee66/src/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1165" />
-        <entry key="..\:/Users/samho/muupooviixee66/src/app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.1" />
       </map>
     </option>
   </component>

code/src/Fitbot/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
   </component>
 </project>

code/src/Fitbot/app/build.gradle

@@ -1,16 +1,18 @@
 plugins {
-    id 'com.android.library'
+    id 'com.android.application'
 }
 
 android {
-    compileSdk 34
+    compileSdk 29
 
     defaultConfig {
-        minSdk 21
-        targetSdk 34
+        applicationId "com.example.fitbot"
+        minSdk 23
+        targetSdk 29
+        versionCode 1
+        versionName "1.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
@@ -23,12 +25,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    buildToolsVersion '29.0.3'
 }
 
 dependencies {
 
     implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+	implementation 'com.aldebaran:qisdk:1.7.5'
+	implementation 'com.aldebaran:qisdk-design:1.7.5'
 }

code/src/Fitbot/app/src/androidTest/java/com/example/fitbot/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.fitbot;
+package com.example.fitbot;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -20,6 +20,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.fitbot.test", appContext.getPackageName());
+        assertEquals("com.example.fitbot", appContext.getPackageName());
     }
 }

code/src/Fitbot/app/src/main/AndroidManifest.xml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.fitbot">
+    package="com.example.fitbot">
 
     <application
         android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Fitbot">
-
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
+
     <uses-feature android:name="com.softbank.hardware.pepper"/>
 </manifest>

code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java

@@ -1,9 +1,15 @@
-package com.fitbot;
+package com.example.fitbot;
 
-import android.app.Activity;
-import android.media.MediaRecorder;
+import android.support.v7.app.AppCompatActivity;
 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.design.activity.RobotActivity;
+import com.aldebaran.qi.sdk.design.activity.conversationstatus.SpeechBarDisplayStrategy;
+
+
 public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks {
 
     @Override

code/src/Fitbot/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</android.support.constraint.ConstraintLayout>

code/src/Fitbot/app/src/main/res/values-night/themes.xml

@@ -0,0 +1,10 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Fitbot" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryDark">@color/purple_700</item>
+        <item name="colorAccent">@color/teal_200</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>

code/src/Fitbot/app/src/main/res/values/themes.xml

@@ -0,0 +1,10 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Fitbot" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryDark">@color/purple_700</item>
+        <item name="colorAccent">@color/teal_200</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>

code/src/Fitbot/app/src/test/java/com/example/fitbot/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.fitbot;
+package com.example.fitbot;
 
 import org.junit.Test;
 

code/src/Fitbot/gradle.properties

@@ -11,11 +11,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+#android.enableJetifier=true

code/src/Fitbot/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Apr 17 15:07:29 CEST 2024
+#Tue Apr 23 13:41:17 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists

code/src/Fitbot/settings.gradle

@@ -10,6 +10,9 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url 'https://qisdk.softbankrobotics.com/sdk/maven/'
+        }
     }
 }
 rootProject.name = "Fitbot"

code/src/app/build.gradle

@@ -1,39 +0,0 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    compileSdk 34
-
-    defaultConfig {
-        applicationId "com.fitbot.fitbot"
-        minSdk 23
-        targetSdk 34
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-        implementation 'com.aldebaran:qisdk:1.7.5'
-        implementation 'com.aldebaran:qisdk-design:1.7.5'
-}

code/src/app/src/androidTest/java/com/fitbot/fitbot/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.fitbot.fitbot;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.fitbot.fitbot", appContext.getPackageName());
-    }
-}

code/src/app/src/main/assets/robot/robotsdk.xml

@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<robot>
-<users-robotsdk minSdkVersion='API 7' />
-</robot>

code/src/app/src/main/java/com/fitbot/Fitbot.java

@@ -1,14 +0,0 @@
-package com.fitbot;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class Fitbot extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_fitbot);
-    }
-}

code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java

@@ -1,10 +0,0 @@
-package com.fitbot.audio;
-
-import android.app.Activity;
-import android.media.MediaRecorder;
-
-public class AudioAnalyser {
-
-
-
-}

code/src/app/src/main/java/com/fitbot/audio/AudioRecorder.java

@@ -1,47 +0,0 @@
-package com.fitbot.audio;
-
-import android.media.MediaRecorder;
-
-public class AudioRecorder {
-
-    private MediaRecorder recorder;
-
-
-    public AudioRecorder() {
-    }
-
-    /**
-     * Record audio from the device's microphone
-     * @return An instance of the AudioRecorder class
-     */
-    public AudioRecorder record() {
-
-        recorder = new MediaRecorder();
-
-        recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
-        recorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
-        recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-
-        // Attempt to prepare and start the audio recorder
-        try {
-            recorder.prepare();
-            recorder.start();
-        } catch (Exception e) {
-            System.err.println("Error preparing audio recorder");
-            e.printStackTrace();
-        }
-
-        return this;
-    }
-
-    /**
-     * Stop the audio recording
-     */
-    public void stop() {
-        recorder.stop();
-        recorder.release();
-        recorder = null;
-    }
-
-
-}

code/src/app/src/main/java/com/fitbot/speech/ISpeechCallback.java

@@ -1,8 +0,0 @@
-package com.fitbot.speech;
-
-/**
- * Interface for a callback that is called when speech is generated
- */
-public interface ISpeechCallback {
-    void onSpeechGenerated(String speech);
-}

code/src/app/src/main/java/com/fitbot/speech/SpeechGenerator.java

@@ -1,101 +0,0 @@
-package com.fitbot.speech;
-
-import java.util.Arrays;
-import java.util.Locale;
-import com.aldebaran.qi.sdk.builder.SayBuilder;
-import com.aldebaran.qi.sdk.object.conversation.Phrase;
-import com.aldebaran.qi.sdk.object.conversation.Say;
-import com.aldebaran.qi.sdk.object.locale.Language;
-import com.aldebaran.qi.sdk.object.locale.Locale;
-import com.aldebaran.qi.sdk.object.locale.Region;
-
-
-public class SpeechGenerator  {
-
-    private QiContext qiContext;                              // The QiContext object
-    private ISpeechCallback speechCallback = (content) -> {}; // Default empty callback
-    private StringBuilder speechBuffer = new StringBuilder(); // Buffer to store the speech content
-    private String languageIso639_1;                          // ISO 639-1 language code
-
-    /**
-     * Constructor that sets the language of the speech to be generated
-     * @param languageIso639_1 The ISO 639-1 language code, e.g. "en" for English
-     */
-    public SpeechGenerator(String languageIso639_1)
-    {
-        if ( !Arrays.asList(Locale.getISOLanguages()).contains(languageIso639_1) )
-            throw new IllegalArgumentException("Invalid language code");
-        this.languageIso639_1 = languageIso639_1;
-    }
-
-    /**
-     * Default constructor, sets the language to Dutch
-     */
-    public SpeechGenerator()
-    {
-        this("nl");
-    }
-
-
-    /**
-     * Set the language of the speech to be generated
-     * @param languageIso639_1 The ISO 639-1 language code, e.g. "en" for English
-     * @return An instance of the SpeechGenerator class
-     */
-    public SpeechGenerator language(String languageIso639_1)
-    {
-        this.languageIso639_1 = languageIso639_1;
-        return this;
-    }
-
-    /**
-     * Appends the provided text to the speech buffer
-     * @param text The text to append
-     * @return An instance of the SpeechGenerator class
-     */
-    public SpeechGenerator print(String text)
-    {
-        speechBuffer.append(text);
-        return this;
-    }
-
-    /**
-     * Appends the provided text to the speech buffer, followed by a newline character
-     * @param text The text to append
-     * @return An instance of the SpeechGenerator class
-     */
-    public SpeechGenerator println(String text)
-    {
-        return print(text).print("\n");
-    }
-
-    /**
-     * Get the contents of the speech buffer
-     */
-    public String getBuffer()
-    {
-        return speechBuffer.toString();
-    }
-
-    /**
-     * Clear the contents of the speech buffer
-     */
-    public void clearBuffer()
-    {
-        speechBuffer = new StringBuilder();
-    }
-
-    /**
-     * Print the contents of the speech buffer to the console
-     */
-    public void speak()
-    {
-        Say say = new SayBuilder().with(qiContext)
-                .withPhrase(speechBuffer.toString())
-                .withLocale(new Locale(languageIso639_1))
-                .build();
-        speechCallback.onSpeechGenerated(speechBuffer.toString());
-    }
-
-
-}

code/src/app/src/main/res/layout/activity_fitbot.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".Fitbot">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

code/src/app/src/main/res/layout/testlayout.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/testText"
-        android:layout_width="200dp"
-        android:layout_height="100dp"
-        android:text="awa"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.465" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="20dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>

code/src/app/src/main/res/values-night/themes.xml

@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Fitbot" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>

code/src/app/src/main/res/values/themes.xml

@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Fitbot" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>

code/src/app/src/test/java/com/fitbot/fitbot/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.fitbot.fitbot;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}

docs/personalDocs/sebas/dailyUpdates.md

@@ -79,13 +79,18 @@ To do
 
 Done
 
-  - 
+  - Research ethics in the ICT field
+  - Fill in form for ethics research
+  - Finish the research for task 1
+  - Install new software for pepper (discord)
 
 **23 April**
 
 To do
 
-  - 
+  - Finish issues for sprint 1 
+  - Start app design
+  - Possibly prepare expert review
 
 Done
 

fitbot/.gitignore

@@ -1 +0,0 @@
-/build

fitbot/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

fitbot/src/main/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.fitbot">
-
-</manifest>