Commit Graph

  • 7782722310 Removed ExerciseStatusElement.java, moved all functionality to InputProcessor.java Luca Warmenhoven 2024-06-05 12:49:39 +02:00
  • 8547fa563f Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-06-05 12:23:33 +02:00
  • 2a0a08ee9e added progress circle with feedback to user how well they do the rep SebasKoedam 2024-06-05 12:23:30 +02:00
  • d46db1a525 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-05 11:44:57 +02:00
  • 20a2887401 Added JSON parsing for path instead of binary decoding Luca Warmenhoven 2024-06-05 11:44:52 +02:00
  • 69003476ed Added correct file name extensions Sam Hos 2024-06-05 11:38:24 +02:00
  • 4750b675f8 Update documentation Sam Hos 2024-06-05 11:37:50 +02:00
  • 0410b23c0d Fixed typo in FitnessActivity Luca Warmenhoven 2024-06-05 11:30:44 +02:00
  • ae52d10041 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-05 11:30:03 +02:00
  • f69fbe8e5b Updated InputProcessor's convertRecordedDataToString to JSON output, updated GesturePath -> AnglePath Luca Warmenhoven 2024-06-05 11:29:32 +02:00
  • ef7e7ae55c Updated infrastructure-design.md Luca Warmenhoven 2024-06-04 17:40:02 +02:00
  • cac78aecb8 Updated documentation Luca Warmenhoven 2024-06-04 17:27:27 +02:00
  • 1e3388a2c4 Updated documentation Luca Warmenhoven 2024-06-04 17:10:11 +02:00
  • 18d64ba24b Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-04 16:58:10 +02:00
  • 4dad284ba0 Updated documentation Luca Warmenhoven 2024-06-04 16:58:06 +02:00
  • e75551671a added working loading circle SebasKoedam 2024-06-04 16:24:54 +02:00
  • ad83c7e450 added loading icon while video is getting fetched SebasKoedam 2024-06-04 15:20:47 +02:00
  • 8a02bf1daa Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-06-04 15:16:23 +02:00
  • 62c97c3475 updated UI SebasKoedam 2024-06-04 15:16:21 +02:00
  • f4b11dd4ee Updated documentation Luca Warmenhoven 2024-06-04 14:48:58 +02:00
  • 7aaa2da981 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-04 14:43:06 +02:00
  • 3f560d9f47 Updated documentation Luca Warmenhoven 2024-06-04 14:42:30 +02:00
  • 8cd2b00eb0 Fix automatic ip adress esp Sam Hos 2024-06-04 14:40:06 +02:00
  • 7539892131 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-06-04 14:39:33 +02:00
  • af0cdf43de Reflectieopdracht Sam Hos 2024-06-04 14:39:10 +02:00
  • 79a96bc193 Fixed order Luca Warmenhoven 2024-06-04 14:18:04 +02:00
  • 67fece4e2e Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-06-04 14:16:19 +02:00
  • d604a6ef84 chore: Update Fitbot launcher background color SebasKoedam 2024-06-04 14:16:17 +02:00
  • f64d7ff34e armraise Niels Gras 2024-06-04 13:47:02 +02:00
  • 13b2b2f821 Fixed description size SebasKoedam 2024-06-04 12:58:14 +02:00
  • c0aa0b46e9 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-06-04 12:31:30 +02:00
  • 19e50eefea Refactor database query to fetch a specific exercise by ExerciseID SebasKoedam 2024-06-04 12:31:29 +02:00
  • ed1097bc00 added expert docs Niels Gras 2024-06-04 12:18:43 +02:00
  • ae479087f7 ideas for fitbord docs Niels Gras 2024-06-04 12:17:36 +02:00
  • 761de7955d Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Niels Gras 2024-06-04 12:02:31 +02:00
  • 398389aa5e added comments and optimized code SebasKoedam 2024-06-04 11:32:05 +02:00
  • 0c98744bdd fix crashes and video player, changed loading elements to UI thread Sam Hos 2024-06-04 11:25:49 +02:00
  • cd00d36166 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-06-04 10:33:43 +02:00
  • 3b65fffec8 motion processing stuff + logs + fix crash (luca) Sam Hos 2024-06-04 10:31:24 +02:00
  • 2118680b27 removed wrong conclusion Niels 2024-06-04 00:04:58 +02:00
  • 3cfea7fc6f added the research? Niels 2024-06-04 00:03:55 +02:00
  • 930553ffea added dataprotocol research Niels 2024-06-04 00:03:34 +02:00
  • 4273a43a1a fixed squat Niels Gras 2024-06-03 16:30:07 +02:00
  • d0d09aa2d2 Refactor FitnessActivity code to remove commented out video playback function SebasKoedam 2024-06-03 16:28:56 +02:00
  • 77875c45d6 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-06-03 16:25:36 +02:00
  • 46ba5dbdbd video will now be displayed with link from database SebasKoedam 2024-06-03 16:25:35 +02:00
  • ffb90c001d Refactoring Sam Hos 2024-06-03 16:17:27 +02:00
  • 452aad6929 added squat Niels Gras 2024-06-03 15:59:26 +02:00
  • 296d2f0fbf changed movement Niels Gras 2024-06-03 15:51:17 +02:00
  • 7264811444 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Niels Gras 2024-06-03 15:32:34 +02:00
  • d167aed8a6 added sound Niels Gras 2024-06-03 15:32:31 +02:00
  • 328cd2402a Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-03 15:24:20 +02:00
  • 18ec63fcd1 Updated some stuff Luca Warmenhoven 2024-06-03 15:23:57 +02:00
  • d46c0a8a92 changed file name Niels Gras 2024-06-03 15:18:59 +02:00
  • 10b0421f90 Infrastructure update Sam Hos 2024-06-03 15:05:25 +02:00
  • e0794522b6 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-06-03 14:55:39 +02:00
  • f90bfb4d6e Update infrastructure Sam Hos 2024-06-03 14:55:36 +02:00
  • b1bbe9531b Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-03 14:55:27 +02:00
  • 627b50f7d5 Updated some stuff Luca Warmenhoven 2024-06-03 14:55:24 +02:00
  • f4fd183408 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-06-03 14:55:14 +02:00
  • 85c6e4e918 feat: Add short description field to Exercise class SebasKoedam 2024-06-03 14:55:13 +02:00
  • 33a2f1ed70 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-06-03 14:48:26 +02:00
  • 9639d6ba3b hardware docs update Sam Hos 2024-06-03 14:48:18 +02:00
  • 902cc184ee added arm circle movement Niels Gras 2024-06-03 14:47:51 +02:00
  • c0d002c46b Luca's attempt at fixing app Sam Hos 2024-06-03 14:47:31 +02:00
  • 7574a3eaea Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Niels Gras 2024-06-03 14:32:00 +02:00
  • f1464653b0 added comments Niels Gras 2024-06-03 14:31:39 +02:00
  • 456b959c5e Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-06-03 14:28:42 +02:00
  • baffe8b9ac chore: Update activity_fitness.xml layout and fix bug in ExerciseManager SebasKoedam 2024-06-03 14:28:00 +02:00
  • 926f369ff0 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-03 14:27:34 +02:00
  • 868542dba9 Updated InputProcessor and FitnessActivity, fixed some issues. Luca Warmenhoven 2024-06-03 14:26:17 +02:00
  • 53bc94aba3 Fixed it so it only pulls the ip once Sam Hos 2024-06-03 14:21:42 +02:00
  • c084443799 Fixed database request handling Luca Warmenhoven 2024-06-03 14:13:06 +02:00
  • 9f2bb805f0 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-03 14:04:03 +02:00
  • 67860a6397 chore: Add transparent color to colors.xml, fix bug in incoming_request_handlers.js, and add close button drawable and dialog layout files SebasKoedam 2024-06-03 14:03:48 +02:00
  • dde65dd2b9 small documentation for fitbord ideas Niels Gras 2024-06-03 13:51:57 +02:00
  • 882f07988d Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-06-03 13:41:59 +02:00
  • 517b5f8438 Why Luca Warmenhoven 2024-06-03 13:41:10 +02:00
  • ab6010d517 Hardware documentation Sam Hos 2024-06-03 13:17:23 +02:00
  • cad5c8508e Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-06-03 12:56:31 +02:00
  • 3145d3b3b0 Update esp server ip Sam Hos 2024-06-03 12:56:22 +02:00
  • b6353d15ba added endpoints for pepper and esp Sam Hos 2024-06-03 12:55:43 +02:00
  • 99c68fae9a Update server ip adres in app Sam Hos 2024-06-03 12:55:34 +02:00
  • fc41cea618 fitness layout finished SebasKoedam 2024-06-03 11:53:21 +02:00
  • 594d0b91d0 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-31 16:36:58 +02:00
  • eda0601228 Added permissions to android manifest Sam Hos 2024-05-31 16:36:05 +02:00
  • a080b6c737 Script to pass ip adres from pepper to esp Sam Hos 2024-05-31 16:35:41 +02:00
  • 333317a9de Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Niels Gras 2024-05-31 16:32:09 +02:00
  • b9b4a9ca9b chore: Update Connectivity class with fetchIPAddress method Niels Gras 2024-05-31 16:32:06 +02:00
  • 61dde95684 Added so pepper sends its ip to another ip Sam Hos 2024-05-31 16:07:39 +02:00
  • 92223fbf52 fitness activity SebasKoedam 2024-05-31 15:44:56 +02:00
  • 3db278f92c Add launcher background and icon resources Niels Gras 2024-05-31 13:06:11 +02:00
  • 8df96091b1 Merge remote-tracking branch 'origin/main' Niels Gras 2024-05-31 13:05:33 +02:00
  • 3a6edc2cf0 custom icon for app Niels Gras 2024-05-31 13:05:04 +02:00
  • 58b466dd27 opmaak SebasKoedam 2024-05-31 12:59:26 +02:00
  • bc3c720fc2 OOP Sam Hos 2024-05-31 12:58:04 +02:00
  • 28a49950ba change ending from going to mainscreen to endscreen Sam Hos 2024-05-31 12:57:57 +02:00
  • e35e7bf6c6 spatie weg SebasKoedam 2024-05-31 12:55:39 +02:00
  • d3404a8eb2 expert review prep SebasKoedam 2024-05-31 12:55:23 +02:00
  • 70b5b1078b Position tracking docs added SebasKoedam 2024-05-31 12:09:22 +02:00