diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml
index 429eb49..135ab11 100644
--- a/code/src/Fitbot/.idea/misc.xml
+++ b/code/src/Fitbot/.idea/misc.xml
@@ -7,9 +7,21 @@
+
+
+
+
+
+
+
-
+
+
+
+
+
+
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
index e90e88c..b5f2226 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
@@ -14,7 +14,7 @@ import com.aldebaran.qi.sdk.object.conversation.Say;
import com.aldebaran.qi.sdk.object.locale.Language;
import com.aldebaran.qi.sdk.object.locale.Locale;
import com.aldebaran.qi.sdk.object.locale.Region;
-import com.example.fitbot.ui.SportMenuActivity;
+//import com.example.fitbot.ui.SportMenuActivity;
public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks {
@@ -22,10 +22,10 @@ public class MainActivity extends RobotActivity implements RobotLifecycleCallbac
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// Register the RobotLifecycleCallbacks to this Activity.
- Button button = findViewById(R.id.menu_switch_btn);
- button.setOnClickListener(v -> {
- startActivity(new Intent(MainActivity.this, SportMenuActivity.class));
- });
+// Button button = findViewById(R.id.menu_switch_btn);
+// button.setOnClickListener(v -> {
+// startActivity(new Intent(MainActivity.this, SportMenuActivity.class));
+// });
QiSDK.register(this, this);
}
diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
index 323641c..f262998 100644
--- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
+++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
@@ -11,7 +11,7 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Button;
-import com.example.fitbot.ui.SportMenuActivity;
+//import com.example.fitbot.ui.SportMenuActivity;
public class MainScreen extends AppCompatActivity {
diff --git a/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml b/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml
new file mode 100644
index 0000000..0ade340
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/darkred_button_gradient.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml
new file mode 100644
index 0000000..7190f99
--- /dev/null
+++ b/code/src/Fitbot/app/src/main/res/drawable/red_button_gradient.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/drawable/robot_logo_inverted.png b/code/src/Fitbot/app/src/main/res/drawable/robot_logo_inverted.png
new file mode 100644
index 0000000..f628d3b
Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/robot_logo_inverted.png differ
diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
index b160bcf..16935b1 100644
--- a/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
+++ b/code/src/Fitbot/app/src/main/res/layout/activity_main.xml
@@ -1,17 +1,87 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/code/src/Fitbot/app/src/main/res/values/strings.xml b/code/src/Fitbot/app/src/main/res/values/strings.xml
index 731c17b..1d35c5a 100644
--- a/code/src/Fitbot/app/src/main/res/values/strings.xml
+++ b/code/src/Fitbot/app/src/main/res/values/strings.xml
@@ -4,4 +4,9 @@
Open navigation drawer
Open navigation close
+ Welkom bij FitBot
+ de robot die helpt om fit te blijven
+ Start
+ Help
+ TODO
\ No newline at end of file
diff --git a/docs/documentation/database/EERD.md b/docs/documentation/database/EERD.md
new file mode 100644
index 0000000..27e84a8
--- /dev/null
+++ b/docs/documentation/database/EERD.md
@@ -0,0 +1 @@
+# EERD
\ No newline at end of file
diff --git a/docs/documentation/database/ERD.md b/docs/documentation/database/ERD.md
new file mode 100644
index 0000000..e6141f1
--- /dev/null
+++ b/docs/documentation/database/ERD.md
@@ -0,0 +1 @@
+# ERD
\ No newline at end of file
diff --git a/docs/documentation/database/infrastructure.md b/docs/documentation/database/infrastructure.md
new file mode 100644
index 0000000..62fce50
--- /dev/null
+++ b/docs/documentation/database/infrastructure.md
@@ -0,0 +1 @@
+# Infrastructure
\ No newline at end of file
diff --git a/docs/personalDocs/sebas/dailyUpdates.md b/docs/personalDocs/sebas/dailyUpdates.md
index a775ace..67bbbbb 100644
--- a/docs/personalDocs/sebas/dailyUpdates.md
+++ b/docs/personalDocs/sebas/dailyUpdates.md
@@ -174,57 +174,25 @@ To do
Done
- -
+ - Setup the Pi
+ - Database
+ - Server
-**9 May**
+**9-12 May**
-To do
-
- -
-
-Done
-
- -
-
-**10 May**
-
-To do
-
- -
-
-Done
-
- -
-
-**11 May**
-
-To do
-
- -
-
-Done
-
- -
-
-**12 May**
-
-To do
-
- -
-
-Done
-
- -
+- Hemelvaart/Weekend
**13 May**
To do
- -
+ - Figma design for the app
+ - Fix database
Done
- -
+ - Fix database
+
**14 May**
@@ -234,7 +202,7 @@ To do
Done
- -
+ - Infrastuture, erd and eerd for the database
**15 May**