From ead909c457c6b735d307e0f09092e736badc2202 Mon Sep 17 00:00:00 2001
From: Luca Warmenhoven <luca.warmenhoven@hva.nl>
Date: Fri, 19 Apr 2024 14:47:27 +0200
Subject: [PATCH] Moved files to appropriate directory.

---
 .idea/workspace.xml                           | 38 +++++++++++++++----
 .../main/java}/com/fitbot/MainActivity.java   |  0
 .../java}/com/fitbot/audio/AudioAnalyser.java |  2 +-
 .../java}/com/fitbot/audio/AudioRecorder.java |  0
 .../java/com/fitbot/fitbot/MainActivity.java  | 13 -------
 .../java/com/fitbot/fitbot/TextSetter.java    | 18 ---------
 .../com/fitbot/speech/ISpeechCallback.java    |  0
 .../com/fitbot/speech/SpeechGenerator.java    |  0
 8 files changed, 32 insertions(+), 39 deletions(-)
 rename {src/app/src/main => code/src/app/src/main/java}/com/fitbot/MainActivity.java (100%)
 rename {src/app/src/main => code/src/app/src/main/java}/com/fitbot/audio/AudioAnalyser.java (68%)
 rename {src/app/src/main => code/src/app/src/main/java}/com/fitbot/audio/AudioRecorder.java (100%)
 delete mode 100644 code/src/app/src/main/java/com/fitbot/fitbot/MainActivity.java
 delete mode 100644 code/src/app/src/main/java/com/fitbot/fitbot/TextSetter.java
 rename {src/app/src/main => code/src/app/src/main/java}/com/fitbot/speech/ISpeechCallback.java (100%)
 rename {src/app/src/main => code/src/app/src/main/java}/com/fitbot/speech/SpeechGenerator.java (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2a06124..5eb459e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,11 +14,15 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="00599d5b-7eb5-44da-ad7f-98bf42384c16" name="Changes" comment="Changes">
-      <change afterPath="$PROJECT_DIR$/src/app/src/main/com/fitbot/chat/ISpeechCallback.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/app/src/main/com/fitbot/chat/SpeechGenerator.java" afterDir="false" />
+    <list default="true" id="00599d5b-7eb5-44da-ad7f-98bf42384c16" name="Changes" comment="Added audio recorder files and speech callbacks">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/app/src/main/com/fitbot/audio/AudioRecorder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/com/fitbot/audio/AudioRecorder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/code/src/app/src/main/java/com/fitbot/fitbot/MainActivity.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/code/src/app/src/main/java/com/fitbot/fitbot/TextSetter.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/src/main/com/fitbot/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/app/src/main/java/com/fitbot/MainActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/src/main/com/fitbot/audio/AudioAnalyser.java" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/src/main/com/fitbot/audio/AudioRecorder.java" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/app/src/main/java/com/fitbot/audio/AudioRecorder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/src/main/com/fitbot/speech/ISpeechCallback.java" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/app/src/main/java/com/fitbot/speech/ISpeechCallback.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/src/main/com/fitbot/speech/SpeechGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/code/src/app/src/main/java/com/fitbot/speech/SpeechGenerator.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,11 +32,23 @@
   <component name="ClangdSettings">
     <option name="formatViaClangd" value="false" />
   </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand />
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Interface" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -87,7 +103,14 @@
       <option name="project" value="LOCAL" />
       <updated>1713528225837</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Added audio recorder files and speech callbacks">
+      <created>1713529491491</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1713529491491</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -107,6 +130,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Changes" />
-    <option name="LAST_COMMIT_MESSAGE" value="Changes" />
+    <MESSAGE value="Added audio recorder files and speech callbacks" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added audio recorder files and speech callbacks" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/app/src/main/com/fitbot/MainActivity.java b/code/src/app/src/main/java/com/fitbot/MainActivity.java
similarity index 100%
rename from src/app/src/main/com/fitbot/MainActivity.java
rename to code/src/app/src/main/java/com/fitbot/MainActivity.java
diff --git a/src/app/src/main/com/fitbot/audio/AudioAnalyser.java b/code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java
similarity index 68%
rename from src/app/src/main/com/fitbot/audio/AudioAnalyser.java
rename to code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java
index 3d64c3f..9417c30 100644
--- a/src/app/src/main/com/fitbot/audio/AudioAnalyser.java
+++ b/code/src/app/src/main/java/com/fitbot/audio/AudioAnalyser.java
@@ -3,7 +3,7 @@ package com.fitbot.audio;
 import android.app.Activity;
 import android.media.MediaRecorder;
 
-public class AudioAnalyser extends Activity {
+public class AudioAnalyser {
 
 
 
diff --git a/src/app/src/main/com/fitbot/audio/AudioRecorder.java b/code/src/app/src/main/java/com/fitbot/audio/AudioRecorder.java
similarity index 100%
rename from src/app/src/main/com/fitbot/audio/AudioRecorder.java
rename to code/src/app/src/main/java/com/fitbot/audio/AudioRecorder.java
diff --git a/code/src/app/src/main/java/com/fitbot/fitbot/MainActivity.java b/code/src/app/src/main/java/com/fitbot/fitbot/MainActivity.java
deleted file mode 100644
index fcce487..0000000
--- a/code/src/app/src/main/java/com/fitbot/fitbot/MainActivity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.fitbot.fitbot;
-
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-
-public class MainActivity extends AppCompatActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.testlayout); // replace with your layout file
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/app/src/main/java/com/fitbot/fitbot/TextSetter.java b/code/src/app/src/main/java/com/fitbot/fitbot/TextSetter.java
deleted file mode 100644
index 7bb7f93..0000000
--- a/code/src/app/src/main/java/com/fitbot/fitbot/TextSetter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.fitbot.fitbot;
-
-import android.app.Activity;
-import android.widget.TextView;
-
-public class TextSetter {
-    public static void setCustomText(Activity activity, int textViewId, String text) {
-        TextView textView = (TextView) activity.findViewById(textViewId);
-        textView.setText(text);
-    }
-}
-
-// usage:
-//  TextSetter.setCustomText(this, R.id.testText, "Bruh");
-// r.id.testText is the id of the textview in the layout file
-// "Bruh" is the text to be set
-
-// make sure you have the right layout set in MainActivity.java with the setContentView method
\ No newline at end of file
diff --git a/src/app/src/main/com/fitbot/speech/ISpeechCallback.java b/code/src/app/src/main/java/com/fitbot/speech/ISpeechCallback.java
similarity index 100%
rename from src/app/src/main/com/fitbot/speech/ISpeechCallback.java
rename to code/src/app/src/main/java/com/fitbot/speech/ISpeechCallback.java
diff --git a/src/app/src/main/com/fitbot/speech/SpeechGenerator.java b/code/src/app/src/main/java/com/fitbot/speech/SpeechGenerator.java
similarity index 100%
rename from src/app/src/main/com/fitbot/speech/SpeechGenerator.java
rename to code/src/app/src/main/java/com/fitbot/speech/SpeechGenerator.java