From fcb5c7f61b9bb5e39cb6ef266754ee512f541fbc Mon Sep 17 00:00:00 2001
From: Niels Gras <you@example.com>
Date: Tue, 28 May 2024 12:44:48 +0200
Subject: [PATCH] Made the buttons functional and cleaned up start button in
 main

---
 .../com/example/fitbot/ui/activities/HelpActivity.java    | 4 ++++
 .../com/example/fitbot/ui/activities/MainActivity.java    | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

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 def4026..3ffa2e3 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
@@ -4,6 +4,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.example.fitbot.R;
+import com.example.fitbot.util.ButtonNavigation;
 
 public class HelpActivity extends AppCompatActivity {
 
@@ -11,5 +12,8 @@ public class HelpActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_help);
+
+        ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class);
+
     }
 }
\ 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 ca30bf2..b2fa7ba 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
@@ -14,6 +14,7 @@ import android.util.Log;
 import android.widget.Button;
 
 import com.example.fitbot.R;
+import com.example.fitbot.util.ButtonNavigation;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -48,11 +49,8 @@ public class MainActivity extends AppCompatActivity {
         toolbar = findViewById(R.id.toolbar);
         startButton = findViewById(R.id.startButton);
 
-        startButton.setOnClickListener(v -> { // Switch to fitness activity
-            Log.i("MainActivity", "Switching to FitnessActivity");
-            Intent intent = new Intent(MainActivity.this, FitnessActivity.class);
-            startActivity(intent);
-        });
+        ButtonNavigation.setupButtonNavigation(this, R.id.startButton, FitnessActivity.class);
+        ButtonNavigation.setupButtonNavigation(this, R.id.helpButton, HelpActivity.class);
 
         /*---Tool Bar---*/
         setSupportActionBar(toolbar); // Make the toolbar act as the action bar