Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66

code/src/Fitbot/.idea/misc.xml

@@ -16,6 +16,7 @@
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml" value="0.165" />
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/activity_endscreen.xml" value="0.1" />
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml" value="0.1234375" />
+        <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/activity_help.xml" value="0.1" />
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.1" />
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.1234375" />
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.1234375" />

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);
+
     }
 }

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
+        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---*/
         setSupportActionBar(toolbar); // Make the toolbar act as the action bar

code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml

@@ -56,14 +56,12 @@
         style="@style/TextStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="539dp"
-        android:layout_marginEnd="533dp"
         android:text="Gefeliciteerd"
-        app:layout_constraintBottom_toTopOf="@+id/workoutText"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/myRectangleView" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.155" />
 
     <TextView
         android:id="@+id/workoutText"

code/src/Fitbot/app/src/main/res/layout/activity_help.xml

@@ -4,6 +4,61 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/black"
     tools:context=".ui.activities.HelpActivity">
 
+    <View
+        android:id="@+id/myRectangleView"
+        android:layout_width="1075dp"
+        android:layout_height="510dp"
+        android:background="@drawable/rectangle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.168"
+        tools:ignore="MissingConstraints" />
+
+    <Button
+        android:id="@+id/homeButton"
+        android:layout_width="200dp"
+        android:layout_height="75dp"
+        android:background="@drawable/red_button_gradient"
+        android:text="@string/home"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.852" />
+
+    <TextView
+        android:id="@+id/textView4.2"
+        style="@style/TextStyle"
+        android:layout_width="1053dp"
+        android:layout_height="191dp"
+        android:text="@string/uitleg"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.133" />
+
+    <TextView
+        android:id="@+id/textView4"
+        style="@style/TextStyle"
+        android:layout_width="1053dp"
+        android:layout_height="191dp"
+        android:text="Als je klaar bent kunt u op de COMPLETE knop drukken in het sport scherm en dan kunt u uw punten inzien"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.482" />
+
 </android.support.constraint.ConstraintLayout>

code/src/Fitbot/app/src/main/res/values/strings.xml

@@ -13,6 +13,8 @@
     <string name="home">Home</string>
     <string name="skip">Skip</string>
     <string name="complete">Complete</string>
+
+    <string name="uitleg">Als je op de startknop drukt komen oefingen op het scherm. Het doel is om die zo goedmogelijk na te doen zodat je punten verzameld. Als je klaar bent kunt u op de COMPLETE knop drukken in het sport scherm en dan kunt u uw punten inzien</string>
     <color name="red">#f22b1d</color>
 
 </resources>