Polishing

README.md

@@ -15,4 +15,16 @@ Efficiency:
 to let you know your rest is done!
 
 
+
+Instructions for .exe:
+- 
+- Download Launch4j from https://sourceforge.net/projects/launch4j/files/latest/download
+- Run the setup and launch the app
+- Load the "myLift.xml" config by clicking on the folder icon
+- Enjoy!
+
+
+Oracle OpenJDK version 21.0.2 
+
 made by: mel n vrosh©️
+

myLift.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launch4jConfig>
+  <dontWrapJar>false</dontWrapJar>
+  <headerType>gui</headerType>
+  <jar>C:\Coding\Java\myLift\out\artifacts\myLift_jar\myLift.jar</jar>
+  <outfile>C:\Coding\Java\myLift\myLift.exe</outfile>
+  <errTitle></errTitle>
+  <cmdLine></cmdLine>
+  <chdir>.</chdir>
+  <priority>normal</priority>
+  <downloadUrl></downloadUrl>
+  <supportUrl></supportUrl>
+  <stayAlive>false</stayAlive>
+  <restartOnCrash>false</restartOnCrash>
+  <manifest></manifest>
+  <icon>C:\Coding\Java\myLift\icon.ico</icon>
+  <jre>
+    <path>%JAVA_HOME%;%PATH%</path>
+    <requiresJdk>false</requiresJdk>
+    <requires64Bit>false</requires64Bit>
+    <minVersion></minVersion>
+    <maxVersion></maxVersion>
+  </jre>
+</launch4jConfig>

src/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: myLift
+

src/data/dataManipulation.java

@@ -16,7 +16,7 @@ public class dataManipulation {
 
     public dataManipulation(int index) {
 
-        // getting numberoflines of the workout
+        // getting the number of lines of a workout file
         try {
             String fileName = "src/resources/workouts/workout_" + index + ".txt";
             BufferedReader br1 = new BufferedReader(new FileReader(fileName));
@@ -30,7 +30,6 @@ public dataManipulation(int index) {
             e.printStackTrace();
         }
 
-        // no clue why we dont need the -2 anymore but it works
         this.exerciseName = new String[(noOfExercises(index))];
         this.numSets = new int[(noOfExercises(index))];
         this.numReps = new int[(noOfExercises(index))];
@@ -47,8 +46,8 @@ public dataManipulation() {
         this.workoutNames = new String[noOfFiles()];
     }
 
+    // Method to save data using ArrayList
     public void saveData(workout newWorkout)
-    // method to save data using ArrayList
     {
         try {
             int index = getNextIndex();
@@ -58,6 +57,7 @@ public void saveData(workout newWorkout)
             bw.write(newWorkout.workoutName);
             bw.newLine();
 
+            // Increment through object content and write data
             for (exercise exc : newWorkout.exercises) {
                 bw.write(exc.exerciseName);
                 bw.newLine();
@@ -77,6 +77,7 @@ public void saveData(workout newWorkout)
         }
     }
 
+    // Parse the index file content as an integer
     private int getNextIndex() {
         try {
             File file = new File(INDEX_FILE);
@@ -94,6 +95,7 @@ private int getNextIndex() {
         }
     }
 
+    // Increment index
     private void updateIndex(int index) {
         try {
             BufferedWriter bw = new BufferedWriter(new FileWriter(INDEX_FILE));
@@ -136,7 +138,7 @@ public void loadData(int index)
         }
     }
 
-    public int noOfFiles() {        //in other words, number of workouts
+    public int noOfFiles() {   // number of workouts
         int noOfWorkouts = 0;
         int i = 1;
         String fileName;
@@ -177,7 +179,7 @@ public void loadWorkoutNames() {
                 workoutNames[i-1] = br.readLine();
                 br.close();
             } catch(Exception e) {
-                e.printStackTrace();  // Print the stack trace for better debugging
+                e.printStackTrace();
             }
         }
     }

src/data/exercise.java

@@ -14,7 +14,4 @@ public exercise(String exerciseName, int numSets, int numReps, int restTime) {
         this.numReps = numReps;
         this.restTime = restTime;
     }
-}
-
-// add getters and setters for member variables
-// perform calculations or manipulations on exercise data
+}

src/data/sound.java

@@ -22,11 +22,11 @@ public void setFile(int i) {
             clip = AudioSystem.getClip();
             clip.open(ais);
             fc = (FloatControl)clip.getControl(FloatControl.Type.MASTER_GAIN);
-        }catch(Exception e) {
+        } catch(Exception e) {
         }
     }
 
-    public void play(){
+    public void play() {
         clip.start();
         currentVol = -10.0f;
         fc.setValue(currentVol);

src/data/workout.java

@@ -6,18 +6,9 @@ public class workout {
     public String workoutName;
     public ArrayList<exercise> exercises; // ArrayList to store exercise objects
 
-    // Constructor
     public workout(String workoutName)
     {
         this.workoutName = workoutName;
-        this.exercises = new ArrayList<exercise>();
+        this.exercises = new ArrayList<>();
     }
 }
-// TODO: check if getters are necessary
-//public String getWorkoutName() {
-//    return workoutName;
-//}
-//
-//public void setWorkoutName(String name) {
-//    workoutName = name;
-//}

src/myLift.java

@@ -6,7 +6,6 @@ public class myLift
 {
     public static void main (String[] args)
     {
-
         mainWindow window = new mainWindow();
     }
 }

src/resources/workouts/workout_1.txt

@@ -1,12 +1,12 @@
-Upper Day
+Sample Workout
 Bench Press
 3
 10
 90
 Pull Up
 4
 8
-5
+120
 Incline Bench Press
 3
 12

src/windows/addWorkoutWindow.java

@@ -9,7 +9,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class addWorkoutWindow extends JFrame {
-    JButton delExerciseB; // TODO: check if necessary
     JButton addExerciseB, cancelWorkoutB, saveWorkoutB;
     JLabel workoutNameL, exerciseNameL, noSetsL, noRepsL, noRestL;
     JTextField workoutNameTF, exerciseNameTF, noSetsTF, noRepsTF, noRestTF;
@@ -23,7 +22,6 @@ public class addWorkoutWindow extends JFrame {
     Color LabelC = new Color(0x73fbfd);
     Color WhiteC = new Color(0xfbffff);
     Color ButtonC = new Color(0x363A3D);
-    Color ShadowC = new Color(0x191C1D);
 
     int bY = 200;
 
@@ -135,14 +133,6 @@ public class addWorkoutWindow extends JFrame {
         saveWorkoutB.setFocusable(false);
         saveWorkoutB.setBackground(ButtonC);
         this.add(saveWorkoutB);
-
-        delExerciseB = new JButton("Delete Exercise");
-        delExerciseB.setFont(new Font("Calibri", Font.BOLD, 21));
-        delExerciseB.setForeground(WhiteC);
-        delExerciseB.setBounds(280, bY, excButtonWidth, 40);
-        delExerciseB.setFocusable(false);
-        delExerciseB.setBackground(ButtonC);
-//        this.add(delExerciseB);
         // --------------------------------------
 
 
@@ -155,12 +145,11 @@ public class addWorkoutWindow extends JFrame {
                         try {
                             i.getAndIncrement();
                             addBoxRow(i.get());
-                            this.setSize(this.getWidth(), this.getHeight() + 50);
+                            this.setSize(this.getWidth(), this.getHeight() + 50); // Extend height
                             bY += 50;
                             addExerciseB.setBounds(160, bY, excButtonWidth, 40);
                             cancelWorkoutB.setBounds(20, bY, 100, 40);
                             saveWorkoutB.setBounds(380, bY, 100, 40);
-                            delExerciseB.setBounds(280, bY, excButtonWidth, 40);
                             this.setLocationRelativeTo(null);
                         } catch (Exception excess) {
                             addExerciseB.setEnabled(false);
@@ -171,10 +160,7 @@ public class addWorkoutWindow extends JFrame {
 
 
         cancelWorkoutB.addActionListener(
-                (e) -> {
-                    dispose();
-                    new mainWindow();
-                }
+                (e) -> dispose()
         );
 
 
@@ -204,15 +190,13 @@ public class addWorkoutWindow extends JFrame {
                             }
                         }
 
-                        // Call dataManipulation to save the workout (assuming dataManipulation is instantiated)
+                        // Call dataManipulation to save the workout
                         dataManipulator.saveData(workoutToSave);
 
-                        // Show success message
                         JOptionPane.showMessageDialog(null, "Workout saved successfully!", "Success", JOptionPane.INFORMATION_MESSAGE);
                         dispose();
 
                     } catch (Exception ex) {
-                        // Show error message
                         JOptionPane.showMessageDialog(null, "You entered something wrong", "Error", JOptionPane.ERROR_MESSAGE);
                     }
                 }

src/windows/infoWindow.java

@@ -42,8 +42,8 @@ public class infoWindow extends JFrame
         infoTextArea.setForeground(WhiteC);
         infoTextArea.setBorder(BorderFactory.createLineBorder(BackgroundC, 40));
 
-        //  SET LABEL TO FILE CONTENTS
 
+        //  Set label to file contents
         try {
             BufferedReader bf = new BufferedReader(new FileReader("src/resources/info.txt"));
             StringBuffer fileContent = new StringBuffer();

src/windows/mainWindow.java

@@ -11,10 +11,8 @@ public class mainWindow extends JFrame
     JButton addWorkoutB, viewWorkoutsB, infoB;
 
     Color BackgroundC = new Color(0xFF2B2D30);
-    Color LabelC = new Color(0x73fbfd);
     Color WhiteC = new Color(0xfbffff);
     Color ButtonC = new Color(0x363A3D);
-    Color ShadowC = new Color(0x191C1D);
 
     Image title;
     ImageIcon icon = new ImageIcon("src/resources/images/icon.png");
@@ -60,15 +58,15 @@ public mainWindow()
 
 
         addWorkoutB.addActionListener(
-                (e) -> {
-                    new addWorkoutWindow();
-                }
+                (e) -> new addWorkoutWindow()
         );
 
 
 
         String[] responses = {"OK", "Create Workout"};
         ImageIcon error = new ImageIcon("src/resources/images/error.png");
+
+        // Show Option Dialog if there are no workouts to list
         viewWorkoutsB.addActionListener(
                 (e) -> {
                     if (dataManipulator.noOfFiles()==0) {

src/windows/viewWorkoutsWindow.java

@@ -21,10 +21,11 @@ public class viewWorkoutsWindow extends JFrame
 
     ImageIcon icon = new ImageIcon("src/resources/images/icon.png");
 
+    dataManipulation dataManipulator = new dataManipulation();
+
     viewWorkoutsWindow()
     {
 
-        dataManipulation dataManipulator = new dataManipulation();
         // ---  ---  WINDOW PROPERTIES  ---  ---
         this.setLayout(null);
         this.setSize(520, 600);
@@ -40,7 +41,7 @@ public class viewWorkoutsWindow extends JFrame
 
 
 
-        // ---  ---  ---  ---  BUTTONS AND ACTIONS ---  ---  ---  ---
+        // ---  ---  --- BUTTONS AND ACTIONS ---  ---  ---
 
         returnB = new JButton("←");
         returnB.setFont(new Font("Calibri", Font.BOLD, 17));
@@ -84,6 +85,8 @@ public class viewWorkoutsWindow extends JFrame
         int height = 75;
         int numWorkouts = dataManipulator.noOfFiles();
 
+
+        // Create Labels and Buttons to view based on how many workouts there are
         for (int i=0; i < numWorkouts; i++) {
 
             String workoutName = dataManipulator.workoutNames[i];
@@ -113,7 +116,7 @@ public class viewWorkoutsWindow extends JFrame
 
             infoB[i].addActionListener(
                     (e) -> {
-                        new workoutInfoWindow(index); // TODO: add index for parameter
+                        new workoutInfoWindow(index);
                         System.out.println(index);
                     }
             );
@@ -136,7 +139,7 @@ public class viewWorkoutsWindow extends JFrame
 
             height += 75;
         }
-        // ---------------------------------------------------
+        // -----------------------------------------
 
         workoutNameTitleL = new JLabel("Workout Name");
         workoutNameTitleL.setBounds(175, 20, 200, 50);