Skip to content
Snippets Groups Projects
Commit 90df29ff authored by chan24's avatar chan24
Browse files

images

parents 5d51cd0e 4eb4c7f9
Branches
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/SmartPlanner.iml" filepath="$PROJECT_DIR$/SmartPlanner.iml" /> <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" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules> </modules>
</component> </component>
......
...@@ -2,11 +2,16 @@ ...@@ -2,11 +2,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.chan24.smartplanner"> 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 The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
Google Maps Android API v2, but you must specify either coarse or fine Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the 'MyLocation' functionality. 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.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
......
...@@ -9,6 +9,5 @@ ...@@ -9,6 +9,5 @@
android:bottomRightRadius="20dp" android:bottomRightRadius="20dp"
android:bottomLeftRadius="20dp" android:bottomLeftRadius="20dp"
android:topLeftRadius="20dp" android:topLeftRadius="20dp"
android:topRightRadius="20dp" android:topRightRadius="20dp" />
/>
</shape> </shape>
\ No newline at end of file
...@@ -8,8 +8,23 @@ ...@@ -8,8 +8,23 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/buildings2"
tools:context="com.example.chan24.smartplanner.LoginActivity"> 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 <EditText
android:id="@+id/email" android:id="@+id/email"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -19,7 +34,10 @@ ...@@ -19,7 +34,10 @@
android:layout_marginTop="59dp" android:layout_marginTop="59dp"
android:ems="10" android:ems="10"
android:hint="Email" android:hint="Email"
android:inputType="textPersonName" /> android:textColorHint="#000000"
android:textStyle="bold"
android:inputType="textEmailAddress"
/>
<EditText <EditText
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -33,22 +51,30 @@ ...@@ -33,22 +51,30 @@
android:hint="Password" /> android:hint="Password" />
<Button <Button
android:text="login" android:text="Login"
android:layout_width="wrap_content" android:layout_width="100dp"
android:layout_height="wrap_content" 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_below="@+id/password"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true" />
android:layout_marginTop="49dp"
android:id="@+id/login" />
<TextView <TextView
android:text="Not a member ? Register now!" android:text="Not a registered user! Register now"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/login" android:layout_marginTop="19dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="81dp"
android:id="@+id/reg" 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> </RelativeLayout>
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignEnd="@+id/supermarket" android:layout_alignEnd="@+id/supermarket"
android:layout_weight="1" android:layout_weight="1"
android:background="#0000FF"
/> />
<Button <Button
...@@ -48,8 +49,8 @@ ...@@ -48,8 +49,8 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_toEndOf="@+id/shopping" android:layout_toEndOf="@+id/shopping"
android:layout_marginStart="46dp" android:layout_marginStart="46dp"
android:layout_weight="1" android:background="#FFA500"
/> android:layout_weight="1" />
<Button <Button
android:id="@+id/supermarket" android:id="@+id/supermarket"
...@@ -60,12 +61,9 @@ ...@@ -60,12 +61,9 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_weight="1" android:layout_weight="1"
/> android:background="#7FFF00"/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/gradient1"
tools:context="com.example.chan24.smartplanner.ProfileActivity"> tools:context="com.example.chan24.smartplanner.ProfileActivity">
<TextView <TextView
...@@ -18,17 +19,38 @@ ...@@ -18,17 +19,38 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="136dp" android:layout_marginStart="136dp"
android:layout_centerHorizontal="true"
android:textAlignment="center"
android:textColor="#66CCCC"
android:layout_marginTop="21dp" android:layout_marginTop="21dp"
android:id="@+id/uname" /> android:id="@+id/uname" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/uname" android:layout_below="@+id/uname"
android:layout_marginTop="48dp" android:layout_marginTop="48dp"
android:id="@+id/userName" android:id="@+id/userName"
android:layout_height="30dp"
android:textSize="25dp"
android:text=""
android:textColor="#000000"
android:layout_marginLeft="45dp"
android:layout_alignParentStart="true" /> 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 <EditText
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -36,18 +58,24 @@ ...@@ -36,18 +58,24 @@
android:ems="10" android:ems="10"
android:id="@+id/age" android:id="@+id/age"
android:hint="Age" android:hint="Age"
android:textColor="#000000"
android:layout_below="@+id/userName" android:layout_below="@+id/userName"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="24dp" /> android:layout_marginTop="24dp"
android:textStyle="bold"
android:layout_marginLeft="40dp"/>
<EditText <EditText
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="phone" android:inputType="phone"
android:ems="10" android:ems="10"
android:textStyle="bold"
android:layout_below="@+id/gender" android:layout_below="@+id/gender"
android:textColor="#000000"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:layout_marginLeft="80dp"
android:id="@+id/phone" android:id="@+id/phone"
android:hint="Phone" /> android:hint="Phone" />
...@@ -57,6 +85,7 @@ ...@@ -57,6 +85,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="44dp" android:layout_marginTop="44dp"
android:id="@+id/cancel" android:id="@+id/cancel"
android:background="@drawable/rbut"
android:layout_below="@+id/phone" android:layout_below="@+id/phone"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="44dp" /> android:layout_marginStart="44dp" />
...@@ -69,6 +98,7 @@ ...@@ -69,6 +98,7 @@
android:layout_below="@+id/age" android:layout_below="@+id/age"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginLeft="80dp"
android:layout_marginTop="17dp"> android:layout_marginTop="17dp">
<RadioButton <RadioButton
...@@ -76,7 +106,8 @@ ...@@ -76,7 +106,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/male" android:id="@+id/male"
android:layout_weight="1" /> android:layout_weight="1"
android:layout_marginLeft="40dp"/>
<RadioButton <RadioButton
android:text="Female" android:text="Female"
...@@ -86,15 +117,30 @@ ...@@ -86,15 +117,30 @@
android:layout_weight="1" /> android:layout_weight="1" />
</RadioGroup> </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 <Button
android:text="Save" android:text="Save"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@+id/cancel" android:layout_alignTop="@+id/cancel"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:background="@drawable/rbut"
android:layout_marginEnd="50dp" android:layout_marginEnd="50dp"
android:onClick="save" android:onClick="save"
android:id="@+id/save" /> android:id="@+id/save" />
</RelativeLayout> </RelativeLayout>
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/buildings2"
tools:context="com.example.chan24.smartplanner.RegisterActivity"> tools:context="com.example.chan24.smartplanner.RegisterActivity">
<EditText <EditText
...@@ -17,10 +18,31 @@ ...@@ -17,10 +18,31 @@
android:ems="10" android:ems="10"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:textColorHint="#000000"
android:layout_marginTop="48dp" android:layout_marginTop="48dp"
android:id="@+id/user" android:id="@+id/user"
android:hint="Username" /> 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 <EditText
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -30,6 +52,7 @@ ...@@ -30,6 +52,7 @@
android:layout_alignEnd="@+id/user" android:layout_alignEnd="@+id/user"
android:layout_marginTop="46dp" android:layout_marginTop="46dp"
android:id="@+id/pass" android:id="@+id/pass"
android:textColorHint="#000000"
android:hint="Password" /> android:hint="Password" />
<EditText <EditText
...@@ -40,15 +63,19 @@ ...@@ -40,15 +63,19 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignEnd="@+id/pass" android:layout_alignEnd="@+id/pass"
android:id="@+id/mail" android:id="@+id/mail"
android:layout_below="@+id/pass"
android:layout_marginTop="38dp"
android:textColorHint="#000000"
android:hint="Email" /> android:hint="Email" />
<Button <Button
android:text="sign up" android:text="sign up"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/mail" android:layout_marginTop="18dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="50dp"
android:onClick="signup" android:onClick="signup"
android:id="@+id/signup" /> android:id="@+id/signup"
android:background="#66cccc"
android:layout_below="@+id/mail"
android:layout_centerHorizontal="true" />
</RelativeLayout> </RelativeLayout>
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
android:id="@+id/activity_user_area" android:id="@+id/activity_user_area"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/gradient1"
tools:context="com.example.chan24.smartplanner.UserArea" tools:context="com.example.chan24.smartplanner.UserArea"
> >
<LinearLayout <LinearLayout
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:text="" android:text=""
android:textColor="@color/wallet_holo_blue_light" android:textColor="#66CCCC"
android:textSize="35dp" android:textSize="35dp"
android:textAlignment="center" android:textAlignment="center"
android:layout_height="80dp" /> android:layout_height="80dp" />
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
android:layout_height="35dp" android:layout_height="35dp"
android:text="What do you want to do?" android:text="What do you want to do?"
android:textColor="@color/colorPrimaryDark" android:textColor="@color/colorPrimaryDark"
android:textStyle="bold"
android:textSize="25dp" android:textSize="25dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
/> />
...@@ -53,6 +55,7 @@ ...@@ -53,6 +55,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="35dp"
android:text="How far can you go?" android:text="How far can you go?"
android:textStyle="bold"
android:textSize="25dp" android:textSize="25dp"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
...@@ -63,15 +66,17 @@ ...@@ -63,15 +66,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:hint="Distance in km" android:hint="Distance in m"
android:textStyle="bold"
android:inputType="number" /> android:inputType="number" />
<Button <Button
android:id="@+id/save" android:id="@+id/save"
android:layout_width="wrap_content" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="135dp" android:layout_marginTop="55dp"
android:layout_marginTop="70dp" android:background="@drawable/rbut"
android:layout_gravity="center"
android:text="Find places!" /> android:text="Find places!" />
...@@ -80,6 +85,7 @@ ...@@ -80,6 +85,7 @@
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#FFFFE0"
app:menu="@menu/navigation_menu" app:menu="@menu/navigation_menu"
app:headerLayout="@layout/navigation_header" app:headerLayout="@layout/navigation_header"
android:layout_gravity="start" android:layout_gravity="start"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="144dp" android:layout_height="144dp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment