From 8e7b8dbafe3e2c2ab625f06d20608ebb6b824760 Mon Sep 17 00:00:00 2001
From: SebasKoedam <Sebas@koedam.info>
Date: Wed, 5 Jun 2024 13:43:11 +0200
Subject: [PATCH] added exercise rep increment to input processor

---
 .../fitbot/ui/activities/FitnessActivity.java     |  6 ++----
 .../fitbot/util/processing/InputProcessor.java    |  5 ++---
 .../app/src/main/res/layout/activity_fitness.xml  | 15 +++------------
 .../Fitbot/app/src/main/res/values/strings.xml    |  4 ++--
 4 files changed, 9 insertions(+), 21 deletions(-)

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 e01867a..5b4575e 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
@@ -90,9 +90,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
 
         progressCircle = findViewById(R.id.progressCircle);
         progressText = findViewById(R.id.progressText);
-
         progressCircle.setMax(maxProgress);
-        updateProgress();
 
         // Set color of loading circle
         ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
@@ -266,7 +264,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
         dialog.show();
     }
 
-    public void incrementProgress(View view) {
+    public void incrementProgress() {
         if (progress < maxProgress) {
             progress++;
             triggerColorBurst(true);
@@ -279,7 +277,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
         progressText.setText(progress + "/" + maxProgress);
     }
 
-    private void triggerColorBurst(boolean isGoodRep) {
+    public void triggerColorBurst(boolean isGoodRep) {
 
         if (isGoodRep) {
             progressCircle.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progress_circle_good));
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 6a3fd8a..30604fc 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
@@ -130,15 +130,14 @@ public class InputProcessor {
      */
     public void onAdequateRepetition() {
         ExerciseManager.TOTAL_REPETITIONS_PERFORMED++;
-        // TODO: Add animation for correct repetition
+        new FitnessActivity().incrementProgress();
     }
 
     /**
      * Method that is called whenever the user performs a bad repetition.
      */
     public void onInadequateRepetition() {
-
-        // TODO: Add animation for wrong repetition
+        new FitnessActivity().triggerColorBurst(false);
     }
 
     /**
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
index b33ef19..641d8d9 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
@@ -77,7 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="@string/title"
+            android:text="@string/exerciseTitle"
             android:textAlignment="center" />
 
         <LinearLayout
@@ -93,20 +93,11 @@
                 style="@style/TextStyleDesc"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="@string/context"
+                android:text="@string/exerciseDesc"
                 android:textAlignment="center" />
         </LinearLayout>
 
 
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/progressText"
-            android:layout_gravity="center"
-            android:layout_marginTop="20dp"
-            android:onClick="incrementProgress"
-            android:text="Increment" />
-
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -123,7 +114,7 @@
                 android:layout_gravity="center"
                 android:indeterminate="false"
                 android:max="10"
-                android:progress="10"
+                android:progress="0"
                 android:progressDrawable="@drawable/progress_circle" />
 
             <TextView
diff --git a/code/src/Fitbot/app/src/main/res/values/strings.xml b/code/src/Fitbot/app/src/main/res/values/strings.xml
index db32e16..3b473fe 100644
--- a/code/src/Fitbot/app/src/main/res/values/strings.xml
+++ b/code/src/Fitbot/app/src/main/res/values/strings.xml
@@ -24,8 +24,8 @@
     <string name="score">Score:</string>
 
     <string name="title">Title</string>
-    <string name="context">ContextContextContext</string>
 
+    <string name="exerciseDesc">Exercise description</string>
     <string name="description">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</string>
-    <string name="descriptionTitle">Description</string>
+    <string name="exerciseTitle">Exercise title</string>
 </resources>
\ No newline at end of file