diff --git a/.idea/misc.xml b/.idea/misc.xml index c0842f8e943bdfc2f7ce6e8fe837a0581df5ddea..fbb68289f4352bf149aa31a2c9940faa99174224 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="EntryPointsManager"> + <entry_points version="2.0" /> + </component> + <component name="NullableNotNullManager"> + <option name="myDefaultNullable" value="android.support.annotation.Nullable" /> + <option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> + <option name="myNullables"> + <value> + <list size="4"> + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> + </list> + </value> + </option> + <option name="myNotNulls"> + <value> + <list size="4"> + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> + </list> + </value> + </option> + </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Remove" /> @@ -10,7 +37,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="true" assert-keyword="false" jdk-15="false"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..280fecef02a1dfb103fd81e385e70115f834f9d1 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/SmartPlanner.iml" filepath="$PROJECT_DIR$/SmartPlanner.iml" /> + <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000000000000000000000000000000000000..7f68460d8b38ac04e3a3224d7c79ef719b1991a9 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RunConfigurationProducerService"> + <option name="ignoredProducers"> + <set> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> + </set> + </option> + </component> +</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..94a25f7f4cb416c083d265558da75d457237d671 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3d4c5217ef902db15e610c2ad726c1e930113283..8e7906d0a292cb73b04b5fbaeca57e39c62a99b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,9 +25,10 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:design:25.1.1' compile 'com.android.volley:volley:1.0.0' compile 'com.google.android.gms:play-services:10.0.1' - compile 'com.android.support:support-annotations:25.1.0' + compile 'com.android.support:support-annotations:25.3.1' compile 'com.google.android.gms:play-services-maps:10.0.1' testCompile 'junit:junit:4.12' } diff --git a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java index d3d8c247f7bb56008d6a4b4d8bd1150036f89908..fa05599492a0d41a85a3b28eca5958deae8a6e51 100644 --- a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java +++ b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java @@ -2,8 +2,11 @@ package com.example.chan24.smartplanner; import android.app.Dialog; import android.content.Intent; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.MenuItem; import android.view.View; import android.widget.Button; import android.widget.Toast; @@ -13,6 +16,9 @@ import com.google.android.gms.common.GoogleApiAvailability; public class UserArea extends AppCompatActivity { + private DrawerLayout mDrawerLayout; + private ActionBarDrawerToggle mToggle; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -21,6 +27,15 @@ public class UserArea extends AppCompatActivity { Toast.makeText(this,"Perfect",Toast.LENGTH_SHORT).show(); } + mDrawerLayout = (DrawerLayout)findViewById(R.id.activity_user_area); + mToggle = new ActionBarDrawerToggle(this,mDrawerLayout,R.string.open,R.string.close); + + mDrawerLayout.addDrawerListener(mToggle); + mToggle.syncState(); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + Button b= (Button)findViewById(R.id.button3); b.setOnClickListener(new View.OnClickListener() { @Override @@ -31,6 +46,14 @@ public class UserArea extends AppCompatActivity { }); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if(mToggle.onOptionsItemSelected(item)){ + return true; + } + return super.onOptionsItemSelected(item); + } + public boolean googleServicesAvailable(){ GoogleApiAvailability api = GoogleApiAvailability.getInstance(); int isAvailable = api.isGooglePlayServicesAvailable(this); diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml index d6511dbab465e444c0dd2281b31de0c47126e9e1..453e9e1d6d221c441d435fe3ca39d4e43c398c69 100644 --- a/app/src/main/res/layout/activity_user_area.xml +++ b/app/src/main/res/layout/activity_user_area.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/activity_user_area" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingBottom="@dimen/activity_vertical_margin" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - tools:context="com.example.chan24.smartplanner.UserArea"> + tools:context="com.example.chan24.smartplanner.UserArea" + > +<LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <Button android:text="Button" @@ -19,4 +22,16 @@ android:layout_marginStart="120dp" android:layout_marginTop="32dp" android:id="@+id/button3" /> -</RelativeLayout> + +</LinearLayout> + + <android.support.design.widget.NavigationView + android:layout_width="wrap_content" + android:layout_height="match_parent" + app:menu="@menu/navigation_menu" + app:headerLayout="@layout/navigation_header" + android:layout_gravity="start"> + + </android.support.design.widget.NavigationView> + +</android.support.v4.widget.DrawerLayout> diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml new file mode 100644 index 0000000000000000000000000000000000000000..c6ec0e73d921a750eb8e21008688503460b052ec --- /dev/null +++ b/app/src/main/res/layout/navigation_header.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="144dp" + tools:background="@color/cast_intro_overlay_button_background_color"> + + <TextView + android:text="Your Location" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" /> +</RelativeLayout> \ No newline at end of file diff --git a/app/src/main/res/menu/navigation_menu.xml b/app/src/main/res/menu/navigation_menu.xml new file mode 100644 index 0000000000000000000000000000000000000000..d37364978282d50f66babcdb4e771db0a436af98 --- /dev/null +++ b/app/src/main/res/menu/navigation_menu.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/my_account" + android:title="My Account" + android:icon="@mipmap/ic_person_black_24dp"/> + + <item android:id="@+id/my_location" + android:title="My Location" + android:icon="@mipmap/ic_place_black_24dp"/> + + + <item android:id="@+id/log_out" + android:title="Log Out" + android:icon="@mipmap/ic_exit_to_app_black_24dp"/> + + + +</menu> \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/mipmap-hdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ad0f63e5b8a97d5951f1b4e8576dadee1ed7b06c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_person_black_24dp.png b/app/src/main/res/mipmap-hdpi/ic_person_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6fbcc6d4258cf676f816ee8970ad77e06bf74f9f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_person_black_24dp.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_place_black_24dp.png b/app/src/main/res/mipmap-hdpi/ic_place_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..df1f34062be8c86f602d304efdb738fbb4e4b4ea Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_place_black_24dp.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/mipmap-mdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dee407b59836072bd89a0f869c53cc8e47f3f7b7 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_person_black_24dp.png b/app/src/main/res/mipmap-mdpi/ic_person_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..57da32af189fd3dd94da03b0bdb966c1e34af1de Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_person_black_24dp.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_place_black_24dp.png b/app/src/main/res/mipmap-mdpi/ic_place_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..92a0738278340a3707c072c4eb2747f2c6eccc8b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_place_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5a536d57c03e35e5a0bc0a8d841740412d66aaf3 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_person_black_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_person_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..360a32f27cd837c6e2036bf8087f3fbd440d26af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_person_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_place_black_24dp.png b/app/src/main/res/mipmap-xhdpi/ic_place_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b2696b6d4fcaee7f5fcb82563ea8ffc653c5768c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_place_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..53b79d4c7b9cdad40cb666c5bb30ed44daa143a9 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_person_black_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_person_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f1e148490b9b0ab76648553a96da8ee27ba0b8be Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_person_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_place_black_24dp.png b/app/src/main/res/mipmap-xxhdpi/ic_place_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5a21dfae62dffddf641878825ffac0c96b36291a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_place_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e30632b6b1dc6d3b8e1c7556a9f73e231851051f Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_person_black_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_person_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1ebc37be1701e3932b1d8c4de99edb246c7ae1c5 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_person_black_24dp.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_place_black_24dp.png b/app/src/main/res/mipmap-xxxhdpi/ic_place_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2217e4651ee42cb7d34855d6b00689221ba304 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_place_black_24dp.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3ab3e9cbce07f7cdc941fc8ba424c05e83ed80f0..9ad7e369a6d97a2c4932ece555364dc513ed2b65 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="colorPrimary">#3F51B5</color> + <color name="colorPrimary">#3f51b5</color> <color name="colorPrimaryDark">#303F9F</color> <color name="colorAccent">#FF4081</color> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6669eb82b999dc6184be6354594269a46af63244..16bcde10f4e2f90891cff876aa99e8127e743a86 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,6 @@ <resources> <string name="app_name">SmartPlanner</string> <string name="title_activity_maps">Map</string> + <string name="open">Open</string> + <string name="close">Close</string> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930df6d10edf3d6df40d6556297d11f953da..f9a6f7e9c910b0525ec86e26997f554cece95a18 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,4 +1,4 @@ -<resources> + <resources> <!-- Base application theme. --> <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">