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

finished all ui

Browse Source
This commit is contained in:
SebasKoedam
2024-05-30 10:01:35 +02:00
parent 7b72554110
commit 5753f7047d
9 changed files with 152 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/src/Fitbot/.idea/misc.xml generated
View File

@@ -31,9 +31,10 @@
<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/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/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_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.536" /> <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.264" />
<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_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.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_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_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_item.xml" value="0.1" />

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/midBlue" /> <solid android:color="@color/midBlue" />
<stroke android:width="2dp" android:color="@color/darkBlue" /> <stroke android:width="2dp" android:color="#FF0000" />
<corners android:radius="10dp" /> <corners android:radius="10dp" />
</shape> </shape>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/lightBlue" /> <solid android:color="@color/lightBlue" />
<stroke android:width="2dp" android:color="@color/darkBlue" /> <stroke android:width="2dp" android:color="#FF0000" />
<corners android:radius="20dp" /> <corners android:radius="20dp" />
</shape> </shape>

153
code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml
View File

@@ -1,77 +1,108 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/darkBlue"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.activities.EndScreenActivity"> android:background="@color/darkBlue"
tools:context=".ui.activities.HelpActivity">
<View <LinearLayout
android:id="@+id/myRectangleView" android:layout_width="800dp"
android:layout_width="720dp" android:layout_height="450dp"
android:layout_height="270dp" android:layout_marginStart="80dp"
android:layout_marginStart="320dp" android:layout_marginTop="24dp"
android:layout_marginTop="25dp" android:background="@drawable/help2_background"
android:layout_marginEnd="320dp" android:orientation="vertical"
android:layout_marginBottom="25dp" android:padding="16dp"
android:background="@drawable/help_background"
app:layout_constraintBottom_toTopOf="@+id/homeButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> 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/textViewTitleEndScreen"
style="@style/TextStyleTitle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/klaar" />
</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/textViewDescriptionEndScreen"
style="@style/TextStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/voltooid" />
</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/textViewScoreEndScreen"
style="@style/TextStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/score"
android:textAlignment="center"/>
</LinearLayout>
</LinearLayout>
<Button <Button
android:id="@+id/homeButton" android:id="@+id/homeButtonEndScreen"
style="@style/ButtonStyle" android:layout_width="150dp"
android:layout_width="278dp" android:layout_height="75dp"
android:layout_height="117dp" android:layout_marginEnd="280dp"
android:layout_marginStart="501dp" android:background="@drawable/red_button_gradient"
android:layout_marginTop="25dp" android:drawableTop="@drawable/ic_baseline_home_48"
android:layout_marginEnd="501dp" android:drawableTint="@color/white"
android:layout_marginBottom="50dp" android:padding="15dp"
android:text="Home" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/continueButton" app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/myRectangleView" />
<Button <Button
android:id="@+id/continueButton" android:id="@+id/startButtonEndScreen"
style="@style/ButtonStyle" android:layout_width="150dp"
android:layout_width="280dp" android:layout_height="75dp"
android:layout_height="120dp" android:layout_marginStart="280dp"
android:layout_marginStart="500dp" android:background="@drawable/red_button_gradient"
android:layout_marginTop="25dp" android:text="@string/start"
android:layout_marginEnd="500dp" android:textAllCaps="false"
android:layout_marginBottom="140dp" android:textColor="@color/white"
android:text="Continue" android:textSize="30sp"
android:padding="15dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/homeButton" />
<TextView
android:id="@+id/gefeliciteerdText"
style="@style/TextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gefeliciteerd"
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.155" />
<TextView
android:id="@+id/workoutText"
style="@style/TextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="u heeft de work out voltooid"
app:layout_constraintBottom_toBottomOf="@+id/myRectangleView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/myRectangleView" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

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

@@ -10,30 +10,41 @@ android:fitsSystemWindows="true"
tools:context=".ui.activities.FitnessActivity" tools:context=".ui.activities.FitnessActivity"
tools:openDrawer="start"> tools:openDrawer="start">
<VideoView <LinearLayout
android:id="@+id/videoView" android:layout_width="900dp"
android:layout_width="400dp" android:layout_height="wrap_content"
android:layout_height="400dp" android:layout_gravity="center"
android:layout_marginStart="50dp" android:layout_marginStart="30dp"
android:layout_marginTop="16dp" android:layout_marginTop="30dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginEnd="30dp"
app:layout_constraintTop_toTopOf="parent" /> android:padding="15dp"
android:background="@drawable/help2_background"
<com.example.fitbot.ui.components.PersonalMotionPreviewElement android:orientation="horizontal"
android:id="@+id/personalMotionPreviewElement"
android:layout_width="400dp"
android:layout_height="400dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="50dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<VideoView
android:id="@+id/videoView"
android:layout_width="400dp"
android:layout_height="400dp"
android:layout_marginStart="20dp"
/>
<com.example.fitbot.ui.components.PersonalMotionPreviewElement
android:id="@+id/personalMotionPreviewElement"
android:layout_width="400dp"
android:layout_height="400dp"
android:layout_marginStart="20dp"
/>
</LinearLayout>
<Button <Button
android:id="@+id/homeButton" android:id="@+id/homeButtonFitness"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_marginStart="404dp" android:layout_marginStart="404dp"
android:layout_marginBottom="10dp"
android:background="@drawable/red_button_gradient" android:background="@drawable/red_button_gradient"
android:drawableTop="@drawable/ic_baseline_home_48" android:drawableTop="@drawable/ic_baseline_home_48"
android:drawableTint="@color/white" android:drawableTint="@color/white"

8
code/src/Fitbot/app/src/main/res/layout/activity_help.xml
View File

@@ -8,7 +8,7 @@
tools:context=".ui.activities.HelpActivity"> tools:context=".ui.activities.HelpActivity">
<Button <Button
android:id="@+id/homeButton" android:id="@+id/homeButtonHelp"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_marginStart="404dp" android:layout_marginStart="404dp"
@@ -43,7 +43,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/textView4" android:id="@+id/textViewTitleHelp"
style="@style/TextStyleTitle" style="@style/TextStyleTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -62,7 +62,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/textView6" android:id="@+id/textViewStartHelp"
style="@style/TextStyle" style="@style/TextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -81,7 +81,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/textView5" android:id="@+id/textViewHomeHelp"
style="@style/TextStyle" style="@style/TextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

12
code/src/Fitbot/app/src/main/res/layout/activity_main.xml
View File

@@ -36,7 +36,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/textView2" android:id="@+id/textViewWelkom"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/welkom_bij_fitbot" android:text="@string/welkom_bij_fitbot"
@@ -44,7 +44,7 @@
android:textSize="64sp" /> android:textSize="64sp" />
<TextView <TextView
android:id="@+id/textView3" android:id="@+id/textViewFit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/robot_helpt" android:text="@string/robot_helpt"
@@ -54,7 +54,7 @@
</LinearLayout> </LinearLayout>
<Button <Button
android:id="@+id/startButton" android:id="@+id/startButtonMain"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_marginStart="368dp" android:layout_marginStart="368dp"
@@ -65,11 +65,12 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="80sp" android:textSize="80sp"
android:gravity="center" android:gravity="center"
android:textAlignment="center"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/helpButton" android:id="@+id/helpButtonMain"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginStart="420dp" android:layout_marginStart="420dp"
@@ -80,11 +81,12 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="40sp" android:textSize="40sp"
android:gravity="center" android:gravity="center"
android:textAlignment="center"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/imageView2" android:id="@+id/imageViewRobotLogo"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_marginTop="340dp" android:layout_marginTop="340dp"

22
code/src/Fitbot/app/src/main/res/menu/main_menu.xml
View File

@@ -12,20 +12,14 @@
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<item android:title="Options"> <item
android:id="@+id/nav_settings"
<menu> android:icon="@drawable/ic_baseline_settings_48"
<item android:title="Settings" />
android:id="@+id/nav_settings" <item
android:icon="@drawable/ic_baseline_settings_48" android:id="@+id/nav_rate"
android:title="Settings" /> android:icon="@drawable/ic_baseline_star_rate_48"
<item android:title="Rate" />
android:id="@+id/nav_rate"
android:icon="@drawable/ic_baseline_star_rate_48"
android:title="Rate" />
</menu>
</item>
</group> </group>

8
code/src/Fitbot/app/src/main/res/values/strings.xml
View File

@@ -4,8 +4,10 @@
<string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Open navigation close</string> <string name="navigation_drawer_close">Open navigation close</string>
<string name="welkom_bij_fitbot">Welkom bij FitBot</string> <string name="welkom_bij_fitbot">Welkom bij FitBot</string>
<string name="robot_helpt">de robot die helpt om fit te blijven</string> <string name="robot_helpt">de robot die helpt om fit te blijven</string>
<string name="start">Start</string> <string name="start">Start</string>
<string name="help">Help</string> <string name="help">Help</string>
<string name="todo">TODO</string> <string name="todo">TODO</string>
@@ -14,7 +16,11 @@
<string name="skip">Skip</string> <string name="skip">Skip</string>
<string name="complete">Complete</string> <string name="complete">Complete</string>
<string name="uitlegStart">Druk op start om de oefening te beginnen</string> <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> <string name="uitlegHome">Ga terug naar het begin scherm door op het huisje te klikken</string>
<string name="klaar">Klaar!</string>
<string name="voltooid">U heeft de oefeningen voltooid, druk op start om nog een sessie te beginnen</string>
<string name="score">Score:</string>
</resources> </resources>