diff --git a/code/Fitbot/.idea/gradle.xml b/code/Fitbot/.idea/gradle.xml deleted file mode 100644 index 4e3844e..0000000 --- a/code/Fitbot/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/code/Fitbot/.idea/misc.xml b/code/Fitbot/.idea/misc.xml deleted file mode 100644 index 6199cc2..0000000 --- a/code/Fitbot/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/code/Fitbot/.idea/vcs.xml b/code/Fitbot/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/code/Fitbot/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/code/src/.idea/.name b/code/src/.idea/.name deleted file mode 100644 index 9a7766c..0000000 --- a/code/src/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Fitbot \ No newline at end of file diff --git a/code/src/.idea/compiler.xml b/code/src/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/code/src/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/code/src/.idea/encodings.xml b/code/src/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/code/src/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/code/src/.gitignore b/code/src/Fitbot/.gitignore similarity index 100% rename from code/src/.gitignore rename to code/src/Fitbot/.gitignore diff --git a/code/Fitbot/.idea/.gitignore b/code/src/Fitbot/.idea/.gitignore similarity index 100% rename from code/Fitbot/.idea/.gitignore rename to code/src/Fitbot/.idea/.gitignore diff --git a/code/Fitbot/.idea/compiler.xml b/code/src/Fitbot/.idea/compiler.xml similarity index 100% rename from code/Fitbot/.idea/compiler.xml rename to code/src/Fitbot/.idea/compiler.xml diff --git a/code/src/.idea/gradle.xml b/code/src/Fitbot/.idea/gradle.xml similarity index 100% rename from code/src/.idea/gradle.xml rename to code/src/Fitbot/.idea/gradle.xml diff --git a/code/src/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml similarity index 67% rename from code/src/.idea/misc.xml rename to code/src/Fitbot/.idea/misc.xml index b691e65..ad50441 100644 --- a/code/src/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -3,8 +3,7 @@ diff --git a/code/src/.idea/vcs.xml b/code/src/Fitbot/.idea/vcs.xml similarity index 67% rename from code/src/.idea/vcs.xml rename to code/src/Fitbot/.idea/vcs.xml index b2bdec2..c2365ab 100644 --- a/code/src/.idea/vcs.xml +++ b/code/src/Fitbot/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/code/src/app/.gitignore b/code/src/Fitbot/app/.gitignore similarity index 100% rename from code/src/app/.gitignore rename to code/src/Fitbot/app/.gitignore diff --git a/fitbot/build.gradle b/code/src/Fitbot/app/build.gradle similarity index 65% rename from fitbot/build.gradle rename to code/src/Fitbot/app/build.gradle index d2bf7a6..f20fecb 100644 --- a/fitbot/build.gradle +++ b/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' } \ No newline at end of file diff --git a/code/src/app/proguard-rules.pro b/code/src/Fitbot/app/proguard-rules.pro similarity index 100% rename from code/src/app/proguard-rules.pro rename to code/src/Fitbot/app/proguard-rules.pro diff --git a/fitbot/src/androidTest/java/com/fitbot/ExampleInstrumentedTest.java b/code/src/Fitbot/app/src/androidTest/java/com/example/fitbot/ExampleInstrumentedTest.java similarity index 86% rename from fitbot/src/androidTest/java/com/fitbot/ExampleInstrumentedTest.java rename to code/src/Fitbot/app/src/androidTest/java/com/example/fitbot/ExampleInstrumentedTest.java index ed5b5a2..ca533dc 100644 --- a/fitbot/src/androidTest/java/com/fitbot/ExampleInstrumentedTest.java +++ b/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()); } } \ No newline at end of file diff --git a/code/src/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml similarity index 81% rename from code/src/app/src/main/AndroidManifest.xml rename to code/src/Fitbot/app/src/main/AndroidManifest.xml index 53e6ae7..3891652 100644 --- a/code/src/app/src/main/AndroidManifest.xml +++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml @@ -1,21 +1,24 @@ + package="com.example.fitbot"> - - - - + + + + \ No newline at end of file diff --git a/code/src/app/src/main/java/com/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java similarity index 70% rename from code/src/app/src/main/java/com/fitbot/MainActivity.java rename to code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java index 5a784ff..b9aa01a 100644 --- a/code/src/app/src/main/java/com/fitbot/MainActivity.java +++ b/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 diff --git a/code/src/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/code/src/Fitbot/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from code/src/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to code/src/Fitbot/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/code/src/app/src/main/res/drawable/ic_launcher_background.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from code/src/app/src/main/res/drawable/ic_launcher_background.xml rename to code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..84f1951 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/code/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/code/src/Fitbot/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from code/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to code/src/Fitbot/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/code/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/code/src/Fitbot/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from code/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to code/src/Fitbot/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/code/src/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/code/src/Fitbot/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to code/src/Fitbot/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/code/src/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/code/src/Fitbot/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to code/src/Fitbot/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/code/src/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/code/src/Fitbot/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to code/src/Fitbot/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/code/src/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/code/src/Fitbot/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to code/src/Fitbot/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/code/src/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/code/src/Fitbot/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to code/src/Fitbot/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/code/src/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/code/src/Fitbot/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to code/src/Fitbot/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/code/src/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/code/src/Fitbot/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to code/src/Fitbot/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/code/src/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/code/src/Fitbot/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to code/src/Fitbot/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/code/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/code/src/Fitbot/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to code/src/Fitbot/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/code/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/code/src/Fitbot/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from code/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to code/src/Fitbot/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/code/src/Fitbot/app/src/main/res/values-night/themes.xml b/code/src/Fitbot/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..70f3941 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/values-night/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/code/src/app/src/main/res/values/colors.xml b/code/src/Fitbot/app/src/main/res/values/colors.xml similarity index 100% rename from code/src/app/src/main/res/values/colors.xml rename to code/src/Fitbot/app/src/main/res/values/colors.xml diff --git a/code/src/app/src/main/res/values/strings.xml b/code/src/Fitbot/app/src/main/res/values/strings.xml similarity index 100% rename from code/src/app/src/main/res/values/strings.xml rename to code/src/Fitbot/app/src/main/res/values/strings.xml diff --git a/code/src/Fitbot/app/src/main/res/values/themes.xml b/code/src/Fitbot/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..607b278 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/values/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/fitbot/src/test/java/com/fitbot/ExampleUnitTest.java b/code/src/Fitbot/app/src/test/java/com/example/fitbot/ExampleUnitTest.java similarity index 92% rename from fitbot/src/test/java/com/fitbot/ExampleUnitTest.java rename to code/src/Fitbot/app/src/test/java/com/example/fitbot/ExampleUnitTest.java index cd999cb..553c194 100644 --- a/fitbot/src/test/java/com/fitbot/ExampleUnitTest.java +++ b/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; diff --git a/code/src/build.gradle b/code/src/Fitbot/build.gradle similarity index 100% rename from code/src/build.gradle rename to code/src/Fitbot/build.gradle diff --git a/code/src/gradle.properties b/code/src/Fitbot/gradle.properties similarity index 77% rename from code/src/gradle.properties rename to code/src/Fitbot/gradle.properties index dab7c28..c5abf2b 100644 --- a/code/src/gradle.properties +++ b/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 \ No newline at end of file +android.nonTransitiveRClass=true +#android.enableJetifier=true \ No newline at end of file diff --git a/code/src/gradle/wrapper/gradle-wrapper.jar b/code/src/Fitbot/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from code/src/gradle/wrapper/gradle-wrapper.jar rename to code/src/Fitbot/gradle/wrapper/gradle-wrapper.jar diff --git a/code/src/gradle/wrapper/gradle-wrapper.properties b/code/src/Fitbot/gradle/wrapper/gradle-wrapper.properties similarity index 86% rename from code/src/gradle/wrapper/gradle-wrapper.properties rename to code/src/Fitbot/gradle/wrapper/gradle-wrapper.properties index a7aee0a..0066017 100644 --- a/code/src/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/code/src/gradlew b/code/src/Fitbot/gradlew similarity index 100% rename from code/src/gradlew rename to code/src/Fitbot/gradlew diff --git a/code/src/gradlew.bat b/code/src/Fitbot/gradlew.bat similarity index 100% rename from code/src/gradlew.bat rename to code/src/Fitbot/gradlew.bat diff --git a/code/src/settings.gradle b/code/src/Fitbot/settings.gradle similarity index 78% rename from code/src/settings.gradle rename to code/src/Fitbot/settings.gradle index ea83dc3..ffde70b 100644 --- a/code/src/settings.gradle +++ b/code/src/Fitbot/settings.gradle @@ -10,6 +10,9 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { + url 'https://qisdk.softbankrobotics.com/sdk/maven/' + } } } rootProject.name = "Fitbot" diff --git a/code/src/app/build.gradle b/code/src/app/build.gradle deleted file mode 100644 index 13caaa3..0000000 --- a/code/src/app/build.gradle +++ /dev/null @@ -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' -} \ No newline at end of file diff --git a/code/src/app/src/androidTest/java/com/fitbot/fitbot/ExampleInstrumentedTest.java b/code/src/app/src/androidTest/java/com/fitbot/fitbot/ExampleInstrumentedTest.java deleted file mode 100644 index d02ca19..0000000 --- a/code/src/app/src/androidTest/java/com/fitbot/fitbot/ExampleInstrumentedTest.java +++ /dev/null @@ -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 Testing documentation - */ -@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()); - } -} \ No newline at end of file diff --git a/code/src/app/src/main/assets/robot/robotsdk.xml b/code/src/app/src/main/assets/robot/robotsdk.xml deleted file mode 100644 index eb58018..0000000 --- a/code/src/app/src/main/assets/robot/robotsdk.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/code/src/app/src/main/java/com/fitbot/Fitbot.java b/code/src/app/src/main/java/com/fitbot/Fitbot.java deleted file mode 100644 index 2b04a33..0000000 --- a/code/src/app/src/main/java/com/fitbot/Fitbot.java +++ /dev/null @@ -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); - } -} \ No newline at end of file diff --git a/code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java b/code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java deleted file mode 100644 index 9417c30..0000000 --- a/code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.fitbot.audio; - -import android.app.Activity; -import android.media.MediaRecorder; - -public class AudioAnalyser { - - - -} diff --git a/code/src/app/src/main/java/com/fitbot/audio/AudioRecorder.java b/code/src/app/src/main/java/com/fitbot/audio/AudioRecorder.java deleted file mode 100644 index e2f84c3..0000000 --- a/code/src/app/src/main/java/com/fitbot/audio/AudioRecorder.java +++ /dev/null @@ -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; - } - - -} diff --git a/code/src/app/src/main/java/com/fitbot/speech/ISpeechCallback.java b/code/src/app/src/main/java/com/fitbot/speech/ISpeechCallback.java deleted file mode 100644 index 48ccdf9..0000000 --- a/code/src/app/src/main/java/com/fitbot/speech/ISpeechCallback.java +++ /dev/null @@ -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); -} diff --git a/code/src/app/src/main/java/com/fitbot/speech/SpeechGenerator.java b/code/src/app/src/main/java/com/fitbot/speech/SpeechGenerator.java deleted file mode 100644 index 93e1d19..0000000 --- a/code/src/app/src/main/java/com/fitbot/speech/SpeechGenerator.java +++ /dev/null @@ -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()); - } - - -} diff --git a/code/src/app/src/main/res/layout/activity_fitbot.xml b/code/src/app/src/main/res/layout/activity_fitbot.xml deleted file mode 100644 index 3abe97f..0000000 --- a/code/src/app/src/main/res/layout/activity_fitbot.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/code/src/app/src/main/res/layout/testlayout.xml b/code/src/app/src/main/res/layout/testlayout.xml deleted file mode 100644 index 58611e6..0000000 --- a/code/src/app/src/main/res/layout/testlayout.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/code/src/app/src/main/res/values-night/themes.xml b/code/src/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 61aadf0..0000000 --- a/code/src/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/code/src/app/src/main/res/values/themes.xml b/code/src/app/src/main/res/values/themes.xml deleted file mode 100644 index b1f23f5..0000000 --- a/code/src/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/code/src/app/src/test/java/com/fitbot/fitbot/ExampleUnitTest.java b/code/src/app/src/test/java/com/fitbot/fitbot/ExampleUnitTest.java deleted file mode 100644 index 472067b..0000000 --- a/code/src/app/src/test/java/com/fitbot/fitbot/ExampleUnitTest.java +++ /dev/null @@ -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 Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/docs/personalDocs/sebas/dailyUpdates.md b/docs/personalDocs/sebas/dailyUpdates.md index ce60e8e..5b69716 100644 --- a/docs/personalDocs/sebas/dailyUpdates.md +++ b/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 diff --git a/fitbot/.gitignore b/fitbot/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/fitbot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/fitbot/consumer-rules.pro b/fitbot/consumer-rules.pro deleted file mode 100644 index e69de29..0000000 diff --git a/fitbot/proguard-rules.pro b/fitbot/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/fitbot/proguard-rules.pro +++ /dev/null @@ -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 \ No newline at end of file diff --git a/fitbot/src/main/AndroidManifest.xml b/fitbot/src/main/AndroidManifest.xml deleted file mode 100644 index 2f68f1c..0000000 --- a/fitbot/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file