diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4020532..25b05d8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -14,10 +14,9 @@ - - + - + @@ -424,6 +443,8 @@ - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index c5f3f6b..0e14d8e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "disabled" } \ No newline at end of file diff --git a/code/arduino/Movement-sensor-code/Connectivity.cpp b/code/arduino/Movement-sensor-code/Connectivity.cpp index 6e96ca3..d4c5837 100644 --- a/code/arduino/Movement-sensor-code/Connectivity.cpp +++ b/code/arduino/Movement-sensor-code/Connectivity.cpp @@ -8,23 +8,56 @@ void Connectivity::connectWiFi(char* ssid, char* pass){ } } -void Connectivity::websocketSetup(char* ip, uint16_t port, char* adress){ - //ws server address, port and URL - webSocket.begin(ip , port, adress); - // try every 500 again if connection has failed - webSocket.setReconnectInterval(500); -} +// void Connectivity::websocketSetup(char* ip, uint16_t port, char* adress){ +// //ws server address, port and URL +// webSocket.begin(ip , port, adress); +// // try every 500 again if connection has failed +// webSocket.setReconnectInterval(500); +// } -void Connectivity::sendData(float roll, float pitch, float yaw){ - String message = "{\"Sensor\": 1, \"roll\":\"" + String(roll) + "\",\"pitch\":\"" + String(pitch) + "\",\"yaw\":\"" + String(yaw) + "\"}"; - webSocket.sendTXT(message); +// void Connectivity::sendData(float roll, float pitch, float yaw){ +// String message = "{\"Sensor\": 1, \"roll\":\"" + String(roll) + "\",\"pitch\":\"" + String(pitch) + "\",\"yaw\":\"" + String(yaw) + "\"}"; +// webSocket.sendTXT(message); +// } + +const char* getServerURL = "http://145.92.8.132:443/get-ip"; +String ipAddress = ""; // string that will hold the server's IP address + +/** Fetch the IP address of pepper from the server */ +const char* Connectivity::fetchIPAddress() { + char* ipAddress = NULL; // Declare ipAddress as a char* + if (WiFi.status() == WL_CONNECTED) { + HTTPClient http; + WiFiClient client; + http.begin(client, getServerURL); + + int httpCode = http.GET(); + if (httpCode > 0) { + if (httpCode == HTTP_CODE_OK) { + // If successful (code 200), read the response body and parse the IP address + String response = http.getString(); + StaticJsonDocument<200> doc; + deserializeJson(doc, response); + const char* ip = doc["ip"]; // Extract the IP address + ipAddress = strdup(ip); + } + } else { + Serial.printf("GET request failed, error: %s\n", http.errorToString(httpCode).c_str()); + } + + http.end(); + } else { + Serial.println("WiFi not connected"); + } + return ipAddress; } /** Send a POST request to a server with provided data */ int Connectivity::httpPost(const char *serverAddress, const char *serverSubPath, const unsigned short serverPort, const char *data, const size_t dataLength, const char *contentType) { - if ( wifi_client.connect(serverAddress, serverPort)) { + WiFiClient wifi_client; // Ensure WiFiClient is declared and initialized + if (wifi_client.connect(serverAddress, serverPort)) { wifi_client.printf("POST %s HTTP/1.1\r\n", serverSubPath); wifi_client.printf("Content-Type: %s\r\n", contentType); wifi_client.printf("Content-Length: %d\r\n", dataLength); @@ -35,4 +68,4 @@ int Connectivity::httpPost(const char *serverAddress, const char *serverSubPath, } return 1; -} \ No newline at end of file +} diff --git a/code/arduino/Movement-sensor-code/Connectivity.h b/code/arduino/Movement-sensor-code/Connectivity.h index 90742aa..ae711e7 100644 --- a/code/arduino/Movement-sensor-code/Connectivity.h +++ b/code/arduino/Movement-sensor-code/Connectivity.h @@ -1,30 +1,33 @@ -#ifndef Connectivity_h -#define Connectivity_h +#ifndef MOVEMENTSENSORCODE_CONNECTIVITY_h +#define MOVEMENTSENSORCODE_CONNECTIVITY_h #include "Arduino.h" #include #include #include +#include #include #include #include #include #include +#include -class Connectivity { +// declare the class Connectivity with all functions +class Connectivity { public: void connectWiFi(char* ssid, char* pass); void websocketSetup(char* ip, uint16_t port, char* adress); void sendData(float roll, float pitch, float yaw); int httpPost(const char *serverAddress, const char *serverSubPath, const unsigned short serverPort, const char *data, const size_t dataLength, const char *contentType); - + const char* fetchIPAddress(); private: ESP8266WiFiMulti wifi; WiFiClient wifi_client; - WebSocketsClient webSocket; + // WebSocketsClient webSocket; }; -#endif \ No newline at end of file +#endif // MOVEMENTSENSORCODE_CONNECTIVITY_h \ No newline at end of file diff --git a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino index 3bb3e92..4b57532 100644 --- a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino +++ b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino @@ -6,38 +6,42 @@ void setup() { sensorManager.sensorSetup(); } -unsigned long lastTime = 0; // will store the last time the code was run - void loop() { - SensorManager::eulerAngles eulerRotation = sensorManager.getEulerAngles(); - // SensorManager::acceleration rotationAcceleration = sensorManager.getAcelleration(); - + //get data from sensor + SensorManager::eulerAngles Rotation = sensorManager.getEulerAngles(); +//static structure +// TODO: redo json for esp8266 and in android studio struct acceleration { float x = 9; float y = 9; float z = 9; } accelData; + if (!ipAquired) { + serverIp = connectivity.fetchIPAddress(); //Fetch pepper ip address + ipAquired = true; + } + + unsigned long lastTime = 0; // will store the last time the code was run unsigned long currentTime = millis(); - if (currentTime - lastTime >= 100) { // 100 ms has passed + if (currentTime - lastTime >= 100) { // do everything inside every 100 ms memset(buffer, 0, BUFFER_SIZE); + //convert string to char* sprintf( buffer, "{\"deviceId\": %d, \"rotationX\": %f, \"rotationY\": %f, \"rotationZ\": %f, \"accelerationX\": %f, \"accelerationY\": %f, \"accelerationZ\": %f, \"type\": %s}", DEVICE_ID, - eulerRotation.roll, - eulerRotation.pitch, - eulerRotation.yaw, + Rotation.roll, + Rotation.pitch, + Rotation.yaw, accelData.x, accelData.y, accelData.z, "data"); // %d = int, %f = floatation, %s = string - connectivity.httpPost("192.168.137.243", "/", 3445, buffer, strlen(buffer), "application/json"); + //send data to pepper + connectivity.httpPost(serverIp, "/", 3445, buffer, strlen(buffer), "application/json"); lastTime = currentTime; } } -//acceleration.X -//acceleration.Y -//acceleration.Z diff --git a/code/arduino/Movement-sensor-code/SensorManager.cpp b/code/arduino/Movement-sensor-code/SensorManager.cpp index 7fee39d..ab2216f 100644 --- a/code/arduino/Movement-sensor-code/SensorManager.cpp +++ b/code/arduino/Movement-sensor-code/SensorManager.cpp @@ -17,14 +17,14 @@ void SensorManager::sensorSetup() { // myIMU.enableStepCounter(500); //Send data update every 500ms } //get sensordata -SensorManager::RotationQuintillions SensorManager::getQuintillions() { +SensorManager::RotationQuaternions SensorManager::getQuaternions() { if (myIMU.dataAvailable() == true) { float i = myIMU.getQuatI(); float j = myIMU.getQuatJ(); float k = myIMU.getQuatK(); float w = myIMU.getQuatReal(); - RotationQuintillions rotation = { i, j, k, w }; + RotationQuaternions rotation = { i, j, k, w }; return rotation; } else { float i = myIMU.getQuatI(); @@ -32,13 +32,13 @@ SensorManager::RotationQuintillions SensorManager::getQuintillions() { float k = myIMU.getQuatK(); float w = myIMU.getQuatReal(); - RotationQuintillions rotation = { i, j, k, w }; + RotationQuaternions rotation = { i, j, k, w }; return rotation; } } -//calculate Quintillions to Euler angles from -1π to +1π +//calculate Quaternions to Euler angles from -1π to +1π SensorManager::eulerAngles SensorManager::getEulerAngles() { - SensorManager::RotationQuintillions rotation = getQuintillions(); + SensorManager::RotationQuaternions rotation = getQuaternions(); float roll = atan2(2.0f * (rotation.w * rotation.i + rotation.j * rotation.k), 1.0f - 2.0f * (rotation.i * rotation.i + rotation.j * rotation.j)); float pitch = asin(2.0f * (rotation.w * rotation.j - rotation.k * rotation.i)); float yaw = atan2(2.0f * (rotation.w * rotation.k + rotation.i * rotation.j), 1.0f - 2.0f * (rotation.j * rotation.j + rotation.k * rotation.k)); diff --git a/code/arduino/Movement-sensor-code/SensorManager.h b/code/arduino/Movement-sensor-code/SensorManager.h index aaf4d71..41f800f 100644 --- a/code/arduino/Movement-sensor-code/SensorManager.h +++ b/code/arduino/Movement-sensor-code/SensorManager.h @@ -1,9 +1,10 @@ -#ifndef SensorManager_h -#define SensorManager_h +#ifndef MOVEMENTSENSORCODE_SENSORMANAGER_H +#define MOVEMENTSENSORCODE_SENSORMANAGER_H #include "Arduino.h" #include "SparkFun_BNO080_Arduino_Library.h" +// declare the class SensorManager with all functions class SensorManager { public: SensorManager(); @@ -18,19 +19,22 @@ public: float y; float z; }; - +// void sendData(float roll, float pitch, float yaw); eulerAngles getEulerAngles(); acceleration getAcelleration(); bool sensorTap(); + private: - struct RotationQuintillions { + + struct RotationQuaternions { float i; float j; float k; float w; }; - RotationQuintillions getQuintillions(); + RotationQuaternions getQuaternions(); // get the quaternions from the sensor + BNO080 myIMU; }; -#endif \ No newline at end of file +#endif // MOVEMENTSENSORCODE_SENSORMANAGER_H \ No newline at end of file diff --git a/code/arduino/Movement-sensor-code/headerFIle.h b/code/arduino/Movement-sensor-code/headerFIle.h index b065b3e..1c21dcb 100644 --- a/code/arduino/Movement-sensor-code/headerFIle.h +++ b/code/arduino/Movement-sensor-code/headerFIle.h @@ -11,5 +11,8 @@ WebSocketsClient webSocket; #define ssid "1235678i" #define pass "12345678" #define BUFFER_SIZE 1024 -#define DEVICE_ID 1 +#define DEVICE_ID 0 + char *buffer = (char *)malloc(sizeof(char) * BUFFER_SIZE); +const char* serverIp = NULL; // Declare serverIp here +bool ipAquired = false; \ No newline at end of file diff --git a/code/arduino/bluetoothEsp/bluetoothEsp.ino b/code/arduino/bluetoothEsp/bluetoothEsp.ino deleted file mode 100644 index 0e0eaaf..0000000 --- a/code/arduino/bluetoothEsp/bluetoothEsp.ino +++ /dev/null @@ -1,33 +0,0 @@ -#include -#include - -// Define the service UUID -#define SERVICE_UUID "4fafc201-1fb5-459e-8fcc-c5c9c331914b" - -// Define the characteristic UUID -#define CHARACTERISTIC_UUID "beb5483e-36e1-4688-b7f5-ea07361b26a8" - -void setup() { - // Create a BLE server - BLEServer *pServer = BLEDevice::createServer(); - - // Create a BLE service - BLEService *pService = pServer->createService(SERVICE_UUID); - - // Create a BLE characteristic - BLECharacteristic *pCharacteristic = pService->createCharacteristic( - CHARACTERISTIC_UUID, BLECharacteristic::PROPERTY_READ); - - // Set the characteristic value - pCharacteristic->setValue("Hello, Bluetooth!"); - - // Start the service - pService->start(); - - // Start advertising the service - pServer->getAdvertising()->start(); -} - -void loop() { - // Nothing to do here -} \ No newline at end of file diff --git a/code/web/incoming_request_handlers.js b/code/server/incoming_request_handlers.js similarity index 57% rename from code/web/incoming_request_handlers.js rename to code/server/incoming_request_handlers.js index 6049b3b..9d23366 100644 --- a/code/web/incoming_request_handlers.js +++ b/code/server/incoming_request_handlers.js @@ -1,3 +1,5 @@ +const databaseQuery = 'SELECT * FROM `Exercise` WHERE ExerciseID = 1'; +// const databaseQueryRand = 'SELECT * FROM `Exercise` ORDER BY RAND() LIMIT 1'; /** * @@ -9,41 +11,33 @@ function handleIncoming(request, response, app, pool) { - let query = 'SELECT * FROM Exercise WHERE ExerciseID = ?'; - let parameters = []; - - if (!request.hasOwnProperty('uid') || typeof request.uid !== 'number') - { - query = 'SELECT * FROM Exercise'; - } else parameters.push(request.uid); - // Acquire database connection pool.getConnection() .then(conn => { - conn.query(query, parameters) + conn.query( + databaseQuery) .then(rows => { if (rows.length === 0) { response .status(404) - .send(JSON.stringify({error: 'Exercise not found'})); + .send(JSON.stringify({error: 'No exercises found in the database.'})); } else { - // Send back the data in the right format - let converted = rows.map(row => { - return { - name: row.Name, - description: row.Description, - muscleGroup: row.MuscleGroup, - imageUrl: row.ImageURL, - videoUrl: row.VideoURL - }; - }); - - response - .status(200) - .send(JSON.stringify(converted)); + let row = rows[0]; + response.status(200) + .send(JSON.stringify({ + exerciseId: row['ExerciseID'], + name: row['Name'], + muscleGroup: row['MuscleGroup'], + shortDescription: row['ShortDescription'], + description: row['Description'], + imageUrl: row['ImageURL'], + videoUrl: row['VideoURL'], + path: row['Path'], + duration: row['Duration'] + })) } }) .catch(error => { diff --git a/code/server/ipSender/index.js b/code/server/ipSender/index.js new file mode 100644 index 0000000..dc68c2d --- /dev/null +++ b/code/server/ipSender/index.js @@ -0,0 +1,22 @@ +const express = require('express'); +const app = express(); + +app.use(express.json()); // for parsing application/json + +let ipAddress = ''; // to store the received IP address + +// endpoint to receive an IP address from an external source +app.post('/set-ip', (req, res) => { + ipAddress = req.body.ip; + console.log('IP address received:', ipAddress); +}); + +// endpoint for the ESP32 to fetch the IP address +app.get('/get-ip', (req, res) => { + res.json({ ip: ipAddress }); + console.log('IP address sent to ESP32'); +}); + +app.listen(42069, () => { + console.log('Server is running on port 42069'); +}); \ No newline at end of file diff --git a/code/web/server.js b/code/server/server.js similarity index 61% rename from code/web/server.js rename to code/server/server.js index 886846e..c31eded 100644 --- a/code/web/server.js +++ b/code/server/server.js @@ -21,6 +21,20 @@ const pool = mariadb.createPool(databaseCredentials); // Register incoming HTTP request handlers require('./incoming_request_handlers')(app, pool); +let ipAddress = ''; // to store the received IP address + +// endpoint to receive an IP address from an external source +app.post('/set-ip', (req, res) => { + ipAddress = req.body.ip; + console.log('IP address received:', ipAddress); +}); + +// endpoint for the ESP32 to fetch the IP address +app.get('/get-ip', (req, res) => { + res.json({ ip: ipAddress }); + console.log('IP address sent to ESP32'); +}); + // Start server app.listen(serverPort, () => { console.log(`Server running on port ${serverPort}`); diff --git a/code/server/test/config.js b/code/server/test/config.js new file mode 100644 index 0000000..87c69b0 --- /dev/null +++ b/code/server/test/config.js @@ -0,0 +1,8 @@ +// config.js +module.exports = { + host: '127.0.0.1', + user: 'fitbot', + password: 'fitbot123', + database: 'fitbot', + port: 3306, // Default MariaDB port + }; diff --git a/code/server/test/testConnection.js b/code/server/test/testConnection.js new file mode 100644 index 0000000..4eb953a --- /dev/null +++ b/code/server/test/testConnection.js @@ -0,0 +1,35 @@ +const express = require('express'); +const mariadb = require('mariadb'); +const config = require('./config'); + +const app = express(); +const port = 443; // Use port 443 + +const pool = mariadb.createPool({ + host: config.host, + user: config.user, + password: config.password, + database: config.database, + connectionLimit: 5, + acquireTimeout: 30000, // Increase timeout to 30 seconds +}); + +app.get('/', async (req, res) => { + let conn; + try { + conn = await pool.getConnection(); + console.log("Connected to MariaDB!"); + const rows = await conn.query("SELECT * FROM Exercise ORDER BY RAND() LIMIT 1"); + console.log(rows); // [{val: 1}] + res.json(rows); // Send the result as JSON response + } catch (err) { + console.error("Unable to connect to MariaDB:", err); + res.status(500).send("Unable to connect to MariaDB"); + } finally { + if (conn) conn.release(); // Release the connection back to the pool + } +}); + +app.listen(port, '145.92.8.132', () => { + console.log(`Server is listening on http://145.92.8.132:${port}`); +}); diff --git a/code/src/Fitbot/.gitignore b/code/src/Fitbot/.gitignore index 732c947..203dde6 100644 --- a/code/src/Fitbot/.gitignore +++ b/code/src/Fitbot/.gitignore @@ -14,4 +14,5 @@ .cxx local.properties .idea -.vscode \ No newline at end of file +.vscode +/.idea/ diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index a647bf6..c23d507 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -16,33 +16,45 @@ + + + + + + + + + - + + + + diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml index 326887c..32bdaaf 100644 --- a/code/src/Fitbot/app/src/main/AndroidManifest.xml +++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml @@ -10,19 +10,21 @@ + + + + - - + * Before any of the functions in this class can be used, the Pepper class needs a QiContext to be + * set. This is retrieved in the `onRobotFocusGained` method of the RobotLifecycleCallbacks + * interface, and can then provided using the `provideContext` method. + *

+ */ +public class Pepper { + + // Queue containing all Pepper actions that need to be executed + // This is to prevent the app from crashing when attempting to perform multiple actions at once + private static final ConcurrentLinkedQueue pepperActionEventQueue = + new ConcurrentLinkedQueue<>(); + + private static final AtomicBoolean isAnimating = new AtomicBoolean(false); + private static final AtomicBoolean isSpeaking = new AtomicBoolean(false); + + private static final Locale DEFAULT_LOCALE = new Locale(Language.DUTCH, Region.NETHERLANDS); + + /** + * The latest QiContext used by Pepper. + * This can be publicly accessed to get the latest QiContext used by Pepper. + */ + public static QiContext latestContext = null; + + /** + * Make the Pepper robot speak a phrase. + * This function adds a SpeechEvent to the event queue, + * and will speak the phrase once Pepper is ready to process it. + * + * @param phrase The phrase to speak + */ + public static void say(String phrase) { + addToEventQueue(new PepperSpeechEvent(phrase, DEFAULT_LOCALE)); + } + + /** + * Make the Pepper robot perform an animation. + * This function adds an AnimationEvent to the event queue, + * and will perform the animation once Pepper is ready to process it. + * + * @param animationName The name of the animation to play + */ + public static void animate(String animationName) { + addToEventQueue(new PepperAnimationEvent(animationName)); + } + + /** + * Add an event to the event queue. + * The event will be executed once Pepper is ready to process it. + * + * @param event The event to add to the queue + */ + public static void addToEventQueue(AbstractPepperActionEvent event) { + pepperActionEventQueue.add(event); + processEventQueue(); + } + + /** + * Process the event queue. + * This method will process the next event in the queue if Pepper is not currently + * speaking or animating. + * This prevents multiple actions from being executed at the same time, which can + * cause the application to crash. + */ + private static synchronized void processEventQueue() { + if (!pepperActionEventQueue.isEmpty()) { + AbstractPepperActionEvent event = pepperActionEventQueue.poll(); + + // Prevent null pointer exceptions + if (event == null || latestContext == null) + return; + + switch (event.getAction()) { + /* Event for speaking a phrase **/ + case ACTION_SPEAK: + if (!(event instanceof PepperSpeechEvent) || isSpeaking.get()) + break; + + PepperSpeechEvent speechEvent = (PepperSpeechEvent) event; + isSpeaking.set(true); + speechEvent + .getSay(latestContext) + .async() + .run() + .andThenConsume(future -> { + isSpeaking.set(false); + processEventQueue(); + }); + break; + + /* Event for animating the robot **/ + case ACTION_ANIMATE: + if (!(event instanceof PepperAnimationEvent) || isAnimating.get()) + break; + + PepperAnimationEvent animationEvent = (PepperAnimationEvent) event; + animationEvent + .getAnimation(latestContext) + .async() + .run() + .andThenConsume(future -> { + isAnimating.set(false); + processEventQueue(); + }); + break; + default: + // Do nothing + break; + } + } + } + + /** + * Function for providing the latest QiContext to Pepper. + * + * @param context The QiContext to use. + * This can be null if the context is not available. + * @param origin The origin of the context. + * This parameter is to prevent other classes from + * unnecessarily providing a context, or setting + * the context to null. + */ + public static void provideContext(QiContext context, Class origin) { + latestContext = context; + if (context != null) { + processEventQueue(); + } + } + +} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/pepper/PepperAnimationEvent.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/pepper/PepperAnimationEvent.java new file mode 100644 index 0000000..0bebc4f --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/pepper/PepperAnimationEvent.java @@ -0,0 +1,65 @@ +package com.example.fitbot.pepper; + +import com.aldebaran.qi.sdk.QiContext; +import com.aldebaran.qi.sdk.builder.AnimateBuilder; +import com.aldebaran.qi.sdk.builder.AnimationBuilder; +import com.aldebaran.qi.sdk.object.actuation.Animate; +import com.aldebaran.qi.sdk.object.actuation.Animation; + +public class PepperAnimationEvent extends AbstractPepperActionEvent { + + public final String animationName; + private final IAnimationCompletedListener onLabelReachedListener; + + + /** + * Constructor for PepperAnimationEvent + * + * @param animationName The name of the animation to play + * @param onLabelReachedListener The listener to call when the animation is completed + */ + public PepperAnimationEvent(String animationName, IAnimationCompletedListener onLabelReachedListener) { + this.animationName = animationName; + this.onLabelReachedListener = onLabelReachedListener; + } + + /** + * Constructor for PepperAnimationEvent + * + * @param animationName The name of the animation to play + */ + public PepperAnimationEvent(String animationName) { + this(animationName, null); + } + + @Override + public EPepperAction getAction() { + return EPepperAction.ACTION_ANIMATE; + } + + /** + * Returns an animation object, which can be used to play the animation + * in the Pepper class. + */ + public Animate getAnimation(QiContext context) { + Animation animation = AnimationBuilder.with(context) + .withResources(context.getResources().getIdentifier(animationName, "raw", context.getPackageName())) + .build(); + + Animate animate = AnimateBuilder.with(context) + .withAnimation(animation) + .build(); + + // Add a listener for when a label is reached + animate.addOnLabelReachedListener((label, time) -> { + if (onLabelReachedListener != null && "end".equals(label)) { + onLabelReachedListener.onComplete(); + } + }); + return animate; + } + + public interface IAnimationCompletedListener { + void onComplete(); + } +} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/pepper/PepperSpeechEvent.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/pepper/PepperSpeechEvent.java new file mode 100644 index 0000000..ecf8eab --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/pepper/PepperSpeechEvent.java @@ -0,0 +1,32 @@ +package com.example.fitbot.pepper; + +import com.aldebaran.qi.sdk.QiContext; +import com.aldebaran.qi.sdk.builder.SayBuilder; +import com.aldebaran.qi.sdk.object.conversation.Say; +import com.aldebaran.qi.sdk.object.locale.Locale; + +public class PepperSpeechEvent extends AbstractPepperActionEvent { + + public final String phrase; + public final Locale locale; + + public PepperSpeechEvent(String phrase, Locale locale) { + this.locale = locale; + this.phrase = phrase; + } + + @Override + public EPepperAction getAction() { + return EPepperAction.ACTION_SPEAK; + } + + /** + * Returns a Say object, which can then be executed. + */ + public Say getSay(QiContext context) { + return SayBuilder.with(context) + .withText(this.phrase) + .withLocale(this.locale) + .build(); + } +} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java deleted file mode 100644 index 8cc269b..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.fitbot.ui.activities; - -public class CompletionActivity { -} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java index 703c53b..e2286ee 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java @@ -4,8 +4,7 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import com.example.fitbot.R; -import com.example.fitbot.ui.activities.FitnessActivity; -import com.example.fitbot.ui.activities.MainActivity; +import com.example.fitbot.util.NavigationManager; public class EndScreenActivity extends AppCompatActivity { @@ -14,7 +13,8 @@ public class EndScreenActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_end_screen); - com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.homeButtonEndScreen, MainActivity.class); - com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.startButtonEndScreen, FitnessActivity.class); + NavigationManager.hideSystemUI(this); + + NavigationManager.setupButtonNavigation(this, R.id.homeButtonEndScreen, MainActivity.class); } } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java index 5d2d6dd..5b681fc 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java @@ -1,8 +1,23 @@ package com.example.fitbot.ui.activities; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ObjectAnimator; +import android.app.Dialog; +import android.content.Context; +import android.content.Intent; +import android.content.res.ColorStateList; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.media.MediaPlayer; +import android.net.Uri; import android.os.Bundle; +import android.support.v4.content.ContextCompat; import android.util.Log; import android.view.View; +import android.widget.Button; +import android.widget.ProgressBar; +import android.widget.TextView; import android.widget.VideoView; import com.aldebaran.qi.sdk.QiContext; @@ -10,123 +25,275 @@ 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; +import com.aldebaran.qi.sdk.object.actuation.Animate; import com.example.fitbot.R; import com.example.fitbot.exercise.Exercise; import com.example.fitbot.exercise.ExerciseManager; -import com.example.fitbot.ui.components.PersonalMotionPreviewElement; -import com.example.fitbot.util.ButtonNavigation; -import com.example.fitbot.util.FitnessCycle; +import com.example.fitbot.pepper.Pepper; +import com.example.fitbot.util.NavigationManager; import com.example.fitbot.util.processing.InputProcessor; -import org.joml.Vector3f; - public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks { // Private fields for the FitnessActivity class. - private PersonalMotionPreviewElement personalMotionPreviewElement; private InputProcessor motionProcessor; private Exercise currentExercise; + // Progress circle for the exercises + private ProgressBar progressCircle; + private TextView progressText; + private int progress = 1; + private final int maxProgress = 10; + + // Exercise status element data + private TextView exerciseMuscleGroupTextView; + private TextView exerciseNameTextView; + private TextView exerciseShortDescriptionTextView; + //private TextView exerciseDescriptionTextView; + private static String exerciseVideoUrl; + private Animate animate; + private VideoView videoView; private QiContext qiContext; + private final Object lock = new Object(); + // Some nice little messages for the user - private static final String[] EXERCISE_NOT_FOUND_MESSAGES = new String[] { + private static final String[] EXERCISE_NOT_FOUND_MESSAGES = new String[]{ "Ik heb momenteel helaas wat moeite met het ophalen van oefeningen, sorry.", "Het lijkt erop dat de oefeningen op een misterieus avontuur zijn. Even wachten tot ze terug zijn.", - "Ssst, de oefeningen slapen nog, probeer het later nog eens." + ", de oefeningen slapen nog, probeer het later nog eens." }; private static final String EXERCISE_NOT_FOUND_SEEK_HELP_MESSAGE = "Indien dit probleem zich voortzet, neem contact op met de ontwikkelaar."; private static final float SENSOR_SAMPLE_RATE = 10.0f; - private static final int EXERCISE_COUNT = 5; + private static final int EXERCISE_COUNT = 5; + private static int EXERCISE_VIDEO_REPETITION = 1; private static final float EXERCISE_SPEED_MULTIPLIER = 1.0f; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); QiSDK.register(this, this); - setContentView(R.layout.activity_fitness); + videoView = findViewById(R.id.videoView); - // Remove the ugly ass bar on top of the view + // Fill empty objects with exercise data + this.exerciseNameTextView = findViewById(R.id.textViewFitnessTitle); + this.exerciseShortDescriptionTextView = findViewById(R.id.textViewFitnessShortDescription); + //this.exerciseDescriptionTextView = findViewById(R.id.textViewDialogDescription); + + // Set the repetition count for the exercise + EXERCISE_VIDEO_REPETITION = 1; + + progressCircle = findViewById(R.id.progressCircle); + progressText = findViewById(R.id.progressText); + progressCircle.setMax(maxProgress); + + // Set color of loading circle + ProgressBar loadingCircle = findViewById(R.id.loadingCircle); + loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED)); + + // Navigation Buttons + NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class); + NavigationManager.setupButtonNavigation(this, R.id.skipButtonFitness, MainActivity.class); //Needs to skip exercises once those are implemented + + // Hide system UI + NavigationManager.hideSystemUI(this); setSpeechBarDisplayStrategy(SpeechBarDisplayStrategy.IMMERSIVE); - // Find the VideoView by its ID - VideoView videoView = findViewById(R.id.videoView); - FitnessCycle.playVideo(videoView, this); - ButtonNavigation.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class); - // Implement your logic when the robot focus is gained - + // Initiate info button + Button infoButtonFitness = findViewById(R.id.infoButtonFitness); + infoButtonFitness.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showInfoDialog(); + } + }); } @Override public void onRobotFocusGained(QiContext qiContext) { - this.qiContext = qiContext; - // Find the VideoView by its ID -// CompletableFuture.runAsync(() -> FitnessCycle.executeMovement("bicepcurl", 10, qiContext)); - personalMotionPreviewElement = findViewById(R.id.personalMotionPreviewElement); + // Provide the context so that all queued actions can be performed. + Pepper.provideContext(qiContext, this.getClass()); // Initialize the element whenever it has been added to the screen. // This will provide the element with the appropriate dimensions for drawing // the canvas properly. - personalMotionPreviewElement.post(() -> { - Exercise exercise = this.acquireExercise(); - if ( exercise == null) { - return; - } + this.fetchExerciseAsync((exercise) -> { // Acquire paths from the exercise and provide them to the motion processor - Vector3f[][] vectors = new Vector3f[][] {exercise.leftPath.getVectors(), exercise.rightPath.getVectors()}; + motionProcessor = new InputProcessor(this); + motionProcessor.useExercise(exercise); - motionProcessor = new InputProcessor(vectors, exercise.exerciseTimeInSeconds, SENSOR_SAMPLE_RATE); - - personalMotionPreviewElement.provideQiContext(qiContext); - personalMotionPreviewElement.initialize(exercise, motionProcessor, EXERCISE_COUNT); - - motionProcessor.startListening(); - motionProcessor.setInputHandler(personalMotionPreviewElement); + }, (n) -> { + int randomMessageIndex = (int) Math.floor(Math.random() * EXERCISE_NOT_FOUND_MESSAGES.length); + Pepper.say(EXERCISE_NOT_FOUND_MESSAGES[randomMessageIndex]); + Pepper.say(EXERCISE_NOT_FOUND_SEEK_HELP_MESSAGE); + // Run on main thread to prevent crashes (wack) + this.runOnUiThread(() -> NavigationManager.navigateToActivity(this, EndScreenActivity.class)); }); - personalMotionPreviewElement.provideQiContext(qiContext); - - // FitnessCycle.playVideo(qiContext, videoView, this); } /** * Acquire an exercise from the ExerciseManager. * Whenever the retrieval failed, it will have the robot say something to the user * to inform them about the issue. - * - * @return The acquired exercise, or null if the exercise could not be retrieved. */ - public Exercise acquireExercise() { - Exercise exercise = ExerciseManager.retrieveExercise(); - if ( exercise == null && this.qiContext != null) - { - int randomMessageIndex = (int)Math.floor(Math.random() * EXERCISE_NOT_FOUND_MESSAGES.length); - FitnessCycle.say(EXERCISE_NOT_FOUND_MESSAGES[randomMessageIndex], qiContext); - FitnessCycle.say(EXERCISE_NOT_FOUND_SEEK_HELP_MESSAGE, qiContext); + public void fetchExerciseAsync(Exercise.ExerciseFetchHandler onSuccessfulFetch, Exercise.ExerciseFetchHandler onFailedFetch) { + // For some stupid reason we cannot perform network operations on the main thread. + Log.e("fetchvideo", "video fetched"); + // therefore we'll have to do it like this... + new Thread(() -> { + Exercise exercise = ExerciseManager.fetchExerciseFromDatabase(); + if (exercise == null) { + onFailedFetch.handle(null); + + // Main thread stuff + runOnUiThread(() -> NavigationManager.navigateToActivity(this, MainActivity.class)); + } else { + onSuccessfulFetch.handle(exercise); + runOnUiThread(() -> { + + exerciseNameTextView.setText(exercise.name); + exerciseShortDescriptionTextView.setText(exercise.shortDescription); + // exerciseDescriptionTextView.setText(exercise.description); + exerciseVideoUrl = exercise.videoUrl; + + // Play the video + playVideo(videoView, this); + + // When the video has started playing remove the loading circle + videoView.setOnInfoListener((mp, what, extra) -> { + if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START) { + ProgressBar loadingCircle = findViewById(R.id.loadingCircle); + loadingCircle.setVisibility(View.GONE); + + + //Pepper.animate("armraise"); + + // Start checking for user movement once the video has loaded + this.motionProcessor.startListening(); + this.motionProcessor.startCheckingUserMovement(); + this.motionProcessor.setRecording(true, 3.f); + + return true; + } + return false; + }); + + videoView.setOnCompletionListener(mp -> { + if (EXERCISE_VIDEO_REPETITION < ExerciseManager.DEFAULT_EXERCISE_REPETITIONS) { + videoView.start(); // start the video again + EXERCISE_VIDEO_REPETITION++; + if (progress >= 10) { + runOnUiThread(() -> NavigationManager.navigateToActivity(this, EndScreenActivity.class)); + } + } + }); + }); + } + }).start(); + } + + /** + * Function for playing a video in a VideoView + * + * @param videoView The VideoView to play the video in + * @param context The context to use + */ + public void playVideo(VideoView videoView, Context context) { + // Set up the video player + if (videoView != null) { + videoView.setVideoURI(Uri.parse("android.resource://" + context.getPackageName() + "/" + R.raw.arm_raises)); + videoView.start(); + } else { + Log.e("FitnessActivity", "VideoView is null. Check your layout XML."); } - return exercise; } @Override public void onRobotFocusLost() { - // Implement your logic when the robot focus is lost + QiSDK.unregister(this, this); + Pepper.provideContext(null, this.getClass()); // Remove the context (unavailable) + + // Go to the main screen +// NavigationManager.navigateToActivity(this, MainActivity.class); } @Override public void onRobotFocusRefused(String reason) { - // Implement your logic when the robot focus is refused } @Override protected void onDestroy() { - super.onDestroy(); + if (this.motionProcessor != null) { + this.motionProcessor.stopListening(); + this.motionProcessor = null; + } QiSDK.unregister(this, this); - this.motionProcessor.stopListening(); - this.motionProcessor = null; - this.personalMotionPreviewElement.destroy(); + Pepper.provideContext(null, this.getClass()); + + super.onDestroy(); + } + + private void showInfoDialog() { + final Dialog dialog = new Dialog(this); + dialog.setContentView(R.layout.dialog_info); + + // Hide the system UI + NavigationManager.hideSystemUI(this); + + // Set the dialog options + dialog.getWindow().setDimAmount(0.5f); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.setCancelable(true); + + // Close button for dialog + Button closeButton = dialog.findViewById(R.id.closeButtonDialog); + closeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.dismiss(); + } + }); + dialog.show(); + } + + public void incrementProgress() { + if (progress++ < maxProgress) { + triggerColorBurst(true); + updateProgress(); + } + } + + private void updateProgress() { + progressCircle.setProgress(progress); + progressText.setText(progress + "/" + maxProgress); + } + + public void triggerColorBurst(boolean isGoodRep) { + + Log.i("InputProcessor", "Color Burst"); + + try { + int circleId = isGoodRep ? R.drawable.progress_circle_good : R.drawable.progress_circle_bad; + int soundId = isGoodRep ? R.raw.good_sound : R.raw.wrong_sound; + progressCircle.setProgressDrawable(ContextCompat.getDrawable(this, circleId)); + // MediaPlayer.create(this, soundId).start(); + + ObjectAnimator animator = ObjectAnimator.ofFloat(progressCircle, "alpha", 1f, 0f, 1f); + animator.setDuration(700); // Burst duration + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + progressCircle.setProgressDrawable(ContextCompat.getDrawable(FitnessActivity.this, R.drawable.progress_circle)); + } + }); + animator.start(); + } catch (Exception e) { + e.printStackTrace(); + } } } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java index cbc714c..7dab65d 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java @@ -1,11 +1,11 @@ package com.example.fitbot.ui.activities; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.view.View; +import android.support.v7.app.AppCompatActivity; import com.example.fitbot.R; -import com.example.fitbot.util.ButtonNavigation; +import com.example.fitbot.pepper.Pepper; +import com.example.fitbot.util.NavigationManager; public class HelpActivity extends AppCompatActivity { @@ -14,18 +14,12 @@ public class HelpActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_help); - ButtonNavigation.setupButtonNavigation(this, R.id.homeButtonHelp, MainActivity.class); + Pepper.say("Welkom bij FitBot. De robot die helpt om fit te blijven. Druk op Start om de oefening te beginnen. Ga terug naar het begin scherm door op het huisje te klikken"); - // Hide system UI - hideSystemUI(); - } - private void hideSystemUI() { - View decorView = getWindow().getDecorView(); - // Hide the status bar and navigation bar - int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - decorView.setSystemUiVisibility(uiOptions); + + NavigationManager.setupButtonNavigation(this, R.id.homeButtonHelp, MainActivity.class); + + NavigationManager.hideSystemUI(this); } } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java index 4edfa2e..934a9df 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java @@ -1,5 +1,6 @@ package com.example.fitbot.ui.activities; +import static com.example.fitbot.util.Networking.sendIpAddress; import android.annotation.SuppressLint; import android.content.Intent; import android.net.Uri; @@ -10,13 +11,17 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.Button; import com.example.fitbot.R; -import com.example.fitbot.util.ButtonNavigation; +import com.example.fitbot.pepper.Pepper; +import com.example.fitbot.util.NavigationManager; + +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; public class MainActivity extends AppCompatActivity { @@ -31,7 +36,6 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - // Set full screen mode to hide status bar getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); @@ -49,7 +53,8 @@ public class MainActivity extends AppCompatActivity { setUpUi(); // Hide system UI - hideSystemUI(); + NavigationManager.hideSystemUI(this); + sendIpAddress(this); } private void setUpUi() { @@ -63,8 +68,8 @@ public class MainActivity extends AppCompatActivity { if (getSupportActionBar() != null) { getSupportActionBar().hide(); } - ButtonNavigation.setupButtonNavigation(this, R.id.startButtonMain, FitnessActivity.class); - ButtonNavigation.setupButtonNavigation(this, R.id.helpButtonMain, HelpActivity.class); + NavigationManager.setupButtonNavigation(this, R.id.startButtonMain, FitnessActivity.class); + NavigationManager.setupButtonNavigation(this, R.id.helpButtonMain, HelpActivity.class); /*---Tool Bar---*/ setSupportActionBar(toolbar); // Make the toolbar act as the action bar @@ -80,33 +85,22 @@ public class MainActivity extends AppCompatActivity { @Override public void onDrawerOpened(View drawerView) { super.onDrawerOpened(drawerView); - hideSystemUI(); } @Override public void onDrawerClosed(View drawerView) { super.onDrawerClosed(drawerView); - hideSystemUI(); } }; drawerLayout.addDrawerListener(toggle); toggle.syncState(); // Synchronize the state of the navigation drawer } - private void hideSystemUI() { - View decorView = getWindow().getDecorView(); - // Hide the status bar and navigation bar - int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - decorView.setSystemUiVisibility(uiOptions); - } - @Override public void onWindowFocusChanged(boolean hasFocus) { super.onWindowFocusChanged(hasFocus); if (hasFocus) { - hideSystemUI(); + NavigationManager.hideSystemUI(this); } } @@ -118,4 +112,8 @@ public class MainActivity extends AppCompatActivity { super.onBackPressed(); } } + + } + + diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java deleted file mode 100644 index 92f4831..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java +++ /dev/null @@ -1,254 +0,0 @@ -package com.example.fitbot.ui.components; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.support.annotation.Nullable; -import android.util.AttributeSet; -import android.util.Log; -import android.view.View; - -import com.aldebaran.qi.sdk.QiContext; -import com.example.fitbot.exercise.Exercise; -import com.example.fitbot.ui.activities.EndScreenActivity; -import com.example.fitbot.ui.activities.FitnessActivity; -import com.example.fitbot.ui.activities.MainActivity; -import com.example.fitbot.util.FitnessCycle; -import com.example.fitbot.util.processing.IInputHandler; -import com.example.fitbot.util.processing.InputProcessor; - -import org.joml.Matrix4f; -import org.joml.Vector2f; -import org.joml.Vector3f; -import org.joml.Vector4f; - -import java.util.concurrent.ConcurrentLinkedQueue; - -public class PersonalMotionPreviewElement extends View implements IInputHandler { - - // Fields regarding Exercise and speech handling. - private InputProcessor motionProcessor; - private Exercise exercise; - private QiContext qiContext; - private int exerciseCount; - - private FitnessActivity parentActivity; - - private final Paint userProgressPaint = new Paint(); - private final Paint borderPaint = new Paint(); - private final Paint backgroundPaint = new Paint(); - - // TODO: Remove - private Matrix4f viewMatrix = new Matrix4f(); // The view matrix for the 3D to 2D transformation. - private Matrix4f projectionMatrix = new Matrix4f(); // The projection matrix for the 3D to 2D transformation. - private final Vector4f objectPosition = new Vector4f(0, 0, 0, 1); // The location of the object in 3D space. - private ConcurrentLinkedQueue vectors = new ConcurrentLinkedQueue<>(); - - // TODO: Remove - private Vector2f[] axisVectors = new Vector2f[0]; - - - private static final String[] STARTING_PHRASES = { - "Veel success met de oefening!", - "Je kan het!", - "Veel plezier!" - }; - - - public PersonalMotionPreviewElement(Context context, AttributeSet attrs) { - super(context, attrs); - - if ( context instanceof Activity) - { - this.parentActivity = (FitnessActivity) context; - } - - this.userProgressPaint.setColor(0xFFFF0000); // Red - this.userProgressPaint.setStyle(Paint.Style.FILL); - this.userProgressPaint.setStrokeWidth(5.0f); - this.userProgressPaint.setAntiAlias(true); - - // Target paint is the filling of the target path. - this.borderPaint.setColor(-1); - this.borderPaint.setStyle(Paint.Style.STROKE); - this.borderPaint.setStrokeWidth(5.0f); - this.borderPaint.setAntiAlias(true); - - this.backgroundPaint.setColor(0xFF000000); // Black - } - - /** - * Method for initializing the PersonalMotionPreviewElement. - * This method has to be called with a "post" function when the element has been - * created, otherwise the dimensions of the element aren't initialized yet, which - * will cause the vertex projections to fail (0 width and height). - * - * @param exercise The exercise that the user is currently performing. - * @param motionProcessor The motion processor that will be used to process the user's motion. - * @param exerciseCount The total amount of exercises that the user has to perform. - */ - public void initialize(@Nullable Exercise exercise, InputProcessor motionProcessor, int exerciseCount) { - Log.i("PersonalMotionPreviewElement", "Creating new PersonalMotionPreviewElement."); - - this.motionProcessor = motionProcessor; - this.exercise = exercise; - this.exerciseCount = exerciseCount; - - // TODO: Remove - this.axisVectors = new Vector2f[] { - projectVertex(new Vector3f(-5.0f, 0, 0), getWidth(), getHeight()), - projectVertex(new Vector3f(5.0f, 0, 0), getWidth(), getHeight()), - projectVertex(new Vector3f(0, -5.0f, 0), getWidth(), getHeight()), - projectVertex(new Vector3f(0, 5.0f, 0), getWidth(), getHeight()), - projectVertex(new Vector3f(0, 0, -5.0f), getWidth(), getHeight()), - projectVertex(new Vector3f(0, 0, 5.0f), getWidth(), getHeight()) - }; - } - - public void destroy() - { - if ( this.motionProcessor != null ) - this.motionProcessor.stopListening(); - - this.motionProcessor = null; - } - - /** - * Function for providing a QiContext to the PersonalMotionPreviewElement. - * This function will be called by the parent activity when the QiContext is available. - * Also say something nice to the user :) - * - * @param context The QiContext to provide. - */ - public void provideQiContext(QiContext context) { - this.qiContext = context; - - // Handler that is called every time the motion processor receives new data. - this.motionProcessor.setInputHandler((rotationVector, deviceId) -> { - - Log.i("MotionProcessor", "Rotation vector received: " + rotationVector); - Log.i("MotionProcessor", "Last error offset:" + this.motionProcessor.getError(deviceId, this.motionProcessor.secondsPassed())); - - if ( this.motionProcessor.hasFinished()) - { - if ( this.parentActivity == null) - { - // Move to main screen - this.destroy(); - Intent intent = new Intent(getContext(), MainActivity.class); - getContext().startActivity(intent); - return; - } - // Move on to the next exercise, or finish. - if ( this.exerciseCount > 0 ) - { - this.exerciseCount--; - this.exercise = this.parentActivity.acquireExercise(); - this.motionProcessor.useExercise(this.exercise); - } - else - { - // Finish the exercise. - this.destroy(); - Intent intent = new Intent(getContext(), EndScreenActivity.class); - getContext().startActivity(intent); - return; - } - } - - // TODO: Adjust / remove - vectors.add(projectVertex(rotationVector, this.getWidth(), this.getHeight())); - Log.i("MotionProcessor", "Rotation vector received: " + rotationVector); - Vector2f parsed = projectVertex(rotationVector, this.getWidth(), this.getHeight()); - - this.vectors.add(parsed); - // Remove the first element if the array is too big - if (this.vectors.size() > 100) - this.vectors.poll(); - }); - - if (this.qiContext == null) - return; - - FitnessCycle.say(STARTING_PHRASES[(int) Math.floor(Math.random() * STARTING_PHRASES.length)], this.qiContext); - } - - /** - * Method for setting the gesture path that will be drawn on the canvas. - * - * @param exercise The exercise that the user is currently performing. - */ - public void setExercise(Exercise exercise) { - this.motionProcessor.useExercise(exercise); - this.exercise = exercise; - } - - - private Vector2f projectVertex(Vector3f point, int virtualWidth, int virtualHeight) { - viewMatrix - .identity() - .lookAt(new Vector3f(0, 0, -2), new Vector3f(0, 0, 0), new Vector3f(0, 1, 0)); - - // Transform the projection matrix to a perspective projection matrix - // Perspective transformation conserves the depth of the object - projectionMatrix - .identity() - .perspective((float) Math.toRadians(70), (float) virtualWidth / virtualHeight, .01f, 1000.0f); - - // Convert world coordinates to screen-space using MVP matrix - Vector4f screenCoordinates = new Vector4f(point, 1.0f) - .mul(this.viewMatrix) - .mul(this.projectionMatrix); - - // Normalize screen coordinates from (-1, 1) to (0, virtualWidth) and (0, virtualHeight) - float normalizedX = (screenCoordinates.x / screenCoordinates.w + 1.0f) * 0.5f * virtualWidth; - float normalizedY = (1.0f - screenCoordinates.y / screenCoordinates.w) * 0.5f * virtualHeight; - return new Vector2f(normalizedX, normalizedY); - } - - - - @Override - public void onDraw(Canvas canvas) { - canvas.drawRect(0, 0, getWidth(), getHeight(), backgroundPaint); - this.setBackgroundColor(0xFF000000); // Black - /*if (this.exercise == null) - return;*/ - - for (int i = 0, startX, endX, startY, endY; i < axisVectors.length/2; i++) - { - startX = (int)Math.max(0, Math.min(this.getWidth(), (int)axisVectors[i*2].x)); - endX = (int)Math.max(0, Math.min(this.getWidth(), (int)axisVectors[i*2+1].x)); - startY = (int)Math.max(0, Math.min(this.getHeight(), (int)axisVectors[i*2].y)); - endY = (int)Math.max(0, Math.min(this.getHeight(), (int)axisVectors[i*2+1].y)); - canvas.drawLine(startX, startY, endX, endY, this.borderPaint); - } - - for ( Vector2f point : this.vectors) - { - canvas.drawRect(point.x, point.y, point.x + 5, point.y + 5, this.userProgressPaint); - } -/* - // Draw target circle - float targetRadius = (this.screenDimensions.x + this.screenDimensions.y) / 5.0f; - canvas.drawCircle(this.screenDimensions.x / 2, this.screenDimensions.y / 2, targetRadius, this.targetPaint); - canvas.drawCircle(this.screenDimensions.x / 2, this.screenDimensions.y / 2, (targetRadius * exerciseProgress.get()/1000.0f), this.referencePaint); - referencePaint.setColor( - Color.argb( - 255, - (int)(255 * (1.0 - exerciseProgress.get()/1000.0f)), - (int)(255 * exerciseProgress.get()/1000.0f), - 0 - ) - );*/ - - this.invalidate(); - } - - @Override - public void accept(Vector3f rotationVector, int sensorId) { - - } -} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/Animations.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/Animations.java index 01444f4..6d243c1 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/Animations.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/Animations.java @@ -11,8 +11,7 @@ import com.aldebaran.qi.sdk.object.actuation.Animation; public class Animations { - public static void Animate(String AnimationFile, QiContext ctx) - { + public static void Animate(String AnimationFile, QiContext ctx) { int resId = ctx.getResources().getIdentifier(AnimationFile, "raw", ctx.getPackageName()); Animation animation = AnimationBuilder.with(ctx) diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/ButtonNavigation.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/ButtonNavigation.java deleted file mode 100644 index b239b35..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/ButtonNavigation.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.example.fitbot.util; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.view.View; -import android.widget.Button; - -public class ButtonNavigation { - - /** - * Sets up a button to navigate to a different activity when clicked. - * - * @param currentActivity The activity that contains the button - * @param buttonId The ID of the button - * @param targetActivity The activity to navigate to - */ - public static void setupButtonNavigation(Activity currentActivity, int buttonId, Class targetActivity) { - Button button = currentActivity.findViewById(buttonId); - button.setOnClickListener(v -> { - Intent intent = new Intent(currentActivity, targetActivity); - currentActivity.startActivity(intent); - currentActivity.finish(); - }); - } -} \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/FitnessCycle.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/FitnessCycle.java deleted file mode 100644 index a55b445..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/FitnessCycle.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.example.fitbot.util; - -import android.content.Context; -import android.net.Uri; -import android.support.v7.app.AppCompatActivity; -import android.util.Log; -import android.widget.VideoView; - -import com.aldebaran.qi.sdk.builder.SayBuilder; -import com.aldebaran.qi.sdk.object.locale.Language; -import com.aldebaran.qi.sdk.object.locale.Locale; -import com.aldebaran.qi.sdk.object.locale.Region; -import com.example.fitbot.R; -import com.aldebaran.qi.sdk.QiContext; -import com.aldebaran.qi.sdk.builder.AnimateBuilder; -import com.aldebaran.qi.sdk.builder.AnimationBuilder; -import com.aldebaran.qi.sdk.object.actuation.Animate; -import com.aldebaran.qi.sdk.object.actuation.Animation; - -import java.util.concurrent.atomic.AtomicInteger; - -public class FitnessCycle extends AppCompatActivity { - - private static final Locale DUTCH_LOCALE = new Locale(Language.DUTCH, Region.NETHERLANDS); - - - /** - * Function for executing a movement animation a certain number of times - * on the robot - * - * @param Exercise The name of the exercise to perform - * @param Reps The number of repetitions to perform - * @param qiContext The QiContext to use - */ - public static void executeMovement(String Exercise, int Reps, QiContext qiContext) { - AtomicInteger repCount = new AtomicInteger(0); - - Animation animation = AnimationBuilder.with(qiContext) - .withResources(qiContext.getResources().getIdentifier(Exercise, "raw", qiContext.getPackageName())) - .build(); - - Animate animate = AnimateBuilder.with(qiContext) - .withAnimation(animation) - .build(); - - // Add a listener for when a label is reached - animate.addOnLabelReachedListener((label, time) -> { - // Increment repCount when the end of a repetition is reached - if ("end".equals(label)) { - repCount.incrementAndGet(); - } - }); - - // Run the animation the desired number of times - for (int i = 0; i < Reps; i++) { - animate.run(); - } - } - - /** - * Function for making the robot say something with DUTCH_LOCALE as locale - * @param phrase The phrase to make the robot say - * @param ctx The QiContext to use - */ - public static void say(String phrase, QiContext ctx) - { - say(phrase, ctx, DUTCH_LOCALE); - } - - /** - * Function for making the robot say something with a specific locale - * @param phrase The phrase to make the robot say - * @param ctx The QiContext to use - * @param locale The locale to use - */ - public static void say(String phrase, QiContext ctx, Locale locale) - { - SayBuilder - .with(ctx) - .withLocale(locale) - .withText(phrase) - .build() - .run(); - } - - /** - * Function for playing a video in a VideoView - * - * @param videoView The VideoView to play the video in - * @param context The context to use - */ - public static void playVideo(VideoView videoView, Context context) { - // Set up the video player - if (videoView != null) { - Uri videoUri = Uri.parse("android.resource://" + context.getPackageName() + "/" + R.raw.bicepvideo); - videoView.setVideoURI(videoUri); - - videoView.setOnCompletionListener(mp -> { - // Repeat the video when it finishes playing - videoView.start(); - }); - - videoView.start(); - } else { - Log.e("FitnessActivity", "VideoView is null. Check your layout XML."); - } - } -} \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/NavigationManager.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/NavigationManager.java new file mode 100644 index 0000000..a906b53 --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/NavigationManager.java @@ -0,0 +1,60 @@ +package com.example.fitbot.util; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.view.View; +import android.widget.Button; + +public class NavigationManager { + + /** + * Sets up a button to navigate to a different activity when clicked. + * + * @param currentActivity The activity that contains the button + * @param buttonId The ID of the button + * @param targetActivity The activity to navigate to + */ + public static void setupButtonNavigation(Activity currentActivity, int buttonId, Class targetActivity) { + Button button = currentActivity.findViewById(buttonId); + if (button == null) { + throw new IllegalArgumentException("Button with ID " + buttonId + " not found in " + currentActivity.getClass().getSimpleName()); + } + button.setOnClickListener(v -> NavigationManager.navigateToActivity(currentActivity, targetActivity)); + } + + /** + * Navigates to the target activity. + * + * @param currentActivity The current activity + * @param targetActivity The target activity + */ + public static void navigateToActivity(Activity currentActivity, Class targetActivity) { + Intent intent = new Intent(currentActivity, targetActivity); + // Close previous activity + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + currentActivity.startActivity(intent); + currentActivity.finish(); + } + + /** + * Navigates to the target activity. + * + * @param context The context + * @param targetActivity The target activity + */ + public static void navigateToActivity(Context context, Class targetActivity) { + Intent intent = new Intent(context, targetActivity); + context.startActivity(intent); + } + + public static void hideSystemUI(Activity currentActivity) { + View decorView = currentActivity.getWindow().getDecorView(); + // Hide the status bar and navigation bar + int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; + decorView.setSystemUiVisibility(uiOptions); + } + +} \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/Networking.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/Networking.java new file mode 100644 index 0000000..db0e6f2 --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/Networking.java @@ -0,0 +1,76 @@ +package com.example.fitbot.util; + +import android.content.Context; +import android.net.wifi.WifiManager; +import android.os.AsyncTask; +import android.util.Log; + +import java.io.OutputStream; +import java.math.BigInteger; +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.URL; +import java.net.UnknownHostException; +import java.nio.ByteOrder; +import java.nio.charset.StandardCharsets; + +public class Networking { + + public static void sendIpAddress(final Context context) { + new AsyncTask() { + @Override + protected Void doInBackground(Void... params) { + String ipAddress = getIPAddress(context); + String jsonInputString = "{\"ip\":\"" + + ipAddress + + "\"}"; + + byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8); + HttpURLConnection conn = null; + try { + URL url = new URL("http://145.92.8.132:443/set-ip"); // Replace with your Node server URL + conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Content-Type", "application/json"); + conn.setDoOutput(true); + + OutputStream os = conn.getOutputStream(); + os.write(input, 0, input.length); + os.close(); + + int responseCode = conn.getResponseCode(); + Log.i("NetworkUtils", "Response Code: " + responseCode); + } catch (Exception e) { + Log.e("NetworkUtils", "Error sending IP address", e); + } finally { + if (conn != null) { + conn.disconnect(); + } + } + return null; + } + }.execute(); + } + + + private static String getIPAddress(Context context) { + WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE); + int ipAddress = wifiManager.getConnectionInfo().getIpAddress(); + + // Convert little-endian to big-endian if needed + if (ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)) { + ipAddress = Integer.reverseBytes(ipAddress); + } + + byte[] ipByteArray = BigInteger.valueOf(ipAddress).toByteArray(); + + String ip = ""; + try { + ip = InetAddress.getByAddress(ipByteArray).getHostAddress(); + } catch (UnknownHostException ex) { + Log.e("WIFIIP", "Unable to get host address."); + } + + return ip; + } +} \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/AnglePath.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/AnglePath.java new file mode 100644 index 0000000..e9b1bf4 --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/AnglePath.java @@ -0,0 +1,69 @@ +package com.example.fitbot.util.path; + +import com.example.fitbot.exercise.ExerciseManager; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import org.joml.Vector3f; + +public class AnglePath { + + // The angles + private final Vector3f[] angles; + + /** + * Create a new gesture path with a given set of vectors and curvature. + * + * @param angles The vectors that make up the path. + */ + public AnglePath(Vector3f[] angles) { + this.angles = angles; + } + + /** + * Method for retrieving the vectors of the GesturePath. + */ + public Vector3f[] getAngleVectors() { + return this.angles; + } + + /** + * Function for converting a string to a GesturePath object. + * This function has been updated to convert Json strings to AnglePath objects. + * The JSON must be in the following format: + * [ + * { "deviceId": number, "data": [ [x, y, z], [x, y, z], ... ] }, + * ] + * + * @param jsonInput The string to convert + * @return The AnglePath object + */ + + public static AnglePath[] fromString(String jsonInput) { + if (jsonInput == null) + throw new IllegalArgumentException("Input string cannot be null"); + + JsonElement parsed = JsonParser.parseString(jsonInput); + if (!parsed.isJsonArray()) + throw new IllegalArgumentException("Input string must be a JSON array"); + + if ( parsed.getAsJsonArray().size() != ExerciseManager.SENSOR_COUNT) + throw new IllegalArgumentException("Input string must contain 2 elements"); + + Vector3f[][] angles = new Vector3f[ExerciseManager.SENSOR_COUNT][]; + + for ( int dataArrayIdx = 0; dataArrayIdx < parsed.getAsJsonArray().size(); dataArrayIdx++) + { + JsonArray array = parsed.getAsJsonArray().get(dataArrayIdx).getAsJsonObject().get("data").getAsJsonArray(); + int deviceIdx = parsed.getAsJsonArray().get(dataArrayIdx).getAsJsonObject().get("deviceId").getAsInt(); + angles[deviceIdx] = new Vector3f[array.size()]; + for (int i = 0; i < array.size(); i++) { + JsonArray vec = array.get(i).getAsJsonArray(); + angles[deviceIdx][i] = new Vector3f(vec.get(0).getAsFloat(), vec.get(1).getAsFloat(), vec.get(2).getAsFloat()); + } + } + return new AnglePath[] {new AnglePath(angles[0]), new AnglePath(angles[1])}; + } +} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/GesturePath.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/GesturePath.java deleted file mode 100644 index 79b7eaf..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/GesturePath.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.example.fitbot.util.path; - -import org.joml.Vector3f; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class GesturePath { - - // The vectors that make up the path. - private final PathSegment[] segments; - - /** - * Create a new gesture path with a given set of vectors and curvature. - * - * @param vectors The vectors that make up the path. - */ - public GesturePath(Vector3f[] vectors) - { - if ( vectors.length < 2) - throw new IllegalArgumentException("A path must have at least two points."); - - this.segments = new PathSegment[vectors.length - 1]; - for ( int i = 0; i < vectors.length - 1; i++) - segments[i] = new PathSegment(vectors[i], vectors[i + 1]); - } - - /** - * Constructor for a GesturePath with provided PathSegments. - * @param segments The PathSegments to initialize the path with. - */ - public GesturePath(PathSegment... segments) { - this.segments = segments; - } - - /** - * Getter method for retrieving the path segments of this GesturePath. - * - * @return The path segments. - */ - public PathSegment[] getSegments() { - return segments; - } - - /** - * Method for retrieving the vectors of the GesturePath. - */ - public Vector3f[] getVectors() - { - Vector3f[] vectors = new Vector3f[segments.length + 1]; - vectors[0] = segments[0].getStart(); - for ( int i = 0; i < segments.length; i++) - vectors[i + 1] = segments[i].getEnd(); - - return vectors; - } - - /** - * Method for retrieving the closest path segment to a reference point. - * - * @param reference The reference point to find the closest path segment to. - * @return The closest path segment to the reference point. - */ - public PathSegment closest(Vector3f reference) { - // If there's only one segment, return that one. - if ( segments.length == 1) - return segments[0]; - - PathSegment closest = segments[0]; - for ( int i = 1; i < segments.length; i++) - closest = PathSegment.closer(closest, segments[i], reference); - - return closest; - } - - /** - * Get the error between an arbitrary path segment and the reference point. - * - * @param referencePoint The reference point to calculate the error of. - * @return The error offset between the path and the reference point. - */ - public double getError(Vector3f referencePoint) { - return closest(referencePoint).difference(referencePoint); // Get the closest segment and calculate the error. - } - - - /** - * Function for converting a string to a GesturePath object. - * The input string bytes will be directly converted into 3d vectors. - * Every scalar is composed of 32 bits (4 characters), meaning 96 bits per vector. - * - * Note: ASCII to Vector conversion is done in Big Endian format (most significant byte first). - * - * @param input The string to convert - * @return The GesturePath object - */ - - public static GesturePath fromString(String input) { - byte[] bytes = input.getBytes(); - - // Check if the input string contains a valid amount of bytes (12 bytes per vector) - if (input.length() % 12 != 0) { - throw new IllegalArgumentException("Invalid input string length"); - } - Vector3f[] vectors = new Vector3f[input.length() / 12]; - - float[] xyz = new float[3]; - for (int i = 0; i < bytes.length; i += 12) { - for (int j = 0; j < 3; j++) { - - xyz[j] = Float.intBitsToFloat( - (bytes[i + j * 4] & 0xFF) << 24 | - (bytes[i + j * 4 + 1] & 0xFF) << 16 | - (bytes[i + j * 4 + 2] & 0xFF) << 8 | - (bytes[i + j * 4 + 3] & 0xFF) - ); - } - vectors[i / 12] = new Vector3f(xyz[0], xyz[1], xyz[2]); - } - return new GesturePath(vectors); - } -} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/PathSegment.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/PathSegment.java index 11183ca..4fc9984 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/PathSegment.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/path/PathSegment.java @@ -12,7 +12,7 @@ public class PathSegment { * pointing straight upwards relative to the line, with a curvature of 0.0. * * @param start The starting point of the line segment - * @param end The end point of the line segment. + * @param end The end point of the line segment. */ public PathSegment(Vector3f start, Vector3f end) { this.start = start; @@ -25,7 +25,7 @@ public class PathSegment { * depending on the curvature of the curve. If the curvature is unset, or set to 0 * then this method will use linear interpolation. Otherwise, it will use a curve. * - * @param t The interpolation value between 0 and 1. + * @param t The interpolation value between 0 and 1. */ public Vector3f interpolate(double t) { return new Vector3f(this.start) @@ -56,7 +56,7 @@ public class PathSegment { (float) (this.start.x + t * (this.end.x - this.start.x)), (float) (this.start.y + t * (this.end.y - this.start.y)), (float) (this.start.z + t * (this.end.z - this.start.z)) - )); + )); } /** @@ -84,7 +84,7 @@ public class PathSegment { * @return The distance to the closest point on the path segment. */ public double distance(Vector3f reference) { - if ( this.start.distanceSquared(reference) > this.end.distanceSquared(reference)) + if (this.start.distanceSquared(reference) > this.end.distanceSquared(reference)) return this.end.distance(reference); return this.start.distance(reference); } @@ -92,8 +92,8 @@ public class PathSegment { /** * Function for returning the closest path segment to a reference point. * - * @param first The first path segment to compare. - * @param second The second path segment to compare. + * @param first The first path segment to compare. + * @param second The second path segment to compare. * @param referencePoint The reference point to compare to. * @return The closest path segment to the reference point. */ diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IInputHandler.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IInputHandler.java index 12cb7db..9d265fd 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IInputHandler.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IInputHandler.java @@ -4,11 +4,12 @@ import org.joml.Vector3f; public interface IInputHandler { - /** - * Function for accepting motion data and the transformed vector. - * @param rotationVector The rotation vector of the motion data. - * @param sensorId The sensor ID of the motion data. - */ - void accept(Vector3f rotationVector, int sensorId); + /** + * Function for accepting motion data and the transformed vector. + * + * @param rotationVector The rotation vector of the motion data. + * @param sensorId The sensor ID of the motion data. + */ + void accept(Vector3f rotationVector, int sensorId); } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java index dbca4df..c3fc778 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java @@ -1,70 +1,232 @@ package com.example.fitbot.util.processing; +import android.app.ActivityManager; import android.util.Log; import com.example.fitbot.exercise.Exercise; +import com.example.fitbot.exercise.ExerciseManager; +import com.example.fitbot.pepper.Pepper; +import com.example.fitbot.ui.activities.EndScreenActivity; +import com.example.fitbot.ui.activities.FitnessActivity; +import com.example.fitbot.ui.activities.MainActivity; +import com.example.fitbot.util.NavigationManager; import com.example.fitbot.util.server.WebServer; +import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.jetbrains.annotations.NotNull; import org.joml.Vector3f; +import org.json.JSONArray; + +import java.util.ArrayList; +import java.util.List; public class InputProcessor { - private Vector3f[][] selfRotationVectorPaths; // Relative path of the motion data + private List[] selfRotationVectorPaths = null; // Relative path of the motion data private Vector3f[][] targetRotationVectorPaths; // Target path of the motion data - private final float sampleRate; // The sample rate of the motion sensor - private float exerciseDuration; + private float exerciseRepetitionDurationInSeconds = 0.0f; + private int exercisesRemaining = 1; + + private float errorCheckInterval_s; + private int checksPerformed = 0; + private int totalChecks = 0; + + private final FitnessActivity parentActivity; + + /** + * The phrases that are said by the robot whenever the exercise starts. + */ + private static final String[] STARTING_PHRASES = { + "Veel success met de oefening!", + "Je kan het!", + "Veel plezier!" + }; + + /** + * This field is used to determine if the motion data is being recorded. + * If this is the case, instead of functioning normally, the element + * will record the movement that the user makes, store it in the + * `selfRotationVectorPaths` field and send it to the server. + */ + private boolean recordingMovement = false; + + /** + * Represents the duration of the recording in seconds. + * This field only has effect when the `recordingMovement` field is set to true. + */ + private float recordingDurationInSeconds = 0.0f; // How many seconds have passed since the start of the exercise. // The exercise starts whenever the `startListening` function is called. private double secondsPassed = 0.0D; private long lastTime; - private IInputHandler motionDataConsumer = (rotationVector, deviceId) -> { - }; + private static final String[] REQUIRED_SENSOR_JSON_PROPERTIES = + {"rotationX", "rotationY", "rotationZ", "deviceId"}; + + // The web server that listens for incoming motion data. private WebServer server; /** * Constructor for the motion processor. - * - * @param paths The target paths of the motion data. - * The length of this array must be equal to the - * amount of sensors available. - * @param inputSampleRate The sample rate of the motion sensor. */ - public InputProcessor(Vector3f[][] paths, float exerciseTime, float inputSampleRate) { - selfRotationVectorPaths = new Vector3f[paths.length][(int) (exerciseTime * inputSampleRate)]; - targetRotationVectorPaths = paths; - - this.sampleRate = inputSampleRate; - this.exerciseDuration = exerciseTime; + public InputProcessor(FitnessActivity parentActivity) { + this.parentActivity = parentActivity; } /** * Function for setting the exercise to use. * This updates the user and target path and the * duration of the exercise. + *

+ * This function is only initially used to select the starting exercise; + * the exercises that follow are determined by a private method 'nextExercise' + * * @param exercise The exercise to use the paths for. */ public void useExercise(Exercise exercise) { - this.selfRotationVectorPaths = new Vector3f[2][(int) (exercise.exerciseTimeInSeconds * this.sampleRate)]; - this.targetRotationVectorPaths = new Vector3f[2][exercise.rightPath.getVectors().length]; - this.exerciseDuration = exercise.exerciseTimeInSeconds; - this.secondsPassed = 0.0D; - this.lastTime = System.currentTimeMillis(); + if (this.recordingMovement) + throw new IllegalStateException("Cannot change exercise while recording movement."); + + this.exercisesRemaining = 1; + this.nextExercise(exercise); + Pepper.say(STARTING_PHRASES[(int) Math.floor(Math.random() * STARTING_PHRASES.length)]); } /** - * Function for checking if the exercise has finished. - * @return True if the exercise has finished, false otherwise. + * Function that starts checking for user movement. + * This function will start a thread that will check for user movement + * and compare the last rotation vectors to the target rotation vectors. + */ + public void startCheckingUserMovement() { + // Error checking thread. + (new Thread(() -> { + Log.i("InputProcessor", "Movement Checking Thread started"); + + while (this.exercisesRemaining > 0) { + + if ( this.totalChecks == 0 || this.selfRotationVectorPaths == null + || this.selfRotationVectorPaths.length == 0 + || this.selfRotationVectorPaths[0].size() == 0 + || this.selfRotationVectorPaths[1].size() == 0) + continue; + + boolean isFaulty = this.isFaultyMovement(); + + Log.i("InputProcessor", "Movement checked: " + (isFaulty ? "Faulty" : "Good")); + + if (isFaulty) { + this.onInadequateRepetition(); + } else this.onAdequateRepetition(); + + this.checksPerformed++; + + if (this.checksPerformed >= this.totalChecks) + { + this.checksPerformed = 0; + this.exercisesRemaining--; + acquireExercise(); + } + + try { + Thread.sleep((long) (this.errorCheckInterval_s * 1000)); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + })).start(); + } + + /** + * Moves on to the next exercise without changing the remaining exercises. + * + * @param exercise The exercise to move on to. + */ + private void nextExercise(Exercise exercise) { + //TODO: Remove when more than one exercise + if (this.exercisesRemaining <= 0) { + Log.i("InputProcessor", "Moving to end screen; finished all exercises"); + // Move to end screen on main activity + this.parentActivity.runOnUiThread(() -> NavigationManager.navigateToActivity(this.parentActivity, EndScreenActivity.class)); + return; + } + + Log.i("InputProcessor", "Acquired next exercise: " + exercise.name); + ExerciseManager.TOTAL_REPETITIONS_REQUIRED += ExerciseManager.DEFAULT_EXERCISE_REPETITIONS; + ExerciseManager.TOTAL_EXERCISES_PREFORMED++; + + this.checksPerformed = 0; + this.totalChecks = ExerciseManager.DEFAULT_EXERCISE_REPETITIONS * 6; + + this.selfRotationVectorPaths = new ArrayList[2]; + this.selfRotationVectorPaths[0] = new ArrayList<>(); + this.selfRotationVectorPaths[1] = new ArrayList<>(); + + this.targetRotationVectorPaths = new Vector3f[2][exercise.rightPath.getAngleVectors().length]; + this.targetRotationVectorPaths[0] = exercise.leftPath.getAngleVectors(); + this.targetRotationVectorPaths[1] = exercise.rightPath.getAngleVectors(); + this.exerciseRepetitionDurationInSeconds = exercise.exerciseTimeInSeconds; + this.secondsPassed = 0.0D; + this.lastTime = System.currentTimeMillis(); + + Log.i("InputProcessor", "Repetition time: " + exercise.exerciseTimeInSeconds); + this.exerciseRepetitionDurationInSeconds = Math.max(this.exerciseRepetitionDurationInSeconds, 2); + this.errorCheckInterval_s = exercise.exerciseTimeInSeconds / 3.0f; + Log.i("InputProcessor", "Exercise error checking interval: " + this.errorCheckInterval_s); + } + + /** + * Method that is called whenever the user performs a good repetition. + */ + public void onAdequateRepetition() { + ExerciseManager.TOTAL_REPETITIONS_PERFORMED++; + Log.i("InputProcessor", "Adequate repetition performed"); + this.parentActivity.runOnUiThread(this.parentActivity::incrementProgress); + } + + /** + * Method that is called whenever the user performs a bad repetition. + */ + public void onInadequateRepetition() { + Log.i("InputProcessor", "Inadequate repetition performed"); + this.parentActivity.runOnUiThread(() -> this.parentActivity.triggerColorBurst(false)); + } + + /** + * Function for setting whether the motion data + * should be recorded or not. + * + * @param recording Whether the motion data should be recorded. + * @param duration For how long the motion data should be recorded. + * This only has an effect if `recording` is true. + */ + public void setRecording(boolean recording, float duration) { + this.recordingMovement = recording; + this.recordingDurationInSeconds = duration; + if (recording) { + this.secondsPassed = 0.0D; + this.lastTime = System.currentTimeMillis(); + this.selfRotationVectorPaths[0] = new ArrayList<>(); + this.selfRotationVectorPaths[1] = new ArrayList<>(); + } + } + + /** + * Function for checking if the exercise or recording has finished. + * This function will return true if the execution of the exercise has finished or + * if the recording has finished, depending on the state of the `recordingMovement` field. + * + * @return Whether the exercise or recording has finished. */ public boolean hasFinished() { - return this.secondsPassed >= this.exerciseDuration; + return this.recordingMovement ? + (this.secondsPassed >= this.recordingDurationInSeconds) : + (this.secondsPassed >= this.exerciseRepetitionDurationInSeconds); } /** @@ -88,6 +250,30 @@ public class InputProcessor { } } + /** + * Function for acquiring the next exercise from the database. + * Upon successful retrieval, it will call the nextExercise method. + */ + private void acquireExercise() { + + if ( this.exercisesRemaining <= 0) + { + Log.i("InputProcessor", "Exercises finished"); + this.parentActivity.runOnUiThread(() -> { + NavigationManager.navigateToActivity(this.parentActivity, EndScreenActivity.class); + }); + return; + } + + Log.i("MotionProcessor", "Fetching exercise data."); + + this.parentActivity.fetchExerciseAsync(this::nextExercise, (nil) -> { + + Log.i("MotionProcessor", "Failed to fetch exercise data."); + + }); + } + /** * Function for stopping the listening process * of the motion sensor. This function will stop @@ -109,6 +295,9 @@ public class InputProcessor { try { + Log.i("MotionProcessor", "Time passed: " + this.secondsPassed + "s"); + if (this.recordingMovement) + Log.i("MotionProcessor", this.secondsPassed + " / " + this.recordingDurationInSeconds); Log.i("MotionProcessor", "Received packet data: " + data); JsonElement json = JsonParser.parseString(data); @@ -118,23 +307,20 @@ public class InputProcessor { JsonObject object = json.getAsJsonObject(); - String[] required = { - "rotationX", "rotationY", "rotationZ", - "type", - "deviceId" - }; - // Ensure all properties are present in the received JSON object - for (String s : required) { + for (String s : REQUIRED_SENSOR_JSON_PROPERTIES) { if (!object.has(s)) return; } // Parse the data - Vector3f rotation = new Vector3f(object.get("rotationX").getAsFloat(), object.get("rotationY").getAsFloat(), object.get("rotationZ").getAsFloat()); + Vector3f rotation = new Vector3f( + object.get("rotationX").getAsFloat(), + object.get("rotationY").getAsFloat(), + object.get("rotationZ").getAsFloat()); int deviceId = object.get("deviceId").getAsInt(); - String type = object.get("type").getAsString(); + // Parse the retrieved data parseRotationVector(rotation, deviceId); } catch (Exception e) { Log.i("MotionProcessor", "Failed to parse packet data."); @@ -152,85 +338,112 @@ public class InputProcessor { // Re-calculate time for index calculation secondsPassed = (System.currentTimeMillis() - lastTime) / 1000.0d; - lastTime = System.currentTimeMillis(); + // Supposed index of the current rotation vector in the `rotationVectorPaths` array - int selfIndex = (int) (secondsPassed * sampleRate); + this.selfRotationVectorPaths[deviceId].add(rotation); - motionDataConsumer.accept(rotation, deviceId); - if (selfIndex >= selfRotationVectorPaths[deviceId].length || selfIndex < 0) - return; + if (this.recordingMovement && this.secondsPassed >= this.recordingDurationInSeconds) { + // Do something with the recorded data. + this.recordingMovement = false; + // Convert recorded data from `selfRotationVectorPaths` to string, and + // publish to database, or do something else with it. - selfRotationVectorPaths[deviceId][selfIndex] = rotation; + String converted = convertRecordedDataToString(); + //split string into 4 to print it fully in console + final int quarter = converted.length() / 4; + String[] parts = { + converted.substring(0, quarter), + converted.substring(quarter, 2 * quarter), + converted.substring(2 * quarter, 3 * quarter), + converted.substring(3 * quarter) + }; + Log.i("MotionProcessor", "Converted data: "); + Log.i("ProcessedData", parts[0]); + Log.i("ProcessedData", parts[1]); + Log.i("ProcessedData", parts[2]); + Log.i("ProcessedData", parts[3]); + + + } + + // Do something else with the vector + Log.i("MotionProcessor", "Rotation vector: " + rotation.toString() + " from device: " + deviceId); + + // Whenever the exercise has finished and it's not recording, + // attempt to move to the next exercise. + // If this fails, navigate back to the main activity. + if (this.hasFinished() && !this.recordingMovement) + acquireExercise(); } } /** - * Method for getting the current progress of the exercise. - * The return value will range between 0.0 and 1.0. + * Function for converting the recorded data to a string. + * This function will convert the recorded data to a string + * that can be sent to a database or other storage. * - * @return The current progress of the exercise. + * @return The converted string. */ - public double getCurrentProgress() - { - return secondsPassed / exerciseDuration; - } + private String convertRecordedDataToString() { + int[] intBits = new int[3]; + char[] vectorChars = new char[12]; // 4 bytes per scalar, 12 chars per vector + JsonArray jsonArray = new JsonArray(); + /* + * Convert to JSON array in the following format: + * [ { "deviceId": number, "data": [ [x, y, z], [x, y, z], ... ] }] + */ - /** - * Function for setting the motion data receiver. - * - * @param consumer The consumer to set. - */ - public void setInputHandler(IInputHandler consumer) { - if (consumer != null) - this.motionDataConsumer = consumer; - } + // Iterate over all devices. In the current instance, it's 2. + for (int deviceId = 0; deviceId < selfRotationVectorPaths.length; deviceId++) { + JsonObject jsonDeviceObject = new JsonObject(); + jsonDeviceObject.addProperty("deviceId", deviceId); - /** - * Function for getting the error offsets of the user's path compared to the - * target path at a given point in time. - * - * @param sensorId The sensor ID to get the error offsets from. - * @param time The time to get the error offsets from. - * This value must be >= 0 && <= exerciseTime, otherwise - * the error will be 0 by default. - * @return A list of error offsets of the motion data compared to the reference path. - */ - public double getError(int sensorId, float time) { + // Data array + JsonArray jsonDeviceDataArray = new JsonArray(); - // Ensure the sensor ID is within the bounds of the array - if (sensorId < 0 || sensorId >= selfRotationVectorPaths.length) - return 0.0d; + for (Vector3f vector : selfRotationVectorPaths[deviceId]) { + JsonArray jsonScalarArray = new JsonArray(); + jsonScalarArray.add(vector.x); + jsonScalarArray.add(vector.y); + jsonScalarArray.add(vector.z); + jsonDeviceDataArray.add(jsonScalarArray); + } + jsonDeviceObject.add("data", jsonDeviceDataArray); - // Index of the current rotation vector - int targetIndex = (int) ((this.exerciseDuration / this.targetRotationVectorPaths[sensorId].length) * time); - int selfIndex = (int) (this.selfRotationVectorPaths[sensorId].length / this.sampleRate * time); - - // Ensure the indexes are within the bounds of the array - if (targetIndex >= 0 && targetIndex <= this.targetRotationVectorPaths[sensorId].length - 1 && - selfIndex >= 0 && selfIndex <= this.selfRotationVectorPaths[sensorId].length - 1) - { - return this.selfRotationVectorPaths[sensorId][selfIndex].distance(this.targetRotationVectorPaths[sensorId][targetIndex]); + jsonArray.add(jsonDeviceObject); } - return 0.0d; + return jsonArray.toString(); } /** - * Method for getting the average error of the motion data - * compared to the reference path. - * - * @param sensorId The sensor ID to get the error offsets from. - * @return The average error of the motion data compared to the reference path. + * Function for checking whether the last movement was faulty */ - public double getAverageError(int sensorId) { - double error = 0; - for (int i = 0; i < this.exerciseDuration; i++) { - error += getError(sensorId, i); + public boolean isFaultyMovement() { + boolean upMovementDetected = false; + boolean downMovementDetected = false; + + for (List path : selfRotationVectorPaths) { + if (path.size() < 2) { + continue; // Skip if there are not enough points to compare + } + + Vector3f firstPoint = path.get(0); + Vector3f lastPoint = path.get(path.size() - 1); + + float y1 = firstPoint.y; + float y2 = lastPoint.y; + + if (y2 > y1) { + upMovementDetected = true; + } else if (y2 < y1) { + downMovementDetected = true; + } + + if (upMovementDetected && downMovementDetected) { + return false; // Return false for faulty movement if both up and down movements are detected + } } - return error / this.exerciseDuration; - } - - public float secondsPassed() { - return (float) secondsPassed; - } -} + + return true; // Return true for faulty movement if only up or down movement is detected + }} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/IWebServerHandler.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/IWebServerHandler.java index 98739b4..67327cb 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/IWebServerHandler.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/IWebServerHandler.java @@ -1,7 +1,5 @@ package com.example.fitbot.util.server; -import java.net.Socket; - /** * Interface for handling WebSocket events. */ diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java index 6eaf4dc..87dc331 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java @@ -10,16 +10,13 @@ import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; public class WebServer implements Runnable { private ServerSocket serverSocket; - protected IWebServerHandler eventHandler = (input) -> {}; // No-op. + protected IWebServerHandler eventHandler = (input) -> { + }; // No-op. private Thread thread; private final AtomicBoolean forceClose = new AtomicBoolean(false); @@ -84,7 +81,7 @@ public class WebServer implements Runnable { String[] data = builder.toString().split("\n\n"); - if ( data.length > 1) { // Check if the data is valid. + if (data.length > 1) { // Check if the data is valid. this.eventHandler.onReceive(data[1]); } diff --git a/code/src/Fitbot/app/src/main/res/drawable/help_background.xml b/code/src/Fitbot/app/src/main/res/drawable/border_background.xml similarity index 77% rename from code/src/Fitbot/app/src/main/res/drawable/help_background.xml rename to code/src/Fitbot/app/src/main/res/drawable/border_background.xml index 7ea69e6..3d0d3c1 100644 --- a/code/src/Fitbot/app/src/main/res/drawable/help_background.xml +++ b/code/src/Fitbot/app/src/main/res/drawable/border_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml b/code/src/Fitbot/app/src/main/res/drawable/border_background_2.xml similarity index 76% rename from code/src/Fitbot/app/src/main/res/drawable/help2_background.xml rename to code/src/Fitbot/app/src/main/res/drawable/border_background_2.xml index 0fb955b..408d16b 100644 --- a/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml +++ b/code/src/Fitbot/app/src/main/res/drawable/border_background_2.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml b/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml new file mode 100644 index 0000000..4543b55 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/border_background_circle.xml b/code/src/Fitbot/app/src/main/res/drawable/border_background_circle.xml new file mode 100644 index 0000000..df55912 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/border_background_circle.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml b/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml new file mode 100644 index 0000000..071825e --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/fitbot_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml new file mode 100644 index 0000000..72f8573 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml new file mode 100644 index 0000000..17255b7 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml new file mode 100644 index 0000000..df12462 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml @@ -0,0 +1,5 @@ + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_48.xml new file mode 100644 index 0000000..15875d1 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_skip_next_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_skip_next_48.xml new file mode 100644 index 0000000..400f0a5 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_skip_next_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml index 3050a42..3a8cd35 100644 --- a/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/progress_circle.xml b/code/src/Fitbot/app/src/main/res/drawable/progress_circle.xml new file mode 100644 index 0000000..590b046 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/progress_circle.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/progress_circle_bad.xml b/code/src/Fitbot/app/src/main/res/drawable/progress_circle_bad.xml new file mode 100644 index 0000000..b53b748 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/progress_circle_bad.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/progress_circle_good.xml b/code/src/Fitbot/app/src/main/res/drawable/progress_circle_good.xml new file mode 100644 index 0000000..d291a88 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/progress_circle_good.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml index 6983a91..a087a43 100644 --- a/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml +++ b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml @@ -2,7 +2,7 @@ @@ -24,10 +25,10 @@ android:layout_gravity="center" android:layout_marginTop="20dp" android:layout_marginBottom="40dp" - android:background="@drawable/help_background" + android:background="@drawable/border_background_3" android:orientation="vertical" - android:paddingVertical="15dp" android:paddingHorizontal="20dp" + android:paddingVertical="15dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -40,11 +41,11 @@ - - - - - + android:textAlignment="center" /> @@ -85,8 +66,8 @@ android:id="@+id/homeButtonEndScreen" android:layout_width="150dp" android:layout_height="75dp" - android:layout_marginEnd="280dp" - android:layout_marginBottom="30dp" + android:layout_marginEnd="404dp" + android:layout_marginBottom="48dp" android:background="@drawable/red_button_gradient" android:drawableTop="@drawable/ic_baseline_home_48" android:drawableTint="@color/white" @@ -94,20 +75,4 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> -