From 59c906918e9ba0987c2c6fb3347a01f9e6bf8873 Mon Sep 17 00:00:00 2001
From: SebasKoedam <Sebas@koedam.info>
Date: Wed, 29 May 2024 18:31:03 +0200
Subject: [PATCH] added style for help menu

---
 code/src/Fitbot/.idea/misc.xml                |   7 +-
 .../main/res/drawable/help2_background.xml    |   6 +
 .../src/main/res/drawable/help_background.xml |   6 +
 .../res/drawable/ic_baseline_check_48.xml     |   5 +
 .../app/src/main/res/drawable/rectangle.xml   |  10 --
 .../main/res/drawable/red_button_gradient.xml |   1 +
 .../main/res/layout/activity_end_screen.xml   |   2 +-
 .../src/main/res/layout/activity_fitness.xml  |  26 +---
 .../app/src/main/res/layout/activity_help.xml | 122 +++++++++++-------
 .../Fitbot/app/src/main/res/values/colors.xml |   1 +
 .../app/src/main/res/values/strings.xml       |   4 +-
 .../Fitbot/app/src/main/res/values/styles.xml |  12 +-
 12 files changed, 120 insertions(+), 82 deletions(-)
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/help2_background.xml
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/help_background.xml
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/ic_baseline_check_48.xml
 delete mode 100644 code/src/Fitbot/app/src/main/res/drawable/rectangle.xml

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 @@
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.25" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/box_background.xml" value="0.2555" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml" value="0.346" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml" value="0.2395" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/help_background.xml" value="0.2395" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_home_48.xml" value="0.25" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_settings_48.xml" value="0.25" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_star_rate_48.xml" value="0.25" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml" value="0.25" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml" value="0.2395" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml" value="0.346" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml" value="0.22826086956521738" />
-        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml" value="0.4" />
-        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_help.xml" value="0.264" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml" value="0.536" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_help.xml" value="0.4" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.4224390243902439" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.1" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_power_screen.xml" value="0.1" />
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/midBlue" />
+    <stroke android:width="2dp" android:color="@color/darkBlue" />
+    <corners android:radius="10dp" />
+</shape>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/lightBlue" />
+    <stroke android:width="2dp" android:color="@color/darkBlue" />
+    <corners android:radius="20dp" />
+</shape>
\ 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 @@
+<vector android:height="48dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/listview_background_shape">
-    <stroke android:width="2dp" android:color="#ff207d94" />
-    <padding android:left="2dp"
-        android:top="2dp"
-        android:right="2dp"
-        android:bottom="2dp" />
-    <corners android:radius="45dp" />
-    <solid android:color="#F0F0F0" />
-</shape>
\ 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"/>
+
 </shape>
\ 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" />
-
-    <Button
-        android:id="@+id/buttonComplete"
-        android:layout_width="150dp"
-        android:layout_height="75dp"
-        android:layout_marginEnd="170dp"
-        android:background="@drawable/red_button_gradient"
-        android:text="@string/complete"
-        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"
+        tools:ignore="SpeakableTextPresentCheck" />
 
 </android.support.constraint.ConstraintLayout>
\ 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">
 
-    <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_width="150dp"
         android:layout_height="75dp"
+        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_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.852" />
+        app:layout_constraintStart_toStartOf="parent" />
 
-    <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"
+    <LinearLayout
+        android:layout_width="800dp"
+        android:layout_height="450dp"
+        android:layout_marginStart="80dp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/help2_background"
+        android:orientation="vertical"
+        android:padding="16dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.133" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/help_background"
+            android:orientation="vertical"
+            android:padding="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/textView4"
+                style="@style/TextStyleTitle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/help" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="700dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/help_background"
+            android:orientation="vertical"
+            android:padding="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/textView6"
+                style="@style/TextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/uitlegStart" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="700dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/help_background"
+            android:orientation="vertical"
+            android:padding="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/textView5"
+                style="@style/TextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/uitlegHome" />
+        </LinearLayout>
+
+    </LinearLayout>
 
-    <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>
\ 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 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="darkBlue">#1C1C27</color>
+    <color name="midBlue">#24242F</color>
     <color name="lightBlue">#2C2C37</color>
     <color name="invertedBackground">#FFFFFF</color>
     <color name="invertedTextColor">#000000</color>
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 @@
     <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>
+    <string name="uitlegStart">Druk op start om de oefening te beginnen</string>
+    <string name="uitlegHome">Ga terug naar het begin scherm door op het huisje te klikken</string>
 
 </resources>
\ 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 @@
     </style>
 
     <style name="TextStyle">
-        <item name="android:textSize">36sp</item>
-        <item name="android:textColor">#000000</item>
+        <item name="android:textSize">25sp</item>
+        <item name="android:textColor">#FFFFFF</item>
         <item name= "android:textStyle">bold</item>
+        <item name="android:padding">6dp</item>
+    </style>
+
+    <style name="TextStyleTitle">
+        <item name="android:textSize">50sp</item>
+        <item name="android:textColor">#D3D3D3</item>
+        <item name= "android:textStyle">bold</item>
+        <item name="android:padding">6dp</item>
     </style>
 </resources>
\ No newline at end of file