From fc41cea6185c4c7c368d2b4d0cce7a09cfc42849 Mon Sep 17 00:00:00 2001
From: SebasKoedam <Sebas@koedam.info>
Date: Mon, 3 Jun 2024 11:53:21 +0200
Subject: [PATCH] fitness layout finished

---
 .../main/res/drawable/ic_baseline_info_24.xml |  10 ++
 .../main/res/drawable/ic_baseline_info_40.xml |   5 +
 .../main/res/drawable/ic_baseline_info_48.xml |   5 +
 .../main/res/drawable/red_button_gradient.xml |   2 +-
 .../src/main/res/layout/activity_fitness.xml  |  35 +++--
 .../sebas/dailyUpdates.md                     | 130 ++++++++++++++++++
 6 files changed, 175 insertions(+), 12 deletions(-)
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_48.xml

diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml
new file mode 100644
index 0000000..17255b7
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml
new file mode 100644
index 0000000..df12462
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml
@@ -0,0 +1,5 @@
+<vector android:height="40dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_48.xml
new file mode 100644
index 0000000..15875d1
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
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 6983a91..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
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners
-        android:radius="25dp"
+        android:radius="30dp"
         />
 
     <gradient
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 08f24a3..d72d83c 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
@@ -17,34 +17,47 @@
         android:layout_marginTop="20dp"
         android:background="@drawable/border_background_2"
         android:orientation="horizontal"
-        android:padding="30dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.505"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <RelativeLayout
-            android:layout_width="400dp"
-            android:layout_height="400dp"
-            android:layout_marginRight="20dp"
+            android:layout_width="410dp"
+            android:layout_height="410dp"
+            android:layout_marginVertical="20dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="15dp"
             android:background="@drawable/border_background"
-            android:layout_gravity="center"
-            android:gravity="center_horizontal">
+            android:layout_gravity="center">
+
+            <Button
+                android:id="@+id/infoButtonFitness"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:background="@drawable/red_button_gradient"
+                android:drawableTop="@drawable/ic_baseline_info_40"
+                android:drawableTint="@color/white"
+                android:padding="2.5dp"
+                android:layout_margin="10dp"
+                tools:ignore="SpeakableTextPresentCheck" />
 
             <VideoView
                 android:id="@+id/videoView"
                 android:layout_width="300dp"
                 android:layout_height="300dp"
-                android:layout_centerInParent="true" />
+                android:layout_centerInParent="true"
+                android:layout_margin="50dp" />
 
         </RelativeLayout>
 
-
         <LinearLayout
-            android:layout_width="400dp"
-            android:layout_height="400dp"
+            android:layout_width="410dp"
+            android:layout_height="410dp"
             android:layout_gravity="center"
-            android:layout_marginLeft="20dp"
+            android:layout_marginVertical="20dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="30dp"
             android:background="@drawable/border_background"
             android:orientation="vertical"
             android:padding="20dp"
diff --git a/docs/personal-documentation/sebas/dailyUpdates.md b/docs/personal-documentation/sebas/dailyUpdates.md
index 9f6762e..e7edd15 100644
--- a/docs/personal-documentation/sebas/dailyUpdates.md
+++ b/docs/personal-documentation/sebas/dailyUpdates.md
@@ -381,6 +381,136 @@ Done
 
 **31 May**
 
+To do
+
+  - Expert review
+  - Add Ui for exercises
+
+Done
+
+  - Expert review
+
+**1 June**
+
+- Weekend
+
+**2 June**
+
+- Weekend
+
+**3 June**
+
+To do
+
+  - Add Ui for exercises
+  - Retrieve exercises from database and show them in the app
+
+Done
+
+  - Add Ui for exercises
+
+**4 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**5 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**6 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**7 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**8 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**9 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**10 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**11 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**12 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**13 June**
+
+To do
+
+  - 
+
+Done
+
+  -
+
+**14 June**
+
 To do
 
   -