Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fitness layout finished

Browse Source
This commit is contained in:
SebasKoedam
2024-06-03 11:53:21 +02:00
parent 594d0b91d0
commit fc41cea618
6 changed files with 175 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_24.xml Normal file
View File

@@ -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>

5
code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_40.xml Normal file
View File

@@ -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>

5
code/src/Fitbot/app/src/main/res/drawable/ic_baseline_info_48.xml Normal file
View File

@@ -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>

2
code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml
View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:radius="25dp"
android:radius="30dp"
/>
<gradient

35
code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml
View File

@@ -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"

130
docs/personal-documentation/sebas/dailyUpdates.md
View File

@@ -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
-