Initial logic-planning

Co-Authored-By: Valle20 <[email protected]> Co-Authored-By: vichui1 <[email protected]>
Bobbelty · Oct 14, 2021 · b05e391 · b05e391
1 parent c51e30f
commit b05e391
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/app/src/main/java/com/example/trainingapp/mockDataBase/MockDataBase.java b/app/src/main/java/com/example/trainingapp/mockDataBase/MockDataBase.java
@@ -1,5 +1,6 @@
 package com.example.trainingapp.mockDataBase;
 
+import com.example.trainingapp.model.ActiveWorkout;
 import com.example.trainingapp.model.Exercise;
 import com.example.trainingapp.model.ExerciseIdNotFoundException;
 import com.example.trainingapp.model.Plan;
@@ -12,7 +13,8 @@
 
 public class MockDataBase implements IDatabase {
     List<Plan> planList = new ArrayList<>();
-    List<Workout> completedWorkouts = new ArrayList<>();
+    List<ActiveWorkout> completedWorkouts = new ArrayList<>();
+    ActiveWorkout activeWorkout;
 
     /*It's possible to iterate through a hashMap, so this HashMap can be used for both
     storing savedExercises and getting the savedExercises for display purposes.*/
@@ -107,11 +109,11 @@ public List<Plan> getPlanList(){
         return planList;
     }
 
-    public List<Workout> getCompletedWorkouts() {
+    public List<ActiveWorkout> getCompletedWorkouts() {
         return completedWorkouts;
     }
 
-    public void addToCompletedWorkouts(Workout workout) {completedWorkouts.add(workout);}
+    public void addToCompletedWorkouts(ActiveWorkout workout) {completedWorkouts.add(workout);}
 
     public HashMap<Integer, Integer> getCurrentPBs() {
         return currentPBs;

diff --git a/app/src/main/java/com/example/trainingapp/model/ActiveWorkout.java b/app/src/main/java/com/example/trainingapp/model/ActiveWorkout.java
@@ -21,7 +21,7 @@ public class ActiveWorkout {
     /**
      * List containing all the exercises in the workout
      */
-    private List<Exercise> exercises = new ArrayList<>();
+    private List<ActiveExercise> exercises = new ArrayList<>();
 
     /**
      * The time for the active workout, used for history
@@ -51,7 +51,7 @@ public String getName() {
      *
      * @param exercise object to add to list
      */
-    public void addExercise(Exercise exercise) {
+    public void addExercise(ActiveExercise exercise) {
         exercises.add(exercise);
     }
 
@@ -60,7 +60,7 @@ public void addExercise(Exercise exercise) {
      *
      * @return the list of exercises that Workout contains
      */
-    public List<Exercise> getExerciseList(){
+    public List<ActiveExercise> getExerciseList(){
         return exercises;
     }
 

diff --git a/app/src/main/java/com/example/trainingapp/model/ActiveWorkoutSession.java b/app/src/main/java/com/example/trainingapp/model/ActiveWorkoutSession.java
@@ -7,6 +7,9 @@
  */
 public class ActiveWorkoutSession {
 
-
+    public ActiveWorkout convertWorkoutToActiveWorkout(Workout workout){
+        ActiveWorkout activeWorkout = new ActiveWorkout(workout.getName());
+        return activeWorkout;
+    }
 
 }
diff --git a/app/src/main/java/com/example/trainingapp/model/User.java b/app/src/main/java/com/example/trainingapp/model/User.java
@@ -2,12 +2,14 @@
 
 import com.example.trainingapp.mockDataBase.IDatabase;
 import com.example.trainingapp.mockDataBase.MockDataBase;
-
+import com.example.trainingapp.model.ActiveWorkoutSession;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
 public class User {
+
+    private final ActiveWorkoutSession activeWorkoutSession = new ActiveWorkoutSession();
     /**
      * ExerciseIdHandler-object for creating new exerciseId:s
      */
@@ -103,4 +105,9 @@ public void createAndSaveNewExerciseToDatabase(String exerciseIdName){
         int id = nextId.getAndIncrement();
         mockDataBase.addExerciseIdToMap(exerciseIdName, id);
     }
+
+    public void createAndSaveActiveWorkoutToDatabase(Workout workout){
+
+    }
+
 }