From 92223fbf527e05bc9b5a621679a180640d9a8f22 Mon Sep 17 00:00:00 2001
From: SebasKoedam <Sebas@koedam.info>
Date: Fri, 31 May 2024 15:44:56 +0200
Subject: [PATCH] fitness activity

---
 code/src/Fitbot/.idea/misc.xml                |  20 ++-
 ...p_background.xml => border_background.xml} |   0
 ...background.xml => border_background_2.xml} |   0
 .../main/res/drawable/border_background_3.xml |   5 +
 .../res/drawable/ic_baseline_skip_next_48.xml |   5 +
 .../res/drawable/ic_launcher_background.xml   |   2 +-
 .../main/res/layout/activity_end_screen.xml   |   8 +-
 .../src/main/res/layout/activity_fitness.xml  | 117 +++++++++++++-----
 .../app/src/main/res/layout/activity_help.xml |   8 +-
 .../Fitbot/app/src/main/res/values/colors.xml |   1 +
 .../Fitbot/app/src/main/res/values/ids.xml    |   4 +
 .../app/src/main/res/values/strings.xml       |   3 +
 .../Fitbot/app/src/main/res/values/styles.xml |   2 +-
 13 files changed, 131 insertions(+), 44 deletions(-)
 rename code/src/Fitbot/app/src/main/res/drawable/{help_background.xml => border_background.xml} (100%)
 rename code/src/Fitbot/app/src/main/res/drawable/{help2_background.xml => border_background_2.xml} (100%)
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/ic_baseline_skip_next_48.xml
 create mode 100644 code/src/Fitbot/app/src/main/res/values/ids.xml

diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index b1924a8..a6192e8 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -16,27 +16,35 @@
         <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" />
-        <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.1195" />
-        <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.124" />
         <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/big_red_button_gradient.xml" value="0.2555" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/border_background.xml" value="0.2475" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml" value="0.2475" />
+        <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_main.xml" value="0.176" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml" value="0.4" />
+        <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.4" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.4" />
         <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" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml" value="0.1" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml" value="0.1" />
-        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.125" />
-        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.125" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.264" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.264" />
+        <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/menu/main_menu.xml" value="0.4" />
         <entry key="app/src/main/res/layout/activity_end_screen.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_fitness.xml" value="0.23550724637681159" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />
diff --git a/code/src/Fitbot/app/src/main/res/drawable/help_background.xml b/code/src/Fitbot/app/src/main/res/drawable/border_background.xml
similarity index 100%
rename from code/src/Fitbot/app/src/main/res/drawable/help_background.xml
rename to code/src/Fitbot/app/src/main/res/drawable/border_background.xml
diff --git a/code/src/Fitbot/app/src/main/res/drawable/help2_background.xml b/code/src/Fitbot/app/src/main/res/drawable/border_background_2.xml
similarity index 100%
rename from code/src/Fitbot/app/src/main/res/drawable/help2_background.xml
rename to code/src/Fitbot/app/src/main/res/drawable/border_background_2.xml
diff --git a/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml b/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml
new file mode 100644
index 0000000..4543b55
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/border_background_3.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/midderBlue" />
+    <corners android:radius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_skip_next_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_skip_next_48.xml
new file mode 100644
index 0000000..400f0a5
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_skip_next_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="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml
index ca3826a..3a8cd35 100644
--- a/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_launcher_background.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="108"
     android:viewportWidth="108"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
+    <path android:fillColor="#D10000"
           android:pathData="M0,0h108v108h-108z"/>
     <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
           android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
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 4579826..35aa21a 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
@@ -12,7 +12,7 @@
         android:layout_height="450dp"
         android:layout_marginStart="80dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/help2_background"
+        android:background="@drawable/border_background_2"
         android:orientation="vertical"
         android:padding="16dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -24,7 +24,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="20dp"
             android:layout_marginBottom="40dp"
-            android:background="@drawable/help_background"
+            android:background="@drawable/border_background"
             android:orientation="vertical"
             android:paddingVertical="15dp"
             android:paddingHorizontal="20dp"
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="10dp"
-            android:background="@drawable/help_background"
+            android:background="@drawable/border_background"
             android:orientation="vertical"
             android:padding="16dp"
             app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="10dp"
-            android:background="@drawable/help_background"
+            android:background="@drawable/border_background"
             android:orientation="vertical"
             android:padding="16dp"
             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 000302c..08f24a3 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
@@ -14,52 +14,104 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/help2_background"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/border_background_2"
         android:orientation="horizontal"
-        android:padding="20dp"
+        android:padding="30dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.505"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+        <RelativeLayout
+            android:layout_width="400dp"
+            android:layout_height="400dp"
             android:layout_marginRight="20dp"
-            android:background="@drawable/help2_background"
-            android:orientation="horizontal"
-            android:padding="20dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            android:background="@drawable/border_background"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal">
 
             <VideoView
                 android:id="@+id/videoView"
-                android:layout_width="350dp"
-                android:layout_height="350dp"
-                android:layout_gravity="center"
-                android:layout_margin="2dp" />
+                android:layout_width="300dp"
+                android:layout_height="300dp"
+                android:layout_centerInParent="true" />
+
+        </RelativeLayout>
 
-        </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="400dp"
+            android:layout_height="400dp"
             android:layout_gravity="center"
             android:layout_marginLeft="20dp"
-            android:background="@drawable/help2_background"
-            android:orientation="horizontal"
+            android:background="@drawable/border_background"
+            android:orientation="vertical"
             android:padding="20dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <com.example.fitbot.ui.components.ExerciseStatusElement
-                android:id="@+id/personalMotionPreviewElement"
-                android:layout_width="350dp"
-                android:layout_height="350dp" />
+            <TextView
+                android:id="@+id/textViewFitnessTitle"
+                style="@style/TextStyleTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title"
+                android:textAlignment="center"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="5dp"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/border_background_3"
+                android:padding="16dp"
+                android:layout_margin="10dp"
+                android:layout_gravity="center_horizontal">
+
+                <TextView
+                    android:id="@+id/textViewFitnessDescription"
+                    style="@style/TextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/context"
+                    android:textAlignment="center" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/border_background_3"
+                android:padding="16dp"
+                android:layout_margin="10dp"
+                android:layout_gravity="center_horizontal">
+
+                <TextView
+                    android:id="@+id/textViewFitnessBar"
+                    style="@style/TextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/context"
+                    android:textAlignment="center" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/border_background_3"
+                android:padding="16dp"
+                android:layout_margin="10dp"
+                android:layout_gravity="center_horizontal">
+
+                <TextView
+                    android:id="@+id/textViewFitnessScore"
+                    style="@style/TextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/context"
+                    android:textAlignment="center" />
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -80,17 +132,26 @@
         tools:ignore="SpeakableTextPresentCheck" />
 
     <Button
-        android:id="@+id/homeButtonFitness3"
+        android:id="@+id/skipButtonFitness"
         android:layout_width="150dp"
         android:layout_height="75dp"
         android:layout_marginEnd="200dp"
         android:layout_marginBottom="30dp"
         android:background="@drawable/red_button_gradient"
-        android:drawableTop="@drawable/ic_baseline_home_48"
+        android:drawableTop="@drawable/ic_baseline_skip_next_48"
         android:drawableTint="@color/white"
         android:padding="15dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:ignore="SpeakableTextPresentCheck" />
 
+    <com.example.fitbot.ui.components.ExerciseStatusElement
+        android:id="@+id/personalMotionPreviewElement"
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="10dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </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 369397f..f229ae5 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
@@ -28,7 +28,7 @@
         android:layout_height="450dp"
         android:layout_marginStart="80dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/help2_background"
+        android:background="@drawable/border_background_2"
         android:orientation="vertical"
         android:padding="16dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -40,7 +40,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="20dp"
             android:layout_marginBottom="40dp"
-            android:background="@drawable/help_background"
+            android:background="@drawable/border_background"
             android:orientation="vertical"
             android:paddingVertical="15dp"
             android:paddingHorizontal="20dp"
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="10dp"
-            android:background="@drawable/help_background"
+            android:background="@drawable/border_background"
             android:orientation="vertical"
             android:padding="16dp"
             app:layout_constraintStart_toStartOf="parent"
@@ -80,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="10dp"
-            android:background="@drawable/help_background"
+            android:background="@drawable/border_background"
             android:orientation="vertical"
             android:padding="16dp"
             app:layout_constraintStart_toStartOf="parent"
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 f6ea931..7cb4f05 100644
--- a/code/src/Fitbot/app/src/main/res/values/colors.xml
+++ b/code/src/Fitbot/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="white">#FFFFFFFF</color>
     <color name="darkBlue">#1C1C27</color>
     <color name="midBlue">#24242F</color>
+    <color name="midderBlue">#262630</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/ids.xml b/code/src/Fitbot/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000..f37a0c3
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="skipButtonFitness" type="id" />
+</resources>
\ No newline at end of file
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 cdc20ab..ee81225 100644
--- a/code/src/Fitbot/app/src/main/res/values/strings.xml
+++ b/code/src/Fitbot/app/src/main/res/values/strings.xml
@@ -23,4 +23,7 @@
     <string name="voltooid">U heeft de oefeningen voltooid! \n Druk op start om nog een sessie te beginnen</string>
     <string name="score">Score:</string>
 
+    <string name="title">Title</string>
+    <string name="context">ContextContextContext</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 f921b28..be54ae7 100644
--- a/code/src/Fitbot/app/src/main/res/values/styles.xml
+++ b/code/src/Fitbot/app/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
     </style>
 
     <style name="TextStyleTitle">
-        <item name="android:textSize">50sp</item>
+        <item name="android:textSize">40sp</item>
         <item name="android:textColor">#D3D3D3</item>
         <item name= "android:textStyle">bold</item>
         <item name="android:padding">6dp</item>