From a62c4e1b77ecab2073b12123bb9ba7f9fa78f8e4 Mon Sep 17 00:00:00 2001
From: Niels Gras <you@example.com>
Date: Fri, 17 May 2024 15:53:59 +0200
Subject: [PATCH] Fixed layout for fitness screen

---
 code/src/Fitbot/.idea/misc.xml                |  1 +
 .../Fitbot/app/src/main/AndroidManifest.xml   |  4 ----
 .../com/example/fitbot/EndScreenActivity.java |  2 ++
 .../src/main/res/layout/activity_fitness.xml  | 24 ++++---------------
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index fb7fa9e..88e5881 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -13,6 +13,7 @@
         <entry key="..\:/Users/Niels/muupooviixee66-3/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml" value="0.1665" />
         <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.11" />
         <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/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.25" />
diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml
index 6c213df..220226d 100644
--- a/code/src/Fitbot/app/src/main/AndroidManifest.xml
+++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml
@@ -18,10 +18,6 @@
         <activity
             android:name=".EndScreenActivity"
             android:exported="false" />
-        <activity
-            android:name=".MainActivity"
-            android:name=".ui.activities.FitnessActivity"
-            android:exported="true" />
         <activity
             android:name=".ui.activities.MainActivity"
             android:exported="true" >
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java
index a12c853..3670db5 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java
@@ -5,6 +5,8 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Button;
 
+import com.example.fitbot.ui.activities.MainActivity;
+
 public class EndScreenActivity extends AppCompatActivity {
 
     @Override
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 c2aa0d2..409f6b4 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
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/red"
-    xmlns:tools="http://schemas.android.com/tools"
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:app="http://schemas.android.com/apk/res-auto"
 xmlns:tools="http://schemas.android.com/tools"
 android:id="@+id/drawer_layout"
@@ -14,17 +10,12 @@ android:fitsSystemWindows="true"
 tools:context=".ui.activities.FitnessActivity"
 tools:openDrawer="start">
 
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
     <com.example.fitbot.ui.components.PersonalMotionPreviewElement
         android:id="@+id/personalMotionPreviewElement"
         android:layout_width="600dp"
         android:layout_height="550dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="30dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -32,8 +23,8 @@ tools:openDrawer="start">
         android:id="@+id/videoView"
         android:layout_width="600dp"
         android:layout_height="550dp"
-        android:layout_marginStart="30dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -58,10 +49,5 @@ tools:openDrawer="start">
         android:text="Complete"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
-        android:visibility="visible"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
 
-</LinearLayout>
-
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file