From 87e8b725e4f642f1f1e7bbc29c06b9399901ce99 Mon Sep 17 00:00:00 2001
From: Niels <grasn@hva.nl>
Date: Thu, 16 May 2024 23:24:09 +0200
Subject: [PATCH] Added curves on endscreen

---
 code/src/Fitbot/.idea/misc.xml                           | 9 ++++-----
 .../app/src/main/res/drawable/button_background.xml      | 6 ++++++
 code/src/Fitbot/app/src/main/res/drawable/rectangle.xml  | 2 +-
 code/src/Fitbot/app/src/main/res/values/styles.xml       | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 code/src/Fitbot/app/src/main/res/drawable/button_background.xml

diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index 2f21f57..512a561 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -4,14 +4,12 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="../../../../../../../../layout/custom_preview.xml" value="0.35989583333333336" />
+        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/drawable/button_background.xml" value="0.128" />
+        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml" value="0.128" />
         <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml" value="0.2015625" />
+        <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml" value="0.33" />
         <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.2015625" />
         <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.358695652173913" />
-        <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.1" />
-        <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_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" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml" value="0.346" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_home_48.xml" value="0.25" />
@@ -27,6 +25,7 @@
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml" value="0.1" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.125" />
         <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.125" />
+        <entry key="app/src/main/res/layout/activity_fitness.xml" value="0.23550724637681159" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_sport_item.xml" value="0.2341485507246377" />
         <entry key="app/src/main/res/layout/activity_sport_menu.xml" value="0.22056159420289856" />
diff --git a/code/src/Fitbot/app/src/main/res/drawable/button_background.xml b/code/src/Fitbot/app/src/main/res/drawable/button_background.xml
new file mode 100644
index 0000000..3c7ef3c
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/button_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F0F0F0" />
+    <corners android:radius="15dp" />
+    <stroke android:width="15dp" android:color="#F0E4E4" />
+</shape>
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml b/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml
index 30b6621..20ab824 100644
--- a/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml
+++ b/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml
@@ -5,6 +5,6 @@
         android:top="2dp"
         android:right="2dp"
         android:bottom="2dp" />
-    <corners android:radius="5dp" />
+    <corners android:radius="45dp" />
     <solid android:color="#F0F0F0" />
 </shape>
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/values/styles.xml b/code/src/Fitbot/app/src/main/res/values/styles.xml
index 3828508..9511376 100644
--- a/code/src/Fitbot/app/src/main/res/values/styles.xml
+++ b/code/src/Fitbot/app/src/main/res/values/styles.xml
@@ -12,7 +12,7 @@
     <style name="ButtonStyle">
         <item name="android:textSize">24sp</item>
         <item name="android:textColor">#000000</item>
-        <item name="android:background">#F0F0F0</item>
+        <item name="android:background">@drawable/button_background</item>
         <item name= "android:textStyle">bold</item>
         <item name="android:padding">16dp</item>
         <item name="android:layout_margin">8dp</item>