diff --git a/.idea/modules.xml b/.idea/modules.xml
index 280fecef02a1dfb103fd81e385e70115f834f9d1..afbdb1d3dd2770e7b92148ac30c9930fe15cae2a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/SmartPlanner.iml" filepath="$PROJECT_DIR$/SmartPlanner.iml" />
+ <module fileurl="file://$PROJECT_DIR$/SmartPlanner-master.iml" filepath="$PROJECT_DIR$/SmartPlanner-master.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea3a0a32fa6e80b54d2a0166eaf1d1a7819f59da..91221b923e6ea823a54ad3212fb6873e9076499c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,11 +2,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.chan24.smartplanner">
+
+ <permission android:name="com.example.chan24.smartplanner.permission.MAPS_RECEIVE"></permission>
+
<!--
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the 'MyLocation' functionality.
-->
+
+ <uses-permission android:name="com.example.chan24.smartplanner.permission.MAPS_RECEIVE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/app/src/main/res/drawable/rbut.xml b/app/src/main/res/drawable/rbut.xml
index 29b5e4ed94d636877442936e0726bc63772194d2..8755c7c8f1978ca6710dc5dd7617a9c1e6af8a13 100644
--- a/app/src/main/res/drawable/rbut.xml
+++ b/app/src/main/res/drawable/rbut.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
-
- android:shape="rectangle" android:padding="10dp">
- <solid android:color="#FFFACD"/> <!-- this one is ths color of the Rounded Button -->
- <corners
- android:bottomRightRadius="20dp"
- android:bottomLeftRadius="20dp"
- android:topLeftRadius="20dp"
- android:topRightRadius="20dp"
- />
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+
+ android:shape="rectangle" android:padding="10dp">
+ <solid android:color="#FFFACD"/> <!-- this one is ths color of the Rounded Button -->
+ <corners
+ android:bottomRightRadius="20dp"
+ android:bottomLeftRadius="20dp"
+ android:topLeftRadius="20dp"
+ android:topRightRadius="20dp" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 15f60b6face5fd9e75457b34f83981a1b57c7049..4269783fff61777b94d50aac54ca9e482d52769b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -8,8 +8,23 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
+ android:background="@drawable/buildings2"
tools:context="com.example.chan24.smartplanner.LoginActivity">
+ <ImageView
+ android:layout_width="29dp"
+ android:layout_height="30dp"
+ android:layout_marginTop="66dp"
+ android:layout_marginLeft="40dp"
+ android:src="@drawable/mail"/>
+ <ImageView
+ android:layout_width="29dp"
+ android:layout_height="40dp"
+ android:layout_marginTop="130dp"
+ android:layout_marginLeft="40dp"
+ android:src="@drawable/pass"/>
+
+
<EditText
android:id="@+id/email"
android:layout_width="wrap_content"
@@ -19,7 +34,10 @@
android:layout_marginTop="59dp"
android:ems="10"
android:hint="Email"
- android:inputType="textPersonName" />
+ android:textColorHint="#000000"
+ android:textStyle="bold"
+ android:inputType="textEmailAddress"
+ />
<EditText
android:layout_width="wrap_content"
@@ -33,22 +51,30 @@
android:hint="Password" />
<Button
- android:text="login"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:text="Login"
+ android:layout_width="100dp"
+ android:layout_height="50dp"
+ android:layout_marginTop="32dp"
+ android:textStyle="bold"
+ android:textColor="#000000"
+ android:background="#66CCCC"
+ android:id="@+id/login"
android:layout_below="@+id/password"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="49dp"
- android:id="@+id/login" />
+ android:layout_centerHorizontal="true" />
<TextView
- android:text="Not a member ? Register now!"
+ android:text="Not a registered user! Register now"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/login"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="81dp"
+ android:layout_marginTop="19dp"
android:id="@+id/reg"
- android:textStyle="normal|bold" />
+ android:textColor="#000000"
+ android:textStyle="bold"
+ android:layout_below="@+id/login"
+ android:layout_alignStart="@+id/password" />
</RelativeLayout>
+
+
+
+
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 16d3a4f04a78ff7e91ed384d2f777c01ce652f00..441cf86de80e20bb15fdb43f7909b46553d3dab0 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -37,7 +37,8 @@
android:layout_alignParentBottom="true"
android:layout_alignEnd="@+id/supermarket"
android:layout_weight="1"
- />
+ android:background="#0000FF"
+ />
<Button
android:id="@+id/dining"
@@ -48,8 +49,8 @@
android:layout_alignParentBottom="true"
android:layout_toEndOf="@+id/shopping"
android:layout_marginStart="46dp"
- android:layout_weight="1"
- />
+ android:background="#FFA500"
+ android:layout_weight="1" />
<Button
android:id="@+id/supermarket"
@@ -60,12 +61,9 @@
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_weight="1"
- />
+ android:background="#7FFF00"/>
</LinearLayout>
-
-
-
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 78d07884e6956e05cc6b5703f5b124f51f7a7109..db383aa9bf4561f0cc527b4d218832024411e087 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -8,6 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
+ android:background="@drawable/gradient1"
tools:context="com.example.chan24.smartplanner.ProfileActivity">
<TextView
@@ -18,17 +19,38 @@
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginStart="136dp"
+ android:layout_centerHorizontal="true"
+ android:textAlignment="center"
+ android:textColor="#66CCCC"
android:layout_marginTop="21dp"
android:id="@+id/uname" />
<TextView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
android:layout_below="@+id/uname"
android:layout_marginTop="48dp"
android:id="@+id/userName"
+ android:layout_height="30dp"
+ android:textSize="25dp"
+ android:text=""
+ android:textColor="#000000"
+ android:layout_marginLeft="45dp"
android:layout_alignParentStart="true" />
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:src="@drawable/age"
+ android:layout_marginTop="166dp"
+ android:layout_marginLeft="8dp" />
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:src="@drawable/username"
+ android:layout_marginTop="110dp"
+ android:layout_marginLeft="8dp" />
+
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -36,18 +58,24 @@
android:ems="10"
android:id="@+id/age"
android:hint="Age"
+ android:textColor="#000000"
android:layout_below="@+id/userName"
android:layout_alignParentStart="true"
- android:layout_marginTop="24dp" />
+ android:layout_marginTop="24dp"
+ android:textStyle="bold"
+ android:layout_marginLeft="40dp"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="phone"
android:ems="10"
+ android:textStyle="bold"
android:layout_below="@+id/gender"
+ android:textColor="#000000"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
+ android:layout_marginLeft="80dp"
android:id="@+id/phone"
android:hint="Phone" />
@@ -57,6 +85,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="44dp"
android:id="@+id/cancel"
+ android:background="@drawable/rbut"
android:layout_below="@+id/phone"
android:layout_alignParentStart="true"
android:layout_marginStart="44dp" />
@@ -69,6 +98,7 @@
android:layout_below="@+id/age"
android:layout_alignParentStart="true"
android:layout_marginStart="10dp"
+ android:layout_marginLeft="80dp"
android:layout_marginTop="17dp">
<RadioButton
@@ -76,7 +106,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/male"
- android:layout_weight="1" />
+ android:layout_weight="1"
+ android:layout_marginLeft="40dp"/>
<RadioButton
android:text="Female"
@@ -86,15 +117,30 @@
android:layout_weight="1" />
</RadioGroup>
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:src="@drawable/gender"
+ android:layout_marginTop="225dp"
+ android:layout_marginLeft="8dp" />
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:src="@drawable/phone"
+ android:layout_marginTop="290dp"
+ android:layout_marginLeft="8dp" />
+
<Button
android:text="Save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/cancel"
android:layout_alignParentEnd="true"
+ android:background="@drawable/rbut"
android:layout_marginEnd="50dp"
android:onClick="save"
-
android:id="@+id/save" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index e648aae56c77b1a97240780383c959ee9d04f6f4..321e8e894ad4253cb8861c2670ec2f16d8b47ebd 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -8,6 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
+ android:background="@drawable/buildings2"
tools:context="com.example.chan24.smartplanner.RegisterActivity">
<EditText
@@ -17,10 +18,31 @@
android:ems="10"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
+ android:textColorHint="#000000"
android:layout_marginTop="48dp"
android:id="@+id/user"
android:hint="Username" />
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:src="@drawable/username"
+ android:layout_marginTop="56dp"
+ android:layout_marginLeft="35dp" />
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:src="@drawable/pass"
+ android:layout_marginTop="145dp"
+ android:layout_marginLeft="35dp" />
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:src="@drawable/mail"
+ android:layout_marginTop="229dp"
+ android:layout_marginLeft="35dp" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -30,6 +52,7 @@
android:layout_alignEnd="@+id/user"
android:layout_marginTop="46dp"
android:id="@+id/pass"
+ android:textColorHint="#000000"
android:hint="Password" />
<EditText
@@ -40,15 +63,19 @@
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/pass"
android:id="@+id/mail"
+ android:layout_below="@+id/pass"
+ android:layout_marginTop="38dp"
+ android:textColorHint="#000000"
android:hint="Email" />
<Button
android:text="sign up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/mail"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="50dp"
+ android:layout_marginTop="18dp"
android:onClick="signup"
- android:id="@+id/signup" />
+ android:id="@+id/signup"
+ android:background="#66cccc"
+ android:layout_below="@+id/mail"
+ android:layout_centerHorizontal="true" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml
index 6cdbec34721adc989de3dfebab43bc95abfb5dd0..3ad074cf9c0c6d21354268b61566832a63948da6 100644
--- a/app/src/main/res/layout/activity_user_area.xml
+++ b/app/src/main/res/layout/activity_user_area.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
- tools:context="com.example.chan24.smartplanner.UserArea"
+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:background="@drawable/gradient1"
+tools:context="com.example.chan24.smartplanner.UserArea"
>
<LinearLayout
android:layout_width="match_parent"
@@ -17,7 +18,7 @@
android:id="@+id/textView2"
android:layout_width="match_parent"
android:text=""
- android:textColor="@color/wallet_holo_blue_light"
+ android:textColor="#66CCCC"
android:textSize="35dp"
android:textAlignment="center"
android:layout_height="80dp" />
@@ -27,6 +28,7 @@
android:layout_height="35dp"
android:text="What do you want to do?"
android:textColor="@color/colorPrimaryDark"
+ android:textStyle="bold"
android:textSize="25dp"
android:layout_marginTop="10dp"
/>
@@ -53,6 +55,7 @@
android:layout_width="match_parent"
android:layout_height="35dp"
android:text="How far can you go?"
+ android:textStyle="bold"
android:textSize="25dp"
android:textColor="@color/colorPrimary"
android:layout_marginTop="30dp"
@@ -63,28 +66,31 @@
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="20dp"
- android:hint="Distance in km"
+ android:hint="Distance in m"
+ android:textStyle="bold"
android:inputType="number" />
<Button
android:id="@+id/save"
- android:layout_width="wrap_content"
+ android:layout_width="120dp"
android:layout_height="wrap_content"
- android:layout_marginLeft="135dp"
- android:layout_marginTop="70dp"
+ android:layout_marginTop="55dp"
+ android:background="@drawable/rbut"
+ android:layout_gravity="center"
android:text="Find places!" />
</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:id="@+id/navigation_view">
+<android.support.design.widget.NavigationView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:background="#FFFFE0"
+ app:menu="@menu/navigation_menu"
+ app:headerLayout="@layout/navigation_header"
+ android:layout_gravity="start"
+ android:id="@+id/navigation_view">
- </android.support.design.widget.NavigationView>
+</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
index aa5548c1cec0ecdf3a8993a8861da17d5c8bd0c2..ddadd52abcc0330a1e4afb6e2102fc551de07079 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="144dp"