From 298c66ba34c1a845cb47239feb1a675f5bb354ff Mon Sep 17 00:00:00 2001
From: chan24 <aakaschan24@gmail.com>
Date: Mon, 17 Apr 2017 09:34:44 +0530
Subject: [PATCH] nav bar
---
.idea/misc.xml | 29 +++++++++++++++++-
.idea/modules.xml | 9 ++++++
.idea/runConfigurations.xml | 12 ++++++++
.idea/vcs.xml | 6 ++++
app/build.gradle | 3 +-
.../example/chan24/smartplanner/UserArea.java | 23 ++++++++++++++
.../main/res/layout/activity_user_area.xml | 29 +++++++++++++-----
app/src/main/res/layout/navigation_header.xml | 14 +++++++++
app/src/main/res/menu/navigation_menu.xml | 18 +++++++++++
.../mipmap-hdpi/ic_exit_to_app_black_24dp.png | Bin 0 -> 251 bytes
.../res/mipmap-hdpi/ic_person_black_24dp.png | Bin 0 -> 269 bytes
.../res/mipmap-hdpi/ic_place_black_24dp.png | Bin 0 -> 376 bytes
.../mipmap-mdpi/ic_exit_to_app_black_24dp.png | Bin 0 -> 171 bytes
.../res/mipmap-mdpi/ic_person_black_24dp.png | Bin 0 -> 189 bytes
.../res/mipmap-mdpi/ic_place_black_24dp.png | Bin 0 -> 263 bytes
.../ic_exit_to_app_black_24dp.png | Bin 0 -> 246 bytes
.../res/mipmap-xhdpi/ic_person_black_24dp.png | Bin 0 -> 307 bytes
.../res/mipmap-xhdpi/ic_place_black_24dp.png | Bin 0 -> 457 bytes
.../ic_exit_to_app_black_24dp.png | Bin 0 -> 354 bytes
.../mipmap-xxhdpi/ic_person_black_24dp.png | Bin 0 -> 428 bytes
.../res/mipmap-xxhdpi/ic_place_black_24dp.png | Bin 0 -> 683 bytes
.../ic_exit_to_app_black_24dp.png | Bin 0 -> 432 bytes
.../mipmap-xxxhdpi/ic_person_black_24dp.png | Bin 0 -> 565 bytes
.../mipmap-xxxhdpi/ic_place_black_24dp.png | Bin 0 -> 868 bytes
app/src/main/res/values/colors.xml | 2 +-
app/src/main/res/values/strings.xml | 2 ++
app/src/main/res/values/styles.xml | 2 +-
27 files changed, 138 insertions(+), 11 deletions(-)
create mode 100644 .idea/modules.xml
create mode 100644 .idea/runConfigurations.xml
create mode 100644 .idea/vcs.xml
create mode 100644 app/src/main/res/layout/navigation_header.xml
create mode 100644 app/src/main/res/menu/navigation_menu.xml
create mode 100644 app/src/main/res/mipmap-hdpi/ic_exit_to_app_black_24dp.png
create mode 100644 app/src/main/res/mipmap-hdpi/ic_person_black_24dp.png
create mode 100644 app/src/main/res/mipmap-hdpi/ic_place_black_24dp.png
create mode 100644 app/src/main/res/mipmap-mdpi/ic_exit_to_app_black_24dp.png
create mode 100644 app/src/main/res/mipmap-mdpi/ic_person_black_24dp.png
create mode 100644 app/src/main/res/mipmap-mdpi/ic_place_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_exit_to_app_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_person_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_place_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_exit_to_app_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_person_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_place_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_exit_to_app_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_person_black_24dp.png
create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_place_black_24dp.png
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0842f8..fbb6828 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 0000000..280fece
--- /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 0000000..7f68460
--- /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 0000000..94a25f7
--- /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 3d4c521..8e7906d 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 d3d8c24..fa05599 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 d6511db..453e9e1 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 0000000..c6ec0e7
--- /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 0000000..d373649
--- /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
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm_<L!K^<Ar*{or*7muWFX)=
zf29$t0b8n9mw;N)6Gx2~nhRR=CNm^okUS~-$@8Q5GKW*Ym#$U6d$QauDb2B8T_kP6
z@td=_1JB$H`s!l)=ER4W2`VCKKHqI66=hj+T7KJ$o91M7NagLhQKxSu(CHbflf}sr
zWfxgw9$Mue`SC=^Opmas)6<@NoCy&=JI^cVs(7fbZ^GH&jBU#<%BQSbX{+?>LY%Mf
zU(-+g(nTw_{`v0mr6k4T3;(B<!v{R$w=F-cXz-cs-Svc>|IOw#GcYhPc)I$ztaD0e
F0su}`WIO->
literal 0
HcmV?d00001
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
GIT binary patch
literal 269
zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm_<E1oWnAr*{oFWGuACyKOP
zWPZhy!u;reRtfhm7Qx;^=3OEO?WXQv(p6CuS}c9RX}6<F2G_$Z&BN_ydOFU|SziC}
z(A8f{W6mGAa^}Ru80T!YN72ICQYU;}R&MmkwVjyZpUXV)g;#Fy#1%h|FZ_}@J?nLs
z%kHexce{ej#Y{G2#r#^7%A3j;Q~fpVMZmJJ>Q>w4yx1N7<HxFk<?nAS>+3SI);rTu
z^8Q@z=|359*Eg@YFuAsPNv=ev6z^K^h))_>-x4NnGQPMV_*9%rGuNp_k#7T9wX$oO
Z^l~Sf_}9(%V_;xl@O1TaS?83{1OT<6b87$q
literal 0
HcmV?d00001
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
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm_9drud~kP619SM0r=0ws=r
z)aPrvH1(g4`1LA&$JH)EXK&7vbe&ne_F_nJ_g;2q$BeFywxSg;csaH%ZM;(O^_vN+
z?E~BAF|vPa%<KEhKQ#HM^(%#M;pE5&PVUZ3@(x(oyx{i&pC$>T7-d1zj|Een$r+Zo
zbE$_Oxx~shO)%SDCo$ALq&CV%Kw*`X*k_(A;!-~tewciDJo8{i>|FcFPy8o|Z(W-h
z5_nv7Ywqf|0*jMN=LARl<+@9}UHy2`Ew8NGhciq+na_F@nyW2wR*<hYJ95^m&l4hb
z@&rQ<DC_>}c*V9l_Q*onHAY_qylrh{<|t1)SMca_uf(rI$1iFoy<ka~d+*_rUvXqZ
zr%Q;!GB%?nRvS}aD!s5uQQXJWl-Dd6yXts|WaO{=`yUBw9@}t2z3D<~qv2Cd$qDTr
fr&=aV`pe{yTicf>9-+a&z`)??>gTe~DWM4f@<N-#
literal 0
HcmV?d00001
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
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#MV>B>Ar*|t5_=RTJXAeg
zZ}UO4*}ki4LJ`vk)vl@y0$K+qEMLXu+Q!VowIm~g^NFoPhT<D0ySB$1x*WVew$5qD
zIQUq_hvT}_PBxzd{V!F7rU>(03pIFpBrD*6Sm75x@AVvN@5NV0F-gP;1-!G)Ft%ri
Y>6x?Ez_IB90|Nttr>mdKI;Vst0FTu<;{X5v
literal 0
HcmV?d00001
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
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#EuJopAr*{wPaAR_a*%L&
zSUyW2XN&lI#e1&nx8!&%7Qaxfam!Q1bE(lXkBt*_{x6%nXZ_s7Wx5)fnHnc9KhwXm
zI!I5ItKv+Q$O^;kWpZ311v8$8toW|dJf(a2I}4+K3q;xd?o^bolexKB<yITFRAJg#
t59@szj}A|B<QF+U*U`ww?#v4LX&0N$Yp>A?Wnf@n@O1TaS?83{1OP`JNPhqT
literal 0
HcmV?d00001
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
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#=R92;Ln;`LUNrP$a+F|w
zpkKwQoUoexf^^0rbAyjOQLh<$Lb$4B-fp=Nq_kW>%k^%Pf!SnF4*LzV_g9zw`@U)`
zqi(G8)?4k?yRYpqm^kG}*}h$Nlh34YtGQ$}v8m>!;Hzn;me1Q4_;a7A)U+z@EvHiy
zLY^1<FFU1Q@3jBtop^~q9K4?@m+*e;`Fwi!h2{{osjIF`u3o6@ImbCEKk@I?p!A0i
zu5kHte|6WEUGe<Y*4pelXL#4G-THRvmHD}u3zFyjcXM}EU$(5z^!cf!yg%7L%dTvj
U#khYT0|Nttr>mdKI;Vst0KZFf#Q*>R
literal 0
HcmV?d00001
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
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBdp%toLn;{GUialXWFWx$
zpnTRP?TkG$9wdEn`fE93%97t4PIpcDt&O`6?TI{gj(x6KZ->j7%gHWowh`KCU*3M>
zUbShOnBgL+D=l|Zgcl^3-}bNg@s;rhgMWwmhhOVD#XtO5+r?ktsMb=|HYb2-P5^Vy
zgN8{Dod4~1;VpRdq~Qkt&sCB}{-0`ngu9-1mnpxUI$Jh>J<Gd$w@nr1$<OJXuz9`~
zQ^a2W{hK)re*9ysT+AGGq-D_#OJ*wxb)laOzj=%1&w9`PhJk^B!PC{xWt~$(695rI
BXBq$i
literal 0
HcmV?d00001
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
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBzdT(WLn;{GUNZDLoFH-R
zWBu}L&M&n1RG;xR?cVWX;+p8_Nej&dWJ)J1b-ZA_r8eC_!^?Wc@ikt*O;7%|)VTkC
z|8vhn-U2MVN0vNUv&u+FY0s_1rhTE4E`9#~qk7A-mFqh>Zv`~58{UfWY>DiW=`}n(
zaj|8Z_LGdC>}*C)GTI`WWOxm`HDuFowcoe7A{h5&#v;?Z7g^(lHJ|p+H(t~oE|~mG
zXLTCSOW{A-)pLqZ>T+}0t>zNDWALCSwkL`0$%(*YtnFJaJe-mqvRU2l#f1Zm{VNjr
z-vnPa%wOTUUgm1`Z~iNrzFWl?_VUDT3~l7uyJ2dNsXPa>qd*N~;a_gfW9;c085kHC
NJYD@<);T3K0RUW;fiM67
literal 0
HcmV?d00001
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
GIT binary patch
literal 457
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZts6FglULn;{GUfP=_k|=WQ
z<9`(mMU^LdOrDE-<y|LT&FYMAtzcGK$!hvQcEt>*9MO+VD#yNfT?vuO-4b<IDJnzD
zu(QeeNg-GF(+``f&z;HHxZ!{Nf4lrb2{VP%IccrFWhc1rSDuZPO1W}L!+T5MA@y|z
zPDj%!+ILl)HW9TtZ1*a$Kkeu9;wKZP&z_MeZ~4~HcSGR4#SP{?0$H4_v1$Qs(yUug
z6qIwR+9dXEJY=(4BT=qg`@|!uxw^{T);n(d{JFQSttWiPZO3CW+gMX-4#)QO80I`a
z@uPY7{iSSm58thR>?C#K#<9EHDQl9V-H#RDx$72jx};1v@$R8mVbwJo4^%8XXyujh
z=$(Om;01m@!54;HRW2(gYrJ4NxGms-*h9UA4c#rLe{{^Tn-I8&`@~Bd)#^?eGmX1}
zd;$FIG7Fu)2l9VkaYZFQK>W5(&_>rQN0m&!2u%Fe5H)K-uaKRwqpz&GyW2U#tT${%
z>w>c-&j++Gzj9AR_e*@Y=C2DnyE!(V)~S6ZQ_r3LGC7?4Fx#4X=}XHDqRe~L85kHC
NJYD@<);T3K0RW8;#eo0-
literal 0
HcmV?d00001
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
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BYI?djhEy=Vy?M}!DNy9t
z$N#5ZN^&K>d8ssErC95-uUWa$-6yITs@t6I%<VAKv!D3WqWiOb_0NUHd%tUihK5cJ
zb3Sf-{|Lk8$F15@UnDlGvCT70?=Y>GIlRZ%X_d0iWyPzv9kiF!<t)$*+GyTxdgitG
z3J2D#%0*|HXKhftap4(*?++!8#uUc6|BG2Bah5m=Fr8#;ik|x<>S#IBNv@`u4x5@1
z^d_uPh~QAs=9mT&a-UdYpwTDM`h=BJMc+d~RO7O{TEQp%-wUfwd_B73%+^w!qTF@g
zclOB_&wXrh=v+x3bIHuN6Yg*N7~dQ+>GL9u3EwQgCLi7?y263=R_gEUhgaENP29Dy
zahb>5519}57&_&gX>Tm%s^Y!A<_6yvjqg53%a^ZOwdxn^?mvxwYjs-gFfcGMc)I$z
JtaD0e0szZ2oj3ph
literal 0
HcmV?d00001
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
GIT binary patch
literal 428
zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4B7JIrlhEy=Vy?UNYC{X11
zM}0S2$G2H-cU?l<_PXmDo5(9fxi0MC513uWBRDncce-rb=>yvgJN1-0q+&Jr)UP{L
z=AYXeH1GU(*17_{m~(T2yfj0Xoa|to9b4??^2Bl`lWkDS`YC*hKf;q+|147twaHds
zuj+F*J+gpno=Aiun<`7iMOU8e$Bq+440TkG>{Lq%WPa|};mSNGT0!h=L0)sj7Q4fa
z#naV`|F8IMA+9KPwNTH$OJbYqfo8s>2yT6+X&sLCJG<0Fk1Q~f+v~vhh3CAMO1(vx
z<bRHg$x79^nT5TRIWr9sj#XXnu`6Yo67+wm%=U^i+EqRso;Tikb<Di*R5dhj(&5R~
zE<Bz*`>rVpmKVO@%m2|7A@+HekmT+I%61CwCeIWtjXpK_d$9TLJb!WB2fmXVw#Pi<
zP)$;KY*##ce@SzGNAtcS+3J|2E{j*n;v2t-6y6YC(<|7%_xLUTBZ>Dns^wjFwDMs8
gt2`yhYi0b#^)sfeS6O?Vfq{X+)78&qol`;+08xajga7~l
literal 0
HcmV?d00001
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
GIT binary patch
literal 683
zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4B6?wWihEy=Vy?Wj|Bwph9
z$L%%gMzK2u4$9|pDVeLPN$B<bVczFBAw(qU*|m&|MoQwZ*2(87Ep-*>aC^Fl<0ZRZ
z*6gK9LM)fmO5I|6ycX3JO%yPC9+Q4<XSv#p>%ZkIc07M*Cn6&9WMfj)i?k_{lXBin
zNokvY=ONEgmvxPfVG|an$`wvJamBce;~j5l%epCb+b-DMej>-tdC_oLKwIro4aLkP
z&eXuB;D<e%yEf^#F8+T!%85_)k6nyr@QIE3cGq{ySH94jcV%;{&6bm#dnBCaRrRv-
zo=E;`A??DbYv6L;&sk?tgWRJPGelEfs^=cLA-a5SWlClzvqdJS1^3i9p+{9VUFn&e
z_xk!umAP4B6E@zqkaRtE%iyKMv3ZYEj%_++=<{gW*LlZ0g(Rg8rAbIe9XZKnbfwu>
z-{=dsdUhn=m3E%o2T$Cm`I|NIs1|;@xrw{b=aGuee?9fXCnBuX=AO7=Jm-$fv1col
z=1RTx-Q7C*@`+0-S2K^zbek4c5OgT&z|!{$=hj)wWfZTU8zi&Wfl=4UN58gbf&=5;
zLpMdAY%H5Ibz`5+RzFEO8^?K7UE;ncg3neMHQJaonopn5uJ`zCeT{Qpt$Lfg?1_!5
zD@2pUEKR(5&Yx3kKPTMOuW{N=u*+>*pjhr@4-d9LF<Uj0rz(MMs+#I9b2SdH6I`Wq
zZ!ym=hZlUCyT0Aja_?{uzm*>AvZ!Nw$Af!;E-qOSZj8Fc9UNO1HAHpZVAy2h@Wg9|
zTiY@XMfNPug(gc^sJiPdGKp1ams?<aSABU>&*J@3>TZ3Z2JQb$+*vCZ^ockvvGAK`
par&Cy|H<xo1#_F4n(7bbw?}?EX(DvYm4ShQ!PC{xWt~$(696ZWCu{%!
literal 0
HcmV?d00001
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
GIT binary patch
literal 432
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWmV3H5hEy=Vz2%$5<S5|&
zar<SRBtN0HJDNM)kIFb6jjWia5UFC>xJdot*^;ux8ig++5wRcYx5@?CXIweMBOc_X
zxpYbp{}&m{;B_|Xd~047lpbyqvSPNq{PFevK&csTBM!A)I<e;X+`pI3@RWpH50;uG
zdR2Bd)0>s=?ua~aDSdkV2iK3^2N@Vy1RNL`c~0|GEDPAMrs3!J(rJPQ{|lF<GVl4b
z^O_OkJdOW7PZ{rgdZ&1V`A^G(_louh`8(8)FyCpZXqYa*Um)~|(a*`|fM*B01!tba
z&O;Gp4hJ_eb4`;CFkmccIoAI&`3u)srhO-vuH}muJXU^mJm$}@j||U$ePp=*>tloD
z{F(n(?*F_-zCQW%);gO5JL_y782&yRyMbl<_0=5HJ_=5LT6cscq3`S08KL~USV2x@
z@%aDf^+L@9eXp+hGKz&<H#GV3>#uD}9b^5;70YsFNBp14*`xa9AbV!QNtSR~?Qe6K
n>@3Q4^ybzsof71w`IXiF|0!0VNYAYd3=9mOu6{1-oD!M<WMsjN
literal 0
HcmV?d00001
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
GIT binary patch
literal 565
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CW{_%8i45?szd*ytVaG=QX
zkNVfPE%v?REq2Q<T0m#vJKY}wx+@P(eUSXZYvUv(k(|ZKqBRrpm>0LO-70)Jzjy8y
z?t@Eat^D$X$<??xy(s@d%|3kt`yIt6rUrRwE}atOH8oOQ;YmwNOR^JF))YzZ?l(nU
zF#+?ppLx7R+r+~8U*I8b8=0*K7>!(HYh<?gh)Zsoq16|;pnHkNvEz#2mJUJJ4jz`|
zRdJTKNSbJ@;>>C1cf-|4>_J2J93{!ufroaL9$8?zhFhR{R)n|`+tv;5SPV6e?P4*^
zSisyP8(ru0OL)KJcjG8$o~Wa{glbii?PnfjY`n?5DSw{IW6rrp1*JXO<~`!+=bN<2
z?6SoXb+@1|b7xyDI~CY<KK_tn@f-f16={W2ju%h*A2ToA=dsEB2Du_f+c@Ln5gHra
zCW{#|vmM!zvFQ{K$g7u^MJzg&d~f4%MZ?;E3V)WJR{vIUUie*bD%bOv<>$=gJtru7
zWo&ky%XQ7SU^<)Nq>UZEVLMtxPw!E2GkD*j`_8~=@)gdBbABISR@1!0!vC{P<Vv_)
z;Y_Br0*b8Sh5b$yZwmT)mgL$Lg(<qYMa<^1T=hXxvM_#!qu(hRC9y7z$=%@{OPLJH
zyNizmJ->78hFa1_-JZ9~V%-Mcm^a?g@9BJ6(!h6t(P}|QNdq)){<2zX>quNYRR&5J
N44$rjF6*2UngHuL?b84N
literal 0
HcmV?d00001
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
GIT binary patch
literal 868
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWYkRslhEy=Vy>&iYrc~ni
z$L+WOUVY^mU0|N*ssHF;u=YDgukPbYOCzKF<K7(g%9tFXUo}}sgVoV>ikDulbJs%4
zZVpE&eaEg)N0zNOH)vgzP%)dBa{Ae0In^0wE<gEw=FFiz_v#P4J5c_uGA+VrrjOcW
z&Mf{?J%e*PzSA<wqZggjdA!GOuI-YDiENj37UxDiQ&ZQRWc6DznN#xj<Zc_sESpoR
zVHcgZ9g_I%(dZbJ(XLz2<TCZA#M@2$niD6~y<5O=cbON{yfjAEta-~H{r^?Jpy99F
zd(|(S8<@=fTW3t!*(|fmw=*Kf(XW=_AKS!a{YP&MqfTtBeE+hB)3RL9ojt<!+}-De
zcX|~6R7<P7P80a28+5>xd1mxuE#54VT~{*-=9;FwW6@hSaies|%{Bd+DLGv1mH*t@
ztmdR@JC{sYxc`J;jO<LS(`9WFR;F{lYx?-XWuxp8!6s?*ySqXcec9ZnwA-m*v&N>?
z5k3n}>{HmG*0rYbsHVuxSSMrNjZ$LF%M!(6q+P=fENW4TR^L&dw70?R;MOMDh0V(X
z#qL}`nD^+i#wK~rcf}$%OLf!&Q;b=@Pt2U~RdDIFD+<=lJheg@%Vm{zqz5$g+x7cg
z<<vV~``F6%NLX9%>n~iaGBsU2z8BA@nJ$~S@qEEYEu-z{Se8pHxbjwE`OFmAnb!T?
z>Ms{WNF6vi{e=Cq0^_bf$s*>zBc0D}wQN|-`Q(mojBWp%YR2^YO2_vdzN>v=qw$W@
zmtFj}YCP({J|Xz<kwr(=pICTbLwIuWiG{^SmL2fdC@9wyT0A}AL7ZAzu|`7tM-D^l
zCZ@6$7N129cNGLhrv)~Iy*NDa|L23!Dr)ixTYtCNaISj)$#Uo6VwE?tTe|P57FL%V
zPOVRq*DUDa-O_Ak;pVlcz3js8C2lj{Uv&P)T<tm0d5hq;TQX{?_ndB2Prh=}u({{#
z1m)IMI!eynA)YHA=SbAq^iNKj9_TXNbF0nv3ubqf{7;4MXy5iiPPFPkpxlE0FB#om
z3M&7rSN>eaoBK-2cIlp%TTjcRR{4Cj&kv|y=)`YzM$2hUQHPwV$MV~rRW~%0Q$XqV
c@w52rUNe`SPso#EU|?YIboFyt=akR{069jBr2qf`
literal 0
HcmV?d00001
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..9ad7e36 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 6669eb8..16bcde1 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 5885930..f9a6f7e 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">
--
GitLab