Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made the buttons functional and cleaned up start button in main

Browse Source
This commit is contained in:
Niels Gras
2024-05-28 12:44:48 +02:00
parent c3cf6e3cf9
commit fcb5c7f61b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java
View File

@@ -4,6 +4,7 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import com.example.fitbot.R; import com.example.fitbot.R;
import com.example.fitbot.util.ButtonNavigation;
public class HelpActivity extends AppCompatActivity { public class HelpActivity extends AppCompatActivity {
@@ -11,5 +12,8 @@ public class HelpActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_help); setContentView(R.layout.activity_help);
ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class);
} }
} }

8
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
View File

@@ -14,6 +14,7 @@ import android.util.Log;
import android.widget.Button; import android.widget.Button;
import com.example.fitbot.R; import com.example.fitbot.R;
import com.example.fitbot.util.ButtonNavigation;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
@@ -48,11 +49,8 @@ public class MainActivity extends AppCompatActivity {
toolbar = findViewById(R.id.toolbar); toolbar = findViewById(R.id.toolbar);
startButton = findViewById(R.id.startButton); startButton = findViewById(R.id.startButton);
startButton.setOnClickListener(v -> { // Switch to fitness activity ButtonNavigation.setupButtonNavigation(this, R.id.startButton, FitnessActivity.class);
Log.i("MainActivity", "Switching to FitnessActivity"); ButtonNavigation.setupButtonNavigation(this, R.id.helpButton, HelpActivity.class);
Intent intent = new Intent(MainActivity.this, FitnessActivity.class);
startActivity(intent);
});
/*---Tool Bar---*/ /*---Tool Bar---*/
setSupportActionBar(toolbar); // Make the toolbar act as the action bar setSupportActionBar(toolbar); // Make the toolbar act as the action bar