From 8296ffc5ede32f258447cb2e7b086c8937f21bed Mon Sep 17 00:00:00 2001
From: Gilbert Kimutai <gilbertkimutai@gmail.com>
Date: Sun, 31 Mar 2019 08:09:47 +0300
Subject: [PATCH] UI design for customer pages

---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   8 +-
 .../wc/ui/onboarding/UserDetailsActivity.kt   |  23 ++
 .../main/res/layout/activity_user_details.xml |  34 ++
 .../main/res/layout/content_user_details.xml  | 220 ++++++++++
 .../res/layout/customer_basic_details.xml     | 220 ++++++++++
 .../res/layout/customer_billing_address.xml   | 381 ++++++++++++++++++
 .../res/layout/customer_shipping_address.xml  | 357 ++++++++++++++++
 app/src/main/res/values/strings.xml           |   1 +
 9 files changed, 1242 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt
 create mode 100644 app/src/main/res/layout/activity_user_details.xml
 create mode 100644 app/src/main/res/layout/content_user_details.xml
 create mode 100644 app/src/main/res/layout/customer_basic_details.xml
 create mode 100644 app/src/main/res/layout/customer_billing_address.xml
 create mode 100644 app/src/main/res/layout/customer_shipping_address.xml

diff --git a/app/build.gradle b/app/build.gradle
index 366a9f3..2128039 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -107,4 +107,4 @@ dependencies {
 
 
 apply plugin: 'com.google.gms.google-services'
-googleServices { disableVersionCheck = true }
\ No newline at end of file
+googleServices { disableVersionCheck = true }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 602c579..9298c27 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,11 @@
 	android:supportsRtl="true"
 	android:theme="@style/AppTheme"
 	android:usesCleartextTraffic="true">
+	<activity
+	  android:name=".ui.onboarding.UserDetailsActivity"
+	  android:label="@string/title_activity_user_details"
+	  android:theme="@style/AppTheme.NoActionBar">
+	</activity>
 	<activity
 	  android:name=".ui.order.MyOrdersActivity"
 	  android:label="@string/title_activity_my_orders"
@@ -28,19 +33,16 @@
 	  android:label="@string/title_activity_category"
 	  android:theme="@style/AppTheme.NoActionBar">
 	</activity>
-
 	<activity
 	  android:name="me.gilo.raison.ui.user.onboarding.SignUpActivity"
 	  android:label="@string/title_activity_category"
 	  android:theme="@style/AppTheme.NoActionBar">
 	</activity>
-
 	<activity
 	  android:name="me.gilo.raison.ui.user.onboarding.SignInActivity"
 	  android:label="@string/title_activity_category"
 	  android:theme="@style/AppTheme.NoActionBar">
 	</activity>
-
 	<activity
 	  android:name=".ui.product.NavigatioDrawerActivity"
 	  android:label="@string/title_activity_navigatio_drawer"
diff --git a/app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt b/app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt
new file mode 100644
index 0000000..006c4f2
--- /dev/null
+++ b/app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt
@@ -0,0 +1,23 @@
+package me.gilo.wc.ui.onboarding
+
+import android.os.Bundle
+import android.support.design.widget.Snackbar
+import android.support.v7.app.AppCompatActivity
+import me.gilo.wc.R
+
+import kotlinx.android.synthetic.main.activity_user_details.*
+
+class UserDetailsActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_user_details)
+        setSupportActionBar(toolbar)
+
+        fab.setOnClickListener { view ->
+            Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                .setAction("Action", null).show()
+        }
+    }
+
+}
diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml
new file mode 100644
index 0000000..a6acc08
--- /dev/null
+++ b/app/src/main/res/layout/activity_user_details.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+  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="match_parent"
+  tools:context=".ui.onboarding.UserDetailsActivity">
+
+  <android.support.design.widget.AppBarLayout
+	android:layout_height="wrap_content"
+	android:layout_width="match_parent"
+	android:theme="@style/AppTheme.AppBarOverlay">
+
+	<android.support.v7.widget.Toolbar
+	  android:id="@+id/toolbar"
+	  android:layout_width="match_parent"
+	  android:layout_height="?attr/actionBarSize"
+	  android:background="?attr/colorPrimary"
+	  app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+  </android.support.design.widget.AppBarLayout>
+
+  <include layout="@layout/content_user_details"/>
+
+  <android.support.design.widget.FloatingActionButton
+	android:id="@+id/fab"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_gravity="bottom|end"
+	android:layout_margin="@dimen/fab_margin"
+	app:srcCompat="@android:drawable/ic_dialog_email"/>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_user_details.xml b/app/src/main/res/layout/content_user_details.xml
new file mode 100644
index 0000000..a0dfd32
--- /dev/null
+++ b/app/src/main/res/layout/content_user_details.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  xmlns:app="http://schemas.android.com/apk/res-auto"
+			  xmlns:attrs="http://schemas.android.com/apk/res-auto"
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent"
+			  android:orientation="vertical"
+			  android:background="@color/bg"
+			  tools:ignore="MissingPrefix"
+			  app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+  <TextView
+	fontPath="@string/font_medium"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginTop="40dp"
+	android:layout_marginRight="16dp"
+	android:text="Customer details"
+	android:textColor="@color/text_black_2"
+	android:textSize="20sp"
+	/>
+
+  <TextView
+	fontPath="@string/font_regular"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginRight="16dp"
+	android:layout_marginTop="4dp"
+	android:text="Enter the information below"
+	android:maxLines="6"
+	android:lineSpacingMultiplier="1.2"
+	android:textColor="@color/text_black_9"
+	android:textSize="16sp"/>
+
+  <android.support.v4.widget.NestedScrollView
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	>
+
+	<LinearLayout
+	  android:layout_width="match_parent"
+	  android:layout_height="match_parent"
+	  android:orientation="vertical"
+	  >
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		android:background="@drawable/rect_white"
+		android:elevation="2dp"
+		android:layout_margin="16dp"
+		android:padding="16dp">
+
+
+		<LinearLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:orientation="horizontal">
+
+		  <android.support.design.widget.TextInputLayout
+			android:id="@+id/tilFirstName"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:textColorHint="#9e9e9e"
+			android:theme="@style/OnboardingTextLabel"
+			android:visibility="visible">
+
+			<EditText
+			  android:id="@+id/etFirstName"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:hint="First name"
+			  android:inputType="textPersonName"
+			  android:paddingBottom="16dp"
+			  android:textColor="#5f6368"
+			  android:textColorHint="#9e9e9e"
+			  android:textSize="16sp"
+
+			  />
+
+		  </android.support.design.widget.TextInputLayout>
+
+
+		  <android.support.design.widget.TextInputLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:id="@+id/tilLastName"
+			android:textColorHint="#9e9e9e"
+			android:theme="@style/OnboardingTextLabel"
+			android:visibility="visible">
+
+			<EditText
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:hint="Last name"
+			  android:id="@+id/etLastName"
+			  android:inputType="textPersonName"
+			  android:paddingBottom="16dp"
+			  android:textColor="#5f6368"
+			  android:textColorHint="#9e9e9e"
+			  android:textSize="16sp"
+
+			  />
+
+		  </android.support.design.widget.TextInputLayout>
+
+		</LinearLayout>
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:id="@+id/tilEmail"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Email"
+			android:id="@+id/etEmail"
+			android:inputType="textEmailAddress"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:id="@+id/tilPassword"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Username"
+			android:id="@+id/etPassword"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+	  </LinearLayout>
+
+
+
+
+	</LinearLayout>
+
+  </android.support.v4.widget.NestedScrollView>
+
+  <FrameLayout
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@color/colorPrimary"
+	android:orientation="horizontal"
+	android:paddingTop="4dp"
+	android:paddingBottom="4dp"
+	android:paddingRight="16dp"
+	android:layout_margin="16dp"
+	android:gravity="center"
+	android:elevation="2dp"
+	android:id="@+id/flSignup"
+	>
+
+	<TextView
+	  android:id="@+id/bNext"
+	  fontPath="@string/font_regular"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_gravity="center_horizontal"
+	  android:background="@color/colorPrimary"
+	  android:text="Create Account"
+	  android:padding="12dp"
+	  android:gravity="center"
+	  android:textAllCaps="false"
+	  android:textColor="#ffffff"
+	  android:textSize="16sp"
+	  tools:ignore="MissingPrefix"/>
+
+	<ImageView
+	  android:layout_width="32dp"
+	  android:layout_height="32dp"
+	  android:src="@drawable/ic_action_navigation_arrow_back_inverted"
+	  android:tint="#ffffff"
+	  android:layout_gravity="right|center"
+	  android:rotation="180"
+	  />
+
+  </FrameLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/customer_basic_details.xml b/app/src/main/res/layout/customer_basic_details.xml
new file mode 100644
index 0000000..4f17c67
--- /dev/null
+++ b/app/src/main/res/layout/customer_basic_details.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  xmlns:app="http://schemas.android.com/apk/res-auto"
+			  xmlns:attrs="http://schemas.android.com/apk/res-auto"
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent"
+			  android:orientation="vertical"
+			  android:background="@color/bg"
+			  tools:ignore="MissingPrefix"
+			  app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+  <TextView
+	fontPath="@string/font_medium"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginTop="40dp"
+	android:layout_marginRight="16dp"
+	android:text="Basic details"
+	android:textColor="@color/text_black_2"
+	android:textSize="20sp"
+	/>
+
+  <TextView
+	fontPath="@string/font_regular"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginRight="16dp"
+	android:layout_marginTop="4dp"
+	android:text="Enter the information below"
+	android:maxLines="6"
+	android:lineSpacingMultiplier="1.2"
+	android:textColor="@color/text_black_9"
+	android:textSize="16sp"/>
+
+  <android.support.v4.widget.NestedScrollView
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	>
+
+	<LinearLayout
+	  android:layout_width="match_parent"
+	  android:layout_height="match_parent"
+	  android:orientation="vertical"
+	  >
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		android:background="@drawable/rect_white"
+		android:elevation="2dp"
+		android:layout_margin="16dp"
+		android:padding="16dp">
+
+
+		<LinearLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:orientation="horizontal">
+
+		  <android.support.design.widget.TextInputLayout
+			android:id="@+id/tilFirstName"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:textColorHint="#9e9e9e"
+			android:theme="@style/OnboardingTextLabel"
+			android:visibility="visible">
+
+			<EditText
+			  android:id="@+id/etFirstName"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:hint="First name"
+			  android:inputType="textPersonName"
+			  android:paddingBottom="16dp"
+			  android:textColor="#5f6368"
+			  android:textColorHint="#9e9e9e"
+			  android:textSize="16sp"
+
+			  />
+
+		  </android.support.design.widget.TextInputLayout>
+
+
+		  <android.support.design.widget.TextInputLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:id="@+id/tilLastName"
+			android:textColorHint="#9e9e9e"
+			android:theme="@style/OnboardingTextLabel"
+			android:visibility="visible">
+
+			<EditText
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:hint="Last name"
+			  android:id="@+id/etLastName"
+			  android:inputType="textPersonName"
+			  android:paddingBottom="16dp"
+			  android:textColor="#5f6368"
+			  android:textColorHint="#9e9e9e"
+			  android:textSize="16sp"
+
+			  />
+
+		  </android.support.design.widget.TextInputLayout>
+
+		</LinearLayout>
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:id="@+id/tilEmail"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Email"
+			android:id="@+id/etEmail"
+			android:inputType="textEmailAddress"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:id="@+id/tilPassword"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Username"
+			android:id="@+id/etPassword"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+	  </LinearLayout>
+
+
+
+
+	</LinearLayout>
+
+  </android.support.v4.widget.NestedScrollView>
+
+  <FrameLayout
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@color/colorPrimary"
+	android:orientation="horizontal"
+	android:paddingTop="4dp"
+	android:paddingBottom="4dp"
+	android:paddingRight="16dp"
+	android:layout_margin="16dp"
+	android:gravity="center"
+	android:elevation="2dp"
+	android:id="@+id/flSignup"
+	>
+
+	<TextView
+	  android:id="@+id/bNext"
+	  fontPath="@string/font_regular"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_gravity="center_horizontal"
+	  android:background="@color/colorPrimary"
+	  android:text="Save Details"
+	  android:padding="12dp"
+	  android:gravity="center"
+	  android:textAllCaps="false"
+	  android:textColor="#ffffff"
+	  android:textSize="16sp"
+	  tools:ignore="MissingPrefix"/>
+
+	<ImageView
+	  android:layout_width="32dp"
+	  android:layout_height="32dp"
+	  android:src="@drawable/ic_action_navigation_arrow_back_inverted"
+	  android:tint="#ffffff"
+	  android:layout_gravity="right|center"
+	  android:rotation="180"
+	  />
+
+  </FrameLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/customer_billing_address.xml b/app/src/main/res/layout/customer_billing_address.xml
new file mode 100644
index 0000000..fb0b09f
--- /dev/null
+++ b/app/src/main/res/layout/customer_billing_address.xml
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  xmlns:app="http://schemas.android.com/apk/res-auto"
+			  xmlns:attrs="http://schemas.android.com/apk/res-auto"
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent"
+			  android:orientation="vertical"
+			  android:background="@color/bg"
+			  tools:ignore="MissingPrefix"
+			  app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+  <TextView
+	fontPath="@string/font_medium"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginTop="24dp"
+	android:layout_marginRight="16dp"
+	android:text="Billing Address"
+	android:textColor="@color/text_black_2"
+	android:textSize="20sp"
+	/>
+
+  <TextView
+	fontPath="@string/font_regular"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginRight="16dp"
+	android:layout_marginTop="4dp"
+	android:text="Enter your billing address below"
+	android:maxLines="6"
+	android:lineSpacingMultiplier="1.2"
+	android:textColor="@color/text_black_9"
+	android:textSize="16sp"/>
+
+
+  <android.support.v4.widget.NestedScrollView
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_weight="1"
+	>
+
+
+	<LinearLayout
+	  android:layout_width="match_parent"
+	  android:layout_height="wrap_content"
+	  android:orientation="vertical"
+	  android:background="@drawable/rect_white"
+	  android:elevation="2dp"
+	  android:layout_margin="16dp"
+	  android:padding="16dp">
+
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_weight="1"
+		  android:id="@+id/tilFirstName"
+		  android:textColorHint="#9e9e9e"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="First name"
+			android:id="@+id/etFirstName"
+			android:inputType="textPersonName"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_weight="1"
+		  android:textColorHint="#9e9e9e"
+		  android:id="@+id/tilLastName"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Last name"
+			android:id="@+id/etLastName"
+			android:inputType="textPersonName"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+	  </LinearLayout>
+
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:id="@+id/tilCompany"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Company"
+		  android:id="@+id/etCompany"
+		  android:inputType="textEmailAddress"
+		  android:paddingBottom="16dp"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:id="@+id/tilStreetAddress"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Street Address"
+		  android:id="@+id/etStreetAddress"
+		  android:inputType="textPassword"
+		  android:paddingBottom="16dp"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:id="@+id/tilStreetAddress2"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Street Address 2"
+		  android:inputType="textPassword"
+		  android:paddingBottom="16dp"
+		  android:id="@+id/etStreetAddress2"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:layout_weight="1"
+		  android:id="@+id/tilCity"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="City"
+			android:id="@+id/etCity"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:layout_weight="1"
+		  android:id="@+id/tilState"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="State"
+			android:id="@+id/etState"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+	  </LinearLayout>
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:layout_weight="1"
+		  android:id="@+id/tilZipcode"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Zip code"
+			android:id="@+id/etZipcode"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+		<View
+		  android:layout_width="match_parent"
+		  android:layout_height="1dp"
+		  android:layout_weight="1"/>
+
+
+	  </LinearLayout>
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:layout_weight="1"
+		android:id="@+id/tilCountry"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Country"
+		  android:id="@+id/etCountry"
+		  android:inputType="textPassword"
+		  android:paddingBottom="16dp"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:id="@+id/tilPhone"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Phone"
+		  android:id="@+id/etPhone"
+		  android:inputType="textEmailAddress"
+		  android:paddingBottom="16dp"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+
+	</LinearLayout>
+  </android.support.v4.widget.NestedScrollView>
+
+  <FrameLayout
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@color/colorPrimary"
+	android:orientation="horizontal"
+	android:paddingTop="4dp"
+	android:paddingBottom="4dp"
+	android:paddingRight="16dp"
+	android:layout_margin="16dp"
+	android:gravity="center"
+	android:elevation="2dp"
+	android:id="@+id/flSave"
+	>
+
+	<TextView
+	  android:id="@+id/bNext"
+	  fontPath="@string/font_regular"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_gravity="center_horizontal"
+	  android:background="@color/colorPrimary"
+	  android:text="Save Billing Address"
+	  android:padding="12dp"
+	  android:gravity="center"
+	  android:textAllCaps="false"
+	  android:textColor="#ffffff"
+	  android:textSize="16sp"
+	  tools:ignore="MissingPrefix"/>
+
+	<ImageView
+	  android:layout_width="32dp"
+	  android:layout_height="32dp"
+	  android:src="@drawable/ic_action_navigation_arrow_back_inverted"
+	  android:tint="#ffffff"
+	  android:layout_gravity="right|center"
+	  android:rotation="180"
+	  />
+
+  </FrameLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/customer_shipping_address.xml b/app/src/main/res/layout/customer_shipping_address.xml
new file mode 100644
index 0000000..ebd1465
--- /dev/null
+++ b/app/src/main/res/layout/customer_shipping_address.xml
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  xmlns:app="http://schemas.android.com/apk/res-auto"
+			  xmlns:attrs="http://schemas.android.com/apk/res-auto"
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent"
+			  android:orientation="vertical"
+			  android:background="@color/bg"
+			  tools:ignore="MissingPrefix"
+			  app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+  <TextView
+	fontPath="@string/font_medium"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginTop="24dp"
+	android:layout_marginRight="16dp"
+	android:text="Shipping Address"
+	android:textColor="@color/text_black_2"
+	android:textSize="20sp"
+	/>
+
+  <TextView
+	fontPath="@string/font_regular"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:layout_marginLeft="16dp"
+	android:layout_marginRight="16dp"
+	android:layout_marginTop="4dp"
+	android:text="Enter your shipping address below"
+	android:maxLines="6"
+	android:lineSpacingMultiplier="1.2"
+	android:textColor="@color/text_black_9"
+	android:textSize="16sp"/>
+
+
+  <android.support.v4.widget.NestedScrollView
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_weight="1"
+	>
+
+
+	<LinearLayout
+	  android:layout_width="match_parent"
+	  android:layout_height="wrap_content"
+	  android:orientation="vertical"
+	  android:background="@drawable/rect_white"
+	  android:elevation="2dp"
+	  android:layout_margin="16dp"
+	  android:padding="16dp">
+
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_weight="1"
+		  android:id="@+id/tilFirstName"
+		  android:textColorHint="#9e9e9e"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="First name"
+			android:id="@+id/etFirstName"
+			android:inputType="textPersonName"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_weight="1"
+		  android:textColorHint="#9e9e9e"
+		  android:id="@+id/tilLastName"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Last name"
+			android:id="@+id/etLastName"
+			android:inputType="textPersonName"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+	  </LinearLayout>
+
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:id="@+id/tilCompany"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Company"
+		  android:id="@+id/etCompany"
+		  android:inputType="textEmailAddress"
+		  android:paddingBottom="16dp"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:id="@+id/tilStreetAddress"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Street Address"
+		  android:id="@+id/etStreetAddress"
+		  android:inputType="textPassword"
+		  android:paddingBottom="16dp"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:id="@+id/tilStreetAddress2"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Street Address 2"
+		  android:inputType="textPassword"
+		  android:paddingBottom="16dp"
+		  android:id="@+id/etStreetAddress2"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:layout_weight="1"
+		  android:id="@+id/tilCity"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="City"
+			android:id="@+id/etCity"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:layout_weight="1"
+		  android:id="@+id/tilState"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="State"
+			android:id="@+id/etState"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+	  </LinearLayout>
+
+	  <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<android.support.design.widget.TextInputLayout
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:layout_marginTop="16dp"
+		  android:textColorHint="#9e9e9e"
+		  android:layout_weight="1"
+		  android:id="@+id/tilZipcode"
+		  android:theme="@style/OnboardingTextLabel"
+		  android:visibility="visible">
+
+		  <EditText
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="Zip code"
+			android:id="@+id/etZipcode"
+			android:inputType="textPassword"
+			android:paddingBottom="16dp"
+			android:textColor="#5f6368"
+			android:textColorHint="#9e9e9e"
+			android:textSize="16sp"
+
+			/>
+
+		</android.support.design.widget.TextInputLayout>
+
+
+		<View
+		  android:layout_width="match_parent"
+		  android:layout_height="1dp"
+		  android:layout_weight="1"/>
+
+
+	  </LinearLayout>
+
+	  <android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:textColorHint="#9e9e9e"
+		android:layout_weight="1"
+		android:id="@+id/tilCountry"
+		android:theme="@style/OnboardingTextLabel"
+		android:visibility="visible">
+
+		<EditText
+		  android:layout_width="match_parent"
+		  android:layout_height="wrap_content"
+		  android:hint="Country"
+		  android:id="@+id/etCountry"
+		  android:inputType="textPassword"
+		  android:paddingBottom="16dp"
+		  android:textColor="#5f6368"
+		  android:textColorHint="#9e9e9e"
+		  android:textSize="16sp"
+
+		  />
+
+	  </android.support.design.widget.TextInputLayout>
+
+
+	</LinearLayout>
+  </android.support.v4.widget.NestedScrollView>
+
+  <FrameLayout
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@color/colorPrimary"
+	android:orientation="horizontal"
+	android:paddingTop="4dp"
+	android:paddingBottom="4dp"
+	android:paddingRight="16dp"
+	android:layout_margin="16dp"
+	android:gravity="center"
+	android:elevation="2dp"
+	android:id="@+id/flSave"
+	>
+
+	<TextView
+	  android:id="@+id/bNext"
+	  fontPath="@string/font_regular"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_gravity="center_horizontal"
+	  android:background="@color/colorPrimary"
+	  android:text="Save Shipping Address"
+	  android:padding="12dp"
+	  android:gravity="center"
+	  android:textAllCaps="false"
+	  android:textColor="#ffffff"
+	  android:textSize="16sp"
+	  tools:ignore="MissingPrefix"/>
+
+	<ImageView
+	  android:layout_width="32dp"
+	  android:layout_height="32dp"
+	  android:src="@drawable/ic_action_navigation_arrow_back_inverted"
+	  android:tint="#ffffff"
+	  android:layout_gravity="right|center"
+	  android:rotation="180"
+	  />
+
+  </FrameLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7eab091..07fede1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,5 +32,6 @@
   <string name="title_activity_home">HomeActivity</string>
   <string name="lorem">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s</string>
   <string name="title_activity_my_orders">MyOrdersActivity</string>
+  <string name="title_activity_user_details">UserDetailsActivity</string>
 
 </resources>