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

bugs fixed

Browse Source
This commit is contained in:
cimenmus
2018-09-01 02:13:15 +03:00
parent d35b214c73
commit 43330e81eb
19 changed files with 427 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/res/layout/fragment_create_order_summary.xml
View File

@@ -55,6 +55,27 @@
app:description="@string/order_total" />
-->
<TextView
android:id="@+id/productsTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="12sp"
android:text="@string/order_product_list"
android:paddingTop="16dp"
android:paddingBottom="4dp"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
fontPath="fonts/Quicksand-Bold.ttf" />
<android.support.v7.widget.RecyclerView
android:id="@+id/orderProductsRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"/>
<TextView
android:id="@+id/descriptionTextView"
android:layout_width="wrap_content"
@@ -62,7 +83,7 @@
android:textColor="@color/black"
android:textSize="12sp"
android:text="@string/order_total"
android:paddingTop="16dp"
android:paddingTop="24dp"
android:paddingBottom="4dp"
android:paddingLeft="16dp"
android:paddingStart="16dp"

6
app/src/main/res/layout/row_price_total.xml
View File

@@ -9,8 +9,8 @@
android:background="@color/white"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:paddingRight="4dp"
android:paddingEnd="4dp"
android:paddingBottom="4dp">
<TextView
@@ -28,7 +28,7 @@
<TextView
android:id="@+id/totalPriceTextView"
android:layout_width="wrap_content"
android:layout_width="76dp"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/red"

65
app/src/main/res/layout/row_product_on_order_summary.xml Normal file
View File

@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingTop="4dp"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="4dp"
android:paddingEnd="4dp">
<TextView
android:id="@+id/productCountTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
fontPath="fonts/Quicksand-Bold.ttf" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_toRightOf="@+id/productCountTextView"
android:layout_toEndOf="@+id/productCountTextView"
android:layout_toLeftOf="@+id/productPriceTextView"
android:layout_toStartOf="@+id/productPriceTextView"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:layout_marginRight="24dp"
android:layout_marginEnd="24dp">
<TextView
android:id="@+id/productNameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red"
fontPath="fonts/Quicksand-Bold.ttf" />
<TextView
android:id="@+id/productPropertiesTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:layout_marginTop="12dp"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp" />
</LinearLayout>
<TextView
android:id="@+id/productPriceTextView"
android:layout_width="76dp"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/red"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>

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

@@ -178,6 +178,7 @@
<string name="order_shipping_method">LIEFERUNGSART</string>    
<string name="order_shipping_address">LIEFERUNGSADRESSE</string>    
<string name="order_payment_method">ZAHLUNGSART</string>    
<string name="order_product_list">WARENKORB</string>    
<string name="order_total">KASSE</string>
<string name="order_notee">BEMERKUNGEN</string>
<string name="slice_pizza_for_store">Die Pizza zu schneiden</string>