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

design part 3

Browse Source
This commit is contained in:
cimenmus
2017-11-04 00:20:52 +03:00
parent 2002a3c7f0
commit e5679da0ab
13 changed files with 192 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/res/drawable/background_badge.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<!-- fill color -->
<solid android:color="@color/red" />
<!-- radius -->
<stroke
android:width="1dp"
android:color="@color/red" />
<!-- corners -->
<corners
android:bottomLeftRadius="2dp"
android:bottomRightRadius="2dp"
android:topLeftRadius="2dp"
android:topRightRadius="2dp" />
</shape>

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

@@ -38,6 +38,7 @@
android:id="@+id/address1PizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:edittextTheme="navy"
app:inputType="address"
app:hint="@string/addres_line_1"/>
@@ -45,24 +46,28 @@
android:id="@+id/cityPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownTheme="navy"
app:dropdownHintView="@string/city"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/postcodePizzalinkDrowpdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownTheme="navy"
app:dropdownHintView="@string/postcode"/>
<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"/>
<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"/>
<android.support.v4.widget.Space
@@ -79,7 +84,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkButton"
style="@style/PizzalinkRedButton"
android:text="@string/add"
android:layout_alignParentBottom="true" />

77
app/src/main/res/layout/activity_main.xml
View File

@@ -3,6 +3,7 @@
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"
tools:ignore="MissingPrefix"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -49,40 +50,68 @@
app:itemBackground="@color/navy"
android:layout_alignParentBottom="true"/>
<RelativeLayout
android:id="@+id/shoppingCartLayout"
android:layout_width="72dp"
android:layout_height="72dp"
android:orientation="vertical"
android:background="@drawable/background_button_cart"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerInParent="true"
android:layout_marginBottom="-8dp"
android:elevation="9dp">
android:elevation="9dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerInParent="true">
<ImageView
android:id="@+id/shoppingCartImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_bottom_nav_item_cart_white"/>
<RelativeLayout
android:id="@+id/badgeLayout"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginBottom="-12dp"
android:elevation="9dp"
android:background="@drawable/background_badge"
android:layout_gravity="center_horizontal">
<TextView
android:id="@+id/shoppingCartTextView"
android:id="@+id/badgeTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bottom_nav_menu_item_cart"
android:textSize="12sp"
android:textColor="@color/white"/>
android:layout_centerInParent="true"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/white"
android:text="1"/>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/shoppingCartButtonLayout"
android:layout_width="72dp"
android:layout_height="72dp"
android:background="@drawable/background_button_cart"
android:elevation="8dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerInParent="true">
<ImageView
android:id="@+id/shoppingCartImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_bottom_nav_item_cart_white"/>
<TextView
android:id="@+id/shoppingCartTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bottom_nav_menu_item_cart"
android:textSize="12sp"
android:textColor="@color/white"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/shoppingCartButton"

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

@@ -30,7 +30,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkButton"
style="@style/PizzalinkRedButton"
android:text="@string/add_new_address"
android:layout_alignParentBottom="true"/>

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

@@ -7,6 +7,8 @@
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
android:focusable="true"
android:focusableInTouchMode="true"
tools:context="ch.pizzalink.android.activity.UpdatePasswordActivity">
<ch.pizzalink.android.view.PizzalinkToolbar
@@ -22,6 +24,7 @@
android:id="@+id/oldPasswordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:edittextTheme="navy"
app:inputType="password"
app:hint="@string/hint_old_password"/>
@@ -29,6 +32,7 @@
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"/>
@@ -37,6 +41,7 @@
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
@@ -49,7 +54,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkButton"
style="@style/PizzalinkRedButton"
android:text="@string/update_app" />
</LinearLayout>

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

@@ -30,6 +30,7 @@
android:id="@+id/firstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:edittextTheme="navy"
app:inputType="name"
app:hint="@string/firstname"/>
@@ -37,6 +38,7 @@
android:id="@+id/lasstnamePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:edittextTheme="navy"
app:inputType="name"
app:hint="@string/lastname"/>
@@ -44,6 +46,7 @@
android:id="@+id/telephonePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:edittextTheme="navy"
app:hint="@string/telephone"
app:inputType="phone"/>
@@ -51,6 +54,7 @@
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:edittextTheme="navy"
app:hint="@string/email"
app:inputType="email"/>
@@ -62,10 +66,8 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkButton"
style="@style/PizzalinkRedButton"
android:text="@string/update_app"
android:layout_alignParentBottom="true" />
</RelativeLayout>

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

@@ -35,6 +35,7 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/bottomLineLayout"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/row_product_ingredients_background"

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

@@ -38,6 +38,7 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/bottomLineLayout"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/white"

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

@@ -57,17 +57,35 @@
</RelativeLayout>
<TextView
android:id="@+id/productPriceTextView"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:background="@drawable/background_product_cart_price"
android:text="CHF 25.00"
android:padding="17dp"
android:gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_horizontal" />
android:background="@drawable/background_product_cart_price">
<TextView
android:id="@+id/productPriceTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:text="CHF 25.00"
android:padding="17dp"
android:gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_horizontal" />
<ImageView
android:id="@+id/downImageView"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_down_black"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:padding="6dp"
android:layout_margin="8dp"
android:tint="@color/white"/>
</RelativeLayout>
</LinearLayout>

1
app/src/main/res/values/attrs.xml
View File

@@ -31,6 +31,7 @@
</declare-styleable>
<declare-styleable name="PizzalinkDropdownView">
<attr name="dropdownTheme" format="string" />
<attr name="dropdownHintView" format="string" />
</declare-styleable>