volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

profile screens

Browse Source
This commit is contained in:
cimenmus
2017-11-07 23:12:22 +03:00
parent e5679da0ab
commit 8d9755debc
11 changed files with 577 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/res/layout/activity_add_address.xml
View File

@@ -20,13 +20,35 @@
app:showBackIcon="true" app:showBackIcon="true"
app:titleTextColor="@color/navy" /> app:titleTextColor="@color/navy" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/addAddressToolbar">
<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">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView <ScrollView
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_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/addAddressToolbar"> android:layout_above="@+id/addNewAddressButton">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -88,4 +110,10 @@
android:text="@string/add" android:text="@string/add"
android:layout_alignParentBottom="true" /> android:layout_alignParentBottom="true" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>

39
app/src/main/res/layout/activity_create_order.xml
View File

@@ -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,6 +19,31 @@
app:showBackIcon="true" app:showBackIcon="true"
app:titleTextColor="@color/navy" /> app:titleTextColor="@color/navy" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
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 <LinearLayout
android:id="@+id/stepIndicatorLayout" android:id="@+id/stepIndicatorLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -44,4 +70,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/actvity_default_background_color_1" /> android:background="@color/actvity_default_background_color_1" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
</RelativeLayout>

29
app/src/main/res/layout/activity_my_addresses.xml
View File

@@ -17,11 +17,32 @@
app:showBackIcon="true" app:showBackIcon="true"
app:titleTextColor="@color/navy" /> app:titleTextColor="@color/navy" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/myAddressesToolbar">
<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">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/myAddressesRecyclerView" 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_above="@+id/addNewAddressButton"/> android:layout_above="@+id/addNewAddressButton"/>
<Button <Button
@@ -34,4 +55,10 @@
android:text="@string/add_new_address" android:text="@string/add_new_address"
android:layout_alignParentBottom="true"/> android:layout_alignParentBottom="true"/>
</RelativeLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>

35
app/src/main/res/layout/activity_update_password.xml
View File

@@ -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,6 +19,29 @@
app:showBackIcon="true" app:showBackIcon="true"
app:titleTextColor="@color/navy" /> app:titleTextColor="@color/navy" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/updatePasswordToolbar">
<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:orientation="vertical">
<ch.pizzalink.android.view.PizzalinkEditText <ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/oldPasswordPizzalinkEditText" android:id="@+id/oldPasswordPizzalinkEditText"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -57,4 +79,11 @@
style="@style/PizzalinkRedButton" style="@style/PizzalinkRedButton"
android:text="@string/update_app" /> android:text="@string/update_app" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
</RelativeLayout>

31
app/src/main/res/layout/activity_update_profile.xml
View File

@@ -19,11 +19,32 @@
app:showBackIcon="true" app:showBackIcon="true"
app:titleTextColor="@color/navy" /> app:titleTextColor="@color/navy" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/updateProfileToolbar">
<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">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:layout_below="@+id/updateProfileToolbar"
android:layout_above="@+id/updateProfileButton"> android:layout_above="@+id/updateProfileButton">
<ch.pizzalink.android.view.PizzalinkEditText <ch.pizzalink.android.view.PizzalinkEditText
@@ -70,4 +91,10 @@
android:text="@string/update_app" android:text="@string/update_app"
android:layout_alignParentBottom="true" /> android:layout_alignParentBottom="true" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/layout/fragment_cart.xml
View File

@@ -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"/>

74
app/src/main/res/layout/fragment_profile.xml
View File

@@ -1,7 +1,27 @@
<?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_height="match_parent">
<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">
<ScrollView
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_alignParentTop="true"
@@ -41,7 +61,11 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@drawable/shadow"/> android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:background="@color/navy"/>
<RelativeLayout <RelativeLayout
android:id="@+id/myAddressesLayout" android:id="@+id/myAddressesLayout"
@@ -55,6 +79,7 @@
android:text="@string/my_addresses" android:text="@string/my_addresses"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textColor="@color/navy" android:textColor="@color/navy"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
@@ -69,7 +94,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_back" android:src="@drawable/ic_back"
android:tint="@color/venus" android:tint="@color/navy"
android:padding="6dp" android:padding="6dp"
android:rotation="180"/> android:rotation="180"/>
@@ -78,7 +103,11 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@drawable/shadow"/> android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:background="@color/navy"/>
<RelativeLayout <RelativeLayout
android:id="@+id/updateProfileLayout" android:id="@+id/updateProfileLayout"
@@ -90,13 +119,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/update_profile" android:text="@string/update_profile"
android:layout_marginTop="4dp" fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy" android:textColor="@color/navy"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true" />
android:layout_toLeftOf="@+id/arrow2"
android:layout_toStartOf="@+id/arrow2"/>
<ImageView <ImageView
android:id="@+id/arrow2" android:id="@+id/arrow2"
@@ -106,7 +133,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_back" android:src="@drawable/ic_back"
android:tint="@color/venus" android:tint="@color/navy"
android:padding="6dp" android:padding="6dp"
android:rotation="180"/> android:rotation="180"/>
@@ -115,8 +142,11 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@drawable/shadow"/> android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:background="@color/navy"/>
<RelativeLayout <RelativeLayout
android:id="@+id/updatePasswordLayout" android:id="@+id/updatePasswordLayout"
@@ -129,6 +159,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/update_password" android:text="@string/update_password"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy" android:textColor="@color/navy"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
@@ -144,7 +175,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_back" android:src="@drawable/ic_back"
android:tint="@color/venus" android:tint="@color/navy"
android:padding="6dp" android:padding="6dp"
android:rotation="180"/> android:rotation="180"/>
@@ -153,7 +184,11 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@drawable/shadow"/> android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:background="@color/navy"/>
<RelativeLayout <RelativeLayout
android:id="@+id/logoutLayout" android:id="@+id/logoutLayout"
@@ -165,18 +200,19 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/button_logout" android:text="@string/button_logout"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textColor="@color/navy" android:textColor="@color/navy"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/shadow"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</android.support.v7.widget.CardView>
</RelativeLayout>

21
app/src/main/res/layout/fragment_store_info.xml
View File

@@ -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_height="match_parent">
<ImageView
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: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 <WebView
android:id="@+id/storeInfoWebView" 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:padding="12dp"/>
</android.support.v7.widget.CardView>
</RelativeLayout> </RelativeLayout>

8
app/src/main/res/layout/layout_pizzalink_view.xml
View File

@@ -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>

3
app/src/main/res/layout/row_menu_product.xml
View File

@@ -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"

28
app/src/main/res/layout/row_my_address.xml
View File

@@ -1,11 +1,18 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white">
<RelativeLayout
android:orientation="horizontal" android:orientation="horizontal"
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:padding="16dp">
android:padding="12dp">
<TextView <TextView
android:id="@+id/addressTextView" android:id="@+id/addressTextView"
@@ -18,6 +25,8 @@
android:layout_toLeftOf="@+id/deleteAddressImageView" android:layout_toLeftOf="@+id/deleteAddressImageView"
android:layout_toStartOf="@+id/deleteAddressImageView" android:layout_toStartOf="@+id/deleteAddressImageView"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="Test Address"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/navy" /> android:textColor="@color/navy" />
<ImageView <ImageView
@@ -30,4 +39,15 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/> android:layout_alignParentEnd="true"/>
</RelativeLayout> </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>