diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml index a5abdd5..7f839bd 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/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index 42e8983..6711755 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -4,12 +4,17 @@ diff --git a/code/src/Fitbot/app/build.gradle b/code/src/Fitbot/app/build.gradle index 23c5f19..5148a3d 100644 --- a/code/src/Fitbot/app/build.gradle +++ b/code/src/Fitbot/app/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:2.0.4' implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' 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 f1088d7..140d430 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,2 +1,35 @@ -package com.example.fitbot;public class MainScreen { +package com.example.fitbot; + +import android.os.Bundle; +import android.support.design.widget.NavigationView; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; +import android.widget.Toolbar; + +public class MainScreen extends AppCompatActivity { + + //Variables + DrawerLayout drawerLayout; + NavigationView navigationView; + Toolbar toolbar; + + @Override + protected void onCreate (Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + /*---Hooks---*/ + drawerLayout = findViewById(R.id.drawer_layout); + navigationView = findViewById(R.id.nav_view); + toolbar = findViewById(R.id.toolbar); + + /*---Tool Bar---*/ + setSupportActionBar(toolbar); + + /*---Navigation Drawer Menu---*/ + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this.drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close); + drawerLayout.addDrawerListener(toggle); + toggle.syncState(); + } } diff --git a/code/src/Fitbot/app/src/main/res/drawable/Icons8-Ios7-Sports-Barbell.48.png b/code/src/Fitbot/app/src/main/res/drawable/Icons8-Ios7-Sports-Barbell.48.png deleted file mode 100644 index 552109b..0000000 Binary files a/code/src/Fitbot/app/src/main/res/drawable/Icons8-Ios7-Sports-Barbell.48.png and /dev/null differ diff --git a/code/src/Fitbot/app/src/main/res/drawable/Icons8-Windows-8-Messaging-Appointment-Reminders.48.png b/code/src/Fitbot/app/src/main/res/drawable/Icons8-Windows-8-Messaging-Appointment-Reminders.48.png deleted file mode 100644 index 922a11f..0000000 Binary files a/code/src/Fitbot/app/src/main/res/drawable/Icons8-Windows-8-Messaging-Appointment-Reminders.48.png and /dev/null differ diff --git a/code/src/Fitbot/app/src/main/res/drawable/Iconsmind-Outline-Idea-2.48.png b/code/src/Fitbot/app/src/main/res/drawable/Iconsmind-Outline-Idea-2.48.png deleted file mode 100644 index c9d629d..0000000 Binary files a/code/src/Fitbot/app/src/main/res/drawable/Iconsmind-Outline-Idea-2.48.png and /dev/null differ diff --git a/code/src/Fitbot/app/src/main/res/drawable/robotLogo.jpg b/code/src/Fitbot/app/src/main/res/drawable/robotLogo.jpg deleted file mode 100644 index d1c96d9..0000000 Binary files a/code/src/Fitbot/app/src/main/res/drawable/robotLogo.jpg and /dev/null differ diff --git a/code/src/Fitbot/app/src/main/res/drawable/robotLogo.svg b/code/src/Fitbot/app/src/main/res/drawable/robotLogo.svg deleted file mode 100644 index a06f651..0000000 --- a/code/src/Fitbot/app/src/main/res/drawable/robotLogo.svg +++ /dev/null @@ -1,165 +0,0 @@ - - - - -Created by potrace 1.10, written by Peter Selinger 2001-2011 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 8cebf92..e331324 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,19 +1,30 @@ - + tools:context=".MainActivity" + android:fitsSystemWindows="true" + tools:openDrawer="start"> + + + android:text="Hello World" + android:layout_centerInParent="true"/> + +