diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index 3da9a27..bfea9c1 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -22,14 +22,17 @@
+
+
+
-
-
+
+
diff --git a/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml b/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml
new file mode 100644
index 0000000..86e1b0d
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/help_background.xml b/code/src/Fitbot/app/src/main/res/drawable/help_background.xml
new file mode 100644
index 0000000..721f4a6
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/help_background.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_check_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_check_48.xml
new file mode 100644
index 0000000..c4f67b4
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_check_48.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml b/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml
deleted file mode 100644
index 20ab824..0000000
--- a/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml
index 7190f99..a087a43 100644
--- a/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml
+++ b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml
@@ -9,4 +9,5 @@
android:startColor="#990000"
android:endColor="#FF0000"
android:angle="90"/>
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml
index b07bcad..6f08327 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml
@@ -15,7 +15,7 @@
android:layout_marginTop="25dp"
android:layout_marginEnd="320dp"
android:layout_marginBottom="25dp"
- android:background="@drawable/rectangle"
+ android:background="@drawable/help_background"
app:layout_constraintBottom_toTopOf="@+id/homeButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
index dc9da90..2c8b70c 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
@@ -32,26 +32,14 @@ tools:openDrawer="start">
android:id="@+id/homeButton"
android:layout_width="150dp"
android:layout_height="75dp"
- android:layout_marginStart="170dp"
+ android:layout_marginStart="404dp"
+ android:layout_marginBottom="10dp"
android:background="@drawable/red_button_gradient"
- android:text="@string/home"
- android:textAllCaps="false"
- android:textColor="@color/white"
- android:textSize="30sp"
+ android:drawableTop="@drawable/ic_baseline_home_48"
+ android:drawableTint="@color/white"
+ android:padding="15dp"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
-
-
+ app:layout_constraintStart_toStartOf="parent"
+ tools:ignore="SpeakableTextPresentCheck" />
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_help.xml b/code/src/Fitbot/app/src/main/res/layout/activity_help.xml
index 21031a2..88b2875 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_help.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_help.xml
@@ -4,61 +4,91 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/black"
+ android:background="@color/darkBlue"
tools:context=".ui.activities.HelpActivity">
-
-
+ app:layout_constraintStart_toStartOf="parent" />
-
+ app:layout_constraintTop_toTopOf="parent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/values/colors.xml b/code/src/Fitbot/app/src/main/res/values/colors.xml
index 3a25e95..f6ea931 100644
--- a/code/src/Fitbot/app/src/main/res/values/colors.xml
+++ b/code/src/Fitbot/app/src/main/res/values/colors.xml
@@ -8,6 +8,7 @@
#FF000000
#FFFFFFFF
#1C1C27
+ #24242F
#2C2C37
#FFFFFF
#000000
diff --git a/code/src/Fitbot/app/src/main/res/values/strings.xml b/code/src/Fitbot/app/src/main/res/values/strings.xml
index 13c9af6..1a989ff 100644
--- a/code/src/Fitbot/app/src/main/res/values/strings.xml
+++ b/code/src/Fitbot/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
Skip
Complete
- 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
- #f22b1d
+ Druk op start om de oefening te beginnen
+ Ga terug naar het begin scherm door op het huisje te klikken
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/values/styles.xml b/code/src/Fitbot/app/src/main/res/values/styles.xml
index 59b11f6..5da2c49 100644
--- a/code/src/Fitbot/app/src/main/res/values/styles.xml
+++ b/code/src/Fitbot/app/src/main/res/values/styles.xml
@@ -19,8 +19,16 @@
+
+
\ No newline at end of file