profile screens
This commit is contained in:
@@ -20,72 +20,100 @@
|
|||||||
app:showBackIcon="true"
|
app:showBackIcon="true"
|
||||||
app:titleTextColor="@color/navy" />
|
app:titleTextColor="@color/navy" />
|
||||||
|
|
||||||
<ScrollView
|
<RelativeLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_below="@+id/addAddressToolbar">
|
android:layout_below="@+id/addAddressToolbar">
|
||||||
|
|
||||||
<LinearLayout
|
<ImageView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:scaleType="centerCrop"
|
||||||
android:background="@color/white">
|
android:src="@drawable/background_wood" />
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<android.support.v7.widget.CardView
|
||||||
android:id="@+id/address1PizzalinkEditText"
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/white"
|
||||||
|
app:cardCornerRadius="4dp"
|
||||||
|
android:layout_margin="12dp">
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent">
|
||||||
app:edittextTheme="navy"
|
|
||||||
app:inputType="address"
|
|
||||||
app:hint="@string/addres_line_1"/>
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkDropdownView
|
<ScrollView
|
||||||
android:id="@+id/cityPizzalinkDropdown"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_alignParentBottom="true"
|
||||||
app:dropdownTheme="navy"
|
android:layout_alignParentLeft="true"
|
||||||
app:dropdownHintView="@string/city"/>
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_above="@+id/addNewAddressButton">
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkDropdownView
|
<LinearLayout
|
||||||
android:id="@+id/postcodePizzalinkDrowpdown"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:orientation="vertical"
|
||||||
app:dropdownTheme="navy"
|
android:background="@color/white">
|
||||||
app:dropdownHintView="@string/postcode"/>
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkDropdownView
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
android:id="@+id/countryPizzalinkDropdown"
|
android:id="@+id/address1PizzalinkEditText"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:dropdownTheme="navy"
|
app:edittextTheme="navy"
|
||||||
app:dropdownHintView="@string/country"/>
|
app:inputType="address"
|
||||||
|
app:hint="@string/addres_line_1"/>
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkDropdownView
|
<ch.pizzalink.android.view.PizzalinkDropdownView
|
||||||
android:id="@+id/zonePizzalinkDropdown"
|
android:id="@+id/cityPizzalinkDropdown"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:dropdownTheme="navy"
|
app:dropdownTheme="navy"
|
||||||
app:dropdownHintView="@string/zone"/>
|
app:dropdownHintView="@string/city"/>
|
||||||
|
|
||||||
<android.support.v4.widget.Space
|
<ch.pizzalink.android.view.PizzalinkDropdownView
|
||||||
android:layout_width="match_parent"
|
android:id="@+id/postcodePizzalinkDrowpdown"
|
||||||
android:layout_height="48dp" />
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:dropdownTheme="navy"
|
||||||
|
app:dropdownHintView="@string/postcode"/>
|
||||||
|
|
||||||
</LinearLayout>
|
<ch.pizzalink.android.view.PizzalinkDropdownView
|
||||||
|
android:id="@+id/countryPizzalinkDropdown"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:dropdownTheme="navy"
|
||||||
|
app:dropdownHintView="@string/country"/>
|
||||||
|
|
||||||
</ScrollView>
|
<ch.pizzalink.android.view.PizzalinkDropdownView
|
||||||
|
android:id="@+id/zonePizzalinkDropdown"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:dropdownTheme="navy"
|
||||||
|
app:dropdownHintView="@string/zone"/>
|
||||||
|
|
||||||
<Button
|
<android.support.v4.widget.Space
|
||||||
android:id="@+id/addNewAddressButton"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="48dp" />
|
||||||
android:layout_height="48dp"
|
|
||||||
android:layout_marginTop="16dp"
|
</LinearLayout>
|
||||||
android:layout_marginBottom="16dp"
|
|
||||||
style="@style/PizzalinkRedButton"
|
</ScrollView>
|
||||||
android:text="@string/add"
|
|
||||||
android:layout_alignParentBottom="true" />
|
<Button
|
||||||
|
android:id="@+id/addNewAddressButton"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
style="@style/PizzalinkRedButton"
|
||||||
|
android:text="@string/add"
|
||||||
|
android:layout_alignParentBottom="true" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
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="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/white"
|
android:background="@color/white"
|
||||||
android:orientation="vertical"
|
android:focusable="true"
|
||||||
|
android:focusableInTouchMode="true"
|
||||||
tools:context="ch.pizzalink.android.activity.CreateOrderActivity">
|
tools:context="ch.pizzalink.android.activity.CreateOrderActivity">
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkToolbar
|
<ch.pizzalink.android.view.PizzalinkToolbar
|
||||||
@@ -18,30 +19,62 @@
|
|||||||
app:showBackIcon="true"
|
app:showBackIcon="true"
|
||||||
app:titleTextColor="@color/navy" />
|
app:titleTextColor="@color/navy" />
|
||||||
|
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:id="@+id/stepIndicatorLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<com.badoualy.stepperindicator.StepperIndicator
|
|
||||||
android:id="@+id/stepperIndicator"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
app:stpi_labels="@array/stepperLabels" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="@drawable/shadow"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:id="@+id/orderFragmentsContainer"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/actvity_default_background_color_1" />
|
android:layout_below="@+id/orderToolbar">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
android:src="@drawable/background_wood" />
|
||||||
|
|
||||||
|
<android.support.v7.widget.CardView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/white"
|
||||||
|
app:cardCornerRadius="4dp"
|
||||||
|
android:layout_margin="12dp">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/white"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:context="ch.pizzalink.android.activity.CreateOrderActivity">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/stepIndicatorLayout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<com.badoualy.stepperindicator.StepperIndicator
|
||||||
|
android:id="@+id/stepperIndicator"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="16dp"
|
||||||
|
app:stpi_labels="@array/stepperLabels" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:background="@drawable/shadow"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/orderFragmentsContainer"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/actvity_default_background_color_1" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|||||||
@@ -17,21 +17,48 @@
|
|||||||
app:showBackIcon="true"
|
app:showBackIcon="true"
|
||||||
app:titleTextColor="@color/navy" />
|
app:titleTextColor="@color/navy" />
|
||||||
|
|
||||||
<android.support.v7.widget.RecyclerView
|
<RelativeLayout
|
||||||
android:id="@+id/myAddressesRecyclerView"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_below="@+id/myAddressesToolbar"
|
android:layout_below="@+id/myAddressesToolbar">
|
||||||
android:layout_above="@+id/addNewAddressButton"/>
|
|
||||||
|
|
||||||
<Button
|
<ImageView
|
||||||
android:id="@+id/addNewAddressButton"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="48dp"
|
android:scaleType="centerCrop"
|
||||||
android:layout_marginTop="16dp"
|
android:src="@drawable/background_wood" />
|
||||||
android:layout_marginBottom="16dp"
|
|
||||||
style="@style/PizzalinkRedButton"
|
<android.support.v7.widget.CardView
|
||||||
android:text="@string/add_new_address"
|
android:layout_width="match_parent"
|
||||||
android:layout_alignParentBottom="true"/>
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/white"
|
||||||
|
app:cardCornerRadius="4dp"
|
||||||
|
android:layout_margin="12dp">
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<android.support.v7.widget.RecyclerView
|
||||||
|
android:id="@+id/myAddressesRecyclerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_above="@+id/addNewAddressButton"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/addNewAddressButton"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
style="@style/PizzalinkRedButton"
|
||||||
|
android:text="@string/add_new_address"
|
||||||
|
android:layout_alignParentBottom="true"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
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="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/white"
|
android:background="@color/white"
|
||||||
android:orientation="vertical"
|
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:focusableInTouchMode="true"
|
android:focusableInTouchMode="true"
|
||||||
tools:context="ch.pizzalink.android.activity.UpdatePasswordActivity">
|
tools:context="ch.pizzalink.android.activity.UpdatePasswordActivity">
|
||||||
@@ -20,41 +19,71 @@
|
|||||||
app:showBackIcon="true"
|
app:showBackIcon="true"
|
||||||
app:titleTextColor="@color/navy" />
|
app:titleTextColor="@color/navy" />
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<RelativeLayout
|
||||||
android:id="@+id/oldPasswordPizzalinkEditText"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
app:edittextTheme="navy"
|
android:layout_below="@+id/updatePasswordToolbar">
|
||||||
app:inputType="password"
|
|
||||||
app:hint="@string/hint_old_password"/>
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<ImageView
|
||||||
android:id="@+id/newPasswordPizzalinkEditText"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:scaleType="centerCrop"
|
||||||
app:edittextTheme="navy"
|
android:src="@drawable/background_wood" />
|
||||||
app:inputType="password"
|
|
||||||
app:hint="@string/hint_new_password"/>
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<android.support.v7.widget.CardView
|
||||||
android:id="@+id/confirmNewPasswordPizzalinkEditText"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:background="@color/white"
|
||||||
app:inputType="password"
|
app:cardCornerRadius="4dp"
|
||||||
app:edittextTheme="navy"
|
android:layout_margin="12dp">
|
||||||
app:hint="@string/hint_confirm_new_password"/>
|
|
||||||
|
|
||||||
<android.support.v4.widget.Space
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="16dp" />
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
<Button
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
android:id="@+id/updatePasswordButton"
|
android:id="@+id/oldPasswordPizzalinkEditText"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="48dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="16dp"
|
app:edittextTheme="navy"
|
||||||
android:layout_marginBottom="16dp"
|
app:inputType="password"
|
||||||
style="@style/PizzalinkRedButton"
|
app:hint="@string/hint_old_password"/>
|
||||||
android:text="@string/update_app" />
|
|
||||||
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
|
android:id="@+id/newPasswordPizzalinkEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:edittextTheme="navy"
|
||||||
|
app:inputType="password"
|
||||||
|
app:hint="@string/hint_new_password"/>
|
||||||
|
|
||||||
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
|
android:id="@+id/confirmNewPasswordPizzalinkEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:inputType="password"
|
||||||
|
app:edittextTheme="navy"
|
||||||
|
app:hint="@string/hint_confirm_new_password"/>
|
||||||
|
|
||||||
|
<android.support.v4.widget.Space
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="16dp" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/updatePasswordButton"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
style="@style/PizzalinkRedButton"
|
||||||
|
android:text="@string/update_app" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|||||||
@@ -19,55 +19,82 @@
|
|||||||
app:showBackIcon="true"
|
app:showBackIcon="true"
|
||||||
app:titleTextColor="@color/navy" />
|
app:titleTextColor="@color/navy" />
|
||||||
|
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:layout_below="@+id/updateProfileToolbar">
|
||||||
android:layout_below="@+id/updateProfileToolbar"
|
|
||||||
android:layout_above="@+id/updateProfileButton">
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<ImageView
|
||||||
android:id="@+id/firstnamePizzalinkEditText"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
app:edittextTheme="navy"
|
android:scaleType="centerCrop"
|
||||||
app:inputType="name"
|
android:src="@drawable/background_wood" />
|
||||||
app:hint="@string/firstname"/>
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<android.support.v7.widget.CardView
|
||||||
android:id="@+id/lasstnamePizzalinkEditText"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
app:edittextTheme="navy"
|
android:background="@color/white"
|
||||||
app:inputType="name"
|
app:cardCornerRadius="4dp"
|
||||||
app:hint="@string/lastname"/>
|
android:layout_margin="12dp">
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<RelativeLayout
|
||||||
android:id="@+id/telephonePizzalinkEditText"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:edittextTheme="navy"
|
|
||||||
app:hint="@string/telephone"
|
|
||||||
app:inputType="phone"/>
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkEditText
|
<LinearLayout
|
||||||
android:id="@+id/emailPizzalinkEditText"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:orientation="vertical"
|
||||||
app:edittextTheme="navy"
|
android:layout_above="@+id/updateProfileButton">
|
||||||
app:hint="@string/email"
|
|
||||||
app:inputType="email"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
|
android:id="@+id/firstnamePizzalinkEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:edittextTheme="navy"
|
||||||
|
app:inputType="name"
|
||||||
|
app:hint="@string/firstname"/>
|
||||||
|
|
||||||
<Button
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
android:id="@+id/updateProfileButton"
|
android:id="@+id/lasstnamePizzalinkEditText"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="48dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="16dp"
|
app:edittextTheme="navy"
|
||||||
android:layout_marginBottom="16dp"
|
app:inputType="name"
|
||||||
style="@style/PizzalinkRedButton"
|
app:hint="@string/lastname"/>
|
||||||
android:text="@string/update_app"
|
|
||||||
android:layout_alignParentBottom="true" />
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
|
android:id="@+id/telephonePizzalinkEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:edittextTheme="navy"
|
||||||
|
app:hint="@string/telephone"
|
||||||
|
app:inputType="phone"/>
|
||||||
|
|
||||||
|
<ch.pizzalink.android.view.PizzalinkEditText
|
||||||
|
android:id="@+id/emailPizzalinkEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:edittextTheme="navy"
|
||||||
|
app:hint="@string/email"
|
||||||
|
app:inputType="email"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/updateProfileButton"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
style="@style/PizzalinkRedButton"
|
||||||
|
android:text="@string/update_app"
|
||||||
|
android:layout_alignParentBottom="true" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|||||||
@@ -67,6 +67,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAllCaps="true"
|
android:textAllCaps="true"
|
||||||
android:textColor="@color/navy"
|
android:textColor="@color/navy"
|
||||||
|
fontPath="fonts/Quicksand-Bold.ttf"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:text="TOTAL"/>
|
android:text="TOTAL"/>
|
||||||
|
|
||||||
|
|||||||
@@ -1,182 +1,218 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ScrollView
|
|
||||||
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
tools:ignore="MissingPrefix"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:background="@color/white">
|
|
||||||
|
|
||||||
<LinearLayout
|
<ImageView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical">
|
android:scaleType="centerCrop"
|
||||||
|
android:src="@drawable/background_wood" />
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkInfoView
|
<android.support.v7.widget.CardView
|
||||||
android:id="@+id/firstnamePizzalinkInfoLayout"
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/white"
|
||||||
|
app:cardCornerRadius="4dp"
|
||||||
|
android:layout_margin="12dp">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
app:description="@string/profile_firstname" />
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:background="@color/white">
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkInfoView
|
<LinearLayout
|
||||||
android:id="@+id/lastnamePizzalinkInfoLayout"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:description="@string/profile_lastname" />
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkInfoView
|
|
||||||
android:id="@+id/emailPizzalinkInfoLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:description="@string/profile_email" />
|
|
||||||
|
|
||||||
<ch.pizzalink.android.view.PizzalinkInfoView
|
|
||||||
android:id="@+id/phonePizzalinkInfoLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:description="@string/profile_telephone" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="@drawable/shadow"/>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/myAddressesLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="16dp">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/my_addresses"
|
android:orientation="vertical">
|
||||||
android:layout_marginTop="4dp"
|
|
||||||
android:textColor="@color/navy"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_toLeftOf="@+id/arrow1"
|
|
||||||
android:layout_toStartOf="@+id/arrow1"/>
|
|
||||||
|
|
||||||
<ImageView
|
<ch.pizzalink.android.view.PizzalinkInfoView
|
||||||
android:id="@+id/arrow1"
|
android:id="@+id/firstnamePizzalinkInfoLayout"
|
||||||
android:layout_width="24dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="24dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentRight="true"
|
app:description="@string/profile_firstname" />
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:src="@drawable/ic_back"
|
|
||||||
android:tint="@color/venus"
|
|
||||||
android:padding="6dp"
|
|
||||||
android:rotation="180"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
<ch.pizzalink.android.view.PizzalinkInfoView
|
||||||
|
android:id="@+id/lastnamePizzalinkInfoLayout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:description="@string/profile_lastname" />
|
||||||
|
|
||||||
<View
|
<ch.pizzalink.android.view.PizzalinkInfoView
|
||||||
android:layout_width="match_parent"
|
android:id="@+id/emailPizzalinkInfoLayout"
|
||||||
android:layout_height="1dp"
|
android:layout_width="match_parent"
|
||||||
android:background="@drawable/shadow"/>
|
android:layout_height="wrap_content"
|
||||||
|
app:description="@string/profile_email" />
|
||||||
|
|
||||||
<RelativeLayout
|
<ch.pizzalink.android.view.PizzalinkInfoView
|
||||||
android:id="@+id/updateProfileLayout"
|
android:id="@+id/phonePizzalinkInfoLayout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="16dp">
|
app:description="@string/profile_telephone" />
|
||||||
|
|
||||||
<TextView
|
<View
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="1dp"
|
||||||
android:text="@string/update_profile"
|
android:layout_marginLeft="16dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginStart="16dp"
|
||||||
android:textColor="@color/navy"
|
android:layout_marginRight="16dp"
|
||||||
android:layout_centerVertical="true"
|
android:layout_marginEnd="16dp"
|
||||||
android:layout_alignParentLeft="true"
|
android:background="@color/navy"/>
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_toLeftOf="@+id/arrow2"
|
|
||||||
android:layout_toStartOf="@+id/arrow2"/>
|
|
||||||
|
|
||||||
<ImageView
|
<RelativeLayout
|
||||||
android:id="@+id/arrow2"
|
android:id="@+id/myAddressesLayout"
|
||||||
android:layout_width="24dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="24dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentRight="true"
|
android:padding="16dp">
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:src="@drawable/ic_back"
|
|
||||||
android:tint="@color/venus"
|
|
||||||
android:padding="6dp"
|
|
||||||
android:rotation="180"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/my_addresses"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:textColor="@color/navy"
|
||||||
|
fontPath="fonts/Quicksand-Bold.ttf"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_toLeftOf="@+id/arrow1"
|
||||||
|
android:layout_toStartOf="@+id/arrow1"/>
|
||||||
|
|
||||||
<View
|
<ImageView
|
||||||
android:layout_width="match_parent"
|
android:id="@+id/arrow1"
|
||||||
android:layout_height="1dp"
|
android:layout_width="24dp"
|
||||||
android:background="@drawable/shadow"/>
|
android:layout_height="24dp"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:src="@drawable/ic_back"
|
||||||
|
android:tint="@color/navy"
|
||||||
|
android:padding="6dp"
|
||||||
|
android:rotation="180"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginLeft="16dp"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginRight="16dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:background="@color/navy"/>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/updateProfileLayout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/update_profile"
|
||||||
|
fontPath="fonts/Quicksand-Bold.ttf"
|
||||||
|
android:textColor="@color/navy"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentStart="true" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/arrow2"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:src="@drawable/ic_back"
|
||||||
|
android:tint="@color/navy"
|
||||||
|
android:padding="6dp"
|
||||||
|
android:rotation="180"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginLeft="16dp"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginRight="16dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:background="@color/navy"/>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/updatePasswordLayout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/update_password"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
fontPath="fonts/Quicksand-Bold.ttf"
|
||||||
|
android:textColor="@color/navy"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_toLeftOf="@+id/arrow3"
|
||||||
|
android:layout_toStartOf="@+id/arrow3"/>
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/arrow3"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:src="@drawable/ic_back"
|
||||||
|
android:tint="@color/navy"
|
||||||
|
android:padding="6dp"
|
||||||
|
android:rotation="180"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginLeft="16dp"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginRight="16dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:background="@color/navy"/>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/logoutLayout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/button_logout"
|
||||||
|
fontPath="fonts/Quicksand-Bold.ttf"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:textColor="@color/navy"
|
||||||
|
android:layout_centerVertical="true" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
|
||||||
<RelativeLayout
|
</LinearLayout>
|
||||||
android:id="@+id/updatePasswordLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="16dp">
|
|
||||||
|
|
||||||
<TextView
|
</ScrollView>
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/update_password"
|
|
||||||
android:layout_marginTop="4dp"
|
|
||||||
android:textColor="@color/navy"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_toLeftOf="@+id/arrow3"
|
|
||||||
android:layout_toStartOf="@+id/arrow3"/>
|
|
||||||
|
|
||||||
<ImageView
|
</android.support.v7.widget.CardView>
|
||||||
android:id="@+id/arrow3"
|
|
||||||
android:layout_width="24dp"
|
|
||||||
android:layout_height="24dp"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:src="@drawable/ic_back"
|
|
||||||
android:tint="@color/venus"
|
|
||||||
android:padding="6dp"
|
|
||||||
android:rotation="180"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="@drawable/shadow"/>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/logoutLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="16dp">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/button_logout"
|
|
||||||
android:layout_marginTop="4dp"
|
|
||||||
android:textColor="@color/navy"
|
|
||||||
android:layout_centerVertical="true" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:background="@drawable/shadow"/>
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</ScrollView>
|
|
||||||
@@ -1,14 +1,29 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:orientation="vertical"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:background="@color/white">
|
|
||||||
|
|
||||||
<WebView
|
<ImageView
|
||||||
android:id="@+id/storeInfoWebView"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"/>
|
android:layout_height="match_parent"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
android:src="@drawable/background_wood" />
|
||||||
|
|
||||||
|
<android.support.v7.widget.CardView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/white"
|
||||||
|
app:cardCornerRadius="4dp"
|
||||||
|
android:layout_margin="12dp">
|
||||||
|
|
||||||
|
<WebView
|
||||||
|
android:id="@+id/storeInfoWebView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:padding="12dp"/>
|
||||||
|
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
@@ -13,17 +13,17 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/order_person_fullname"
|
android:text="@string/order_person_fullname"
|
||||||
android:textColor="@color/heater"
|
android:textColor="@color/navy"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
fontPath="fonts/Quicksand-Bold.ttf" />
|
fontPath="fonts/Quicksand-Bold.ttf" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/infoTextView"
|
android:id="@+id/infoTextView"
|
||||||
|
fontPath="fonts/Quicksand-Bold.ttf"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Aytaç Cici"
|
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
fontPath="fonts/Quicksand-Bold.ttf"
|
android:text="Aytaç Cici"
|
||||||
android:textColor="@color/navy"/>
|
android:textColor="@color/red" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<!-- android:background="@color/transparent_white" -->
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/productImageView"
|
android:id="@+id/productImageView"
|
||||||
android:layout_width="160dp"
|
android:layout_width="160dp"
|
||||||
@@ -37,7 +38,7 @@
|
|||||||
android:layout_marginLeft="12dp"
|
android:layout_marginLeft="12dp"
|
||||||
android:layout_marginRight="12dp"
|
android:layout_marginRight="12dp"
|
||||||
android:layout_marginStart="12dp"
|
android:layout_marginStart="12dp"
|
||||||
android:background="@color/transparent_white"/>
|
android:background="@color/white"/>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/productIngredientsLayout"
|
android:id="@+id/productIngredientsLayout"
|
||||||
|
|||||||
@@ -1,33 +1,53 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<LinearLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:orientation="horizontal"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
tools:ignore="MissingPrefix"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/white"
|
android:orientation="vertical"
|
||||||
android:padding="12dp">
|
android:background="@color/white">
|
||||||
|
|
||||||
<TextView
|
<RelativeLayout
|
||||||
android:id="@+id/addressTextView"
|
android:orientation="horizontal"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginRight="48dp"
|
android:padding="16dp">
|
||||||
android:layout_marginEnd="24dp"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_toLeftOf="@+id/deleteAddressImageView"
|
|
||||||
android:layout_toStartOf="@+id/deleteAddressImageView"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:textColor="@color/navy" />
|
|
||||||
|
|
||||||
<ImageView
|
<TextView
|
||||||
android:id="@+id/deleteAddressImageView"
|
android:id="@+id/addressTextView"
|
||||||
android:layout_width="32dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="32dp"
|
android:layout_height="wrap_content"
|
||||||
android:padding="8dp"
|
android:layout_marginRight="48dp"
|
||||||
android:src="@drawable/ic_cancel_2"
|
android:layout_marginEnd="24dp"
|
||||||
android:layout_centerVertical="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_alignParentEnd="true"/>
|
android:layout_toLeftOf="@+id/deleteAddressImageView"
|
||||||
|
android:layout_toStartOf="@+id/deleteAddressImageView"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:text="Test Address"
|
||||||
|
fontPath="fonts/Quicksand-Bold.ttf"
|
||||||
|
android:textColor="@color/navy" />
|
||||||
|
|
||||||
</RelativeLayout>
|
<ImageView
|
||||||
|
android:id="@+id/deleteAddressImageView"
|
||||||
|
android:layout_width="32dp"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:src="@drawable/ic_cancel_2"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginLeft="16dp"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginRight="16dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:background="@color/navy"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|||||||
Reference in New Issue
Block a user