diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml index 7f839bd..67c83a4 100644 --- a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml +++ b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,6 @@ - + \ No newline at end of file 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 bc39699..38db551 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 @@ -1,6 +1,7 @@ package com.example.fitbot; import android.annotation.SuppressLint; +import android.content.Intent; import android.os.Bundle; import android.support.design.widget.NavigationView; import android.support.v4.view.GravityCompat; @@ -8,6 +9,9 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.widget.Button; + +import com.example.fitbot.ui.SportMenuActivity; public class MainScreen extends AppCompatActivity { diff --git a/docs/personalDocs/sebas/dailyUpdates.md b/docs/personalDocs/sebas/dailyUpdates.md index 25b60d3..3a799c8 100644 --- a/docs/personalDocs/sebas/dailyUpdates.md +++ b/docs/personalDocs/sebas/dailyUpdates.md @@ -120,19 +120,50 @@ To do Done - - + - Make navigation menu for the app + - Make documentation for pepper with andriod studio + - Fix notedpad **26 April** To do - - + - Sprint review + - Sprint retrospective + +Done + + - Sprint review + - Sprint retrospective + +**27 April - 05 May** + +- Vacation + +**6 May** + +To do + + - Start working on sprint 2 + - Figma design for the app + - Deelvragen voor het onderzoek Done - - + - -**27 April** +**7 May** + +To do + + - Mindmap project + - Issues for sprint 2 + +Done + + - + +**8 May** To do @@ -140,9 +171,9 @@ To do Done - - + - -**28 April** +**9 May** To do @@ -150,9 +181,9 @@ To do Done - - + - -**29 April** +**10 May** To do @@ -160,9 +191,9 @@ To do Done - - + - -**30 April** +**11 May** To do @@ -170,4 +201,204 @@ To do Done - - \ No newline at end of file + - + +**12 May** + +To do + + - + +Done + + - + +**13 May** + +To do + + - + +Done + + - + +**14 May** + +To do + + - + +Done + + - + +**15 May** + +To do + + - + +Done + + - + +**16 May** + +To do + + - + +Done + + - + +**17 May** + +To do + + - + +Done + + - + +**18 May** + +To do + + - + +Done + + - + +**19 May** + +To do + + - + +Done + + - + +**20 May** + +To do + + - + +Done + + - + +**21 May** + +To do + + - + +Done + + - + +**22 May** + +To do + + - + +Done + + - + +**23 May** + +To do + + - + +Done + + - + +**24 May** + +To do + + - + +Done + + - + +**25 May** + +To do + + - + +Done + + - + +**26 May** + +To do + + - + +Done + + - + +**27 May** + +To do + + - + +Done + + - + +**28 May** + +To do + + - + +Done + + - + +**29 May** + +To do + + - + +Done + + - + +**30 May** + +To do + + - + +Done + + - + +**31 May** + +To do + + - + +Done + + - \ No newline at end of file