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 @@ - - - + + + + + + + - + + + + - - + + + 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 @@ + + + + + \ 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 @@ + + + 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"> - 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"> - + android:background="@drawable/border_background" + android:layout_gravity="center" + android:gravity="center_horizontal"> + android:layout_width="300dp" + android:layout_height="300dp" + android:layout_centerInParent="true" /> + + - - + + + + + + + + + + + + + + + + @@ -80,17 +132,26 @@ tools:ignore="SpeakableTextPresentCheck" />