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

bug fixes part 1

Browse Source
This commit is contained in:
cimenmus
2018-01-16 23:04:28 +03:00
parent a2c1208b64
commit 5e26f03a55
7 changed files with 71 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,14 @@
app:inputType="address"
app:hint="@string/addres_line_1"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/postcodePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:edittextTheme="navy"
app:inputType="postcode"
app:hint="@string/postcode"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/cityPizzalinkDropdown"
android:layout_width="match_parent"
@@ -71,26 +79,21 @@
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"/>
app:dropdownHintView="@string/country"
android:visibility="gone"/>
<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"/>
app:dropdownHintView="@string/zone"
android:visibility="gone"/>
<android.support.v4.widget.Space
android:layout_width="match_parent"

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

@@ -43,7 +43,7 @@
android:id="@+id/cartTotalRelativeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/ghost_white"
android:layout_above="@+id/bottomNavigationView"
android:visibility="visible">

19
app/src/main/res/layout/activity_register.xml
View File

@@ -90,29 +90,32 @@
app:inputType="address"
app:hint="@string/addres_line_1"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/postcodePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:inputType="postcode"
app:hint="@string/postcode"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/cityPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/city"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/postcodePizzalinkDrowpdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/postcode"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/countryPizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/country"/>
app:dropdownHintView="@string/country"
android:visibility="gone"/>
<ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/zonePizzalinkDropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dropdownHintView="@string/zone"/>
app:dropdownHintView="@string/zone"
android:visibility="gone"/>
<android.support.v4.widget.Space
android:layout_width="match_parent"

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

@@ -41,25 +41,26 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true"
android:visibility="gone">
android:visibility="visible">
<View
android:id="@+id/cartDividerSpace"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/shadow" />
android:background="@drawable/shadow"
android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingBottom="24dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:background="@color/white">
android:background="@color/ghost_white">
<TextView
android:id="@+id/cartTotalLabelTextView"
@@ -67,14 +68,12 @@
android:layout_height="wrap_content"
android:textColor="@color/navy"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_horizontal"
android:text="TOTAL"/>
android:layout_gravity="center_horizontal"/>
<TextView
android:id="@+id/cartProductTotalTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 50.00"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:textColor="@color/red"