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

order summary page changes

Browse Source
This commit is contained in:
cimenmus
2018-07-06 21:24:27 +03:00
parent b13dbb8651
commit de76c58842
5 changed files with 153 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
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"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/white"
tools:ignore="MissingPrefix">
<ScrollView
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentTop="true"
@@ -44,21 +47,45 @@
android:layout_height="wrap_content"
app:description="@string/order_payment_method" />
<!--
<ch.pizzapp.android.view.AppInfoView
android:id="@+id/orderTotalPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_total" />
-->
<TextView
android:id="@+id/descriptionTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="12sp"
android:text="@string/order_total"
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/orderPriceRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"/>
<ch.pizzapp.android.view.AppInfoView
android:id="@+id/orderNotePizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:description="@string/order_notee" />
</LinearLayout>
</ScrollView>
</android.support.v4.widget.NestedScrollView>
<include layout="@layout/layout_orders_bottom"/>

38
app/src/main/res/layout/row_price_total.xml Normal file
View File

@@ -0,0 +1,38 @@
<?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:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:paddingBottom="4dp">
<TextView
android:id="@+id/totalNameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/red"
android:layout_toLeftOf="@+id/totalPriceTextView"
android:layout_toStartOf="@+id/totalPriceTextView"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginRight="24dp"
android:layout_marginEnd="24dp" />
<TextView
android:id="@+id/totalPriceTextView"
android:layout_width="80dp"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/red"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>

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

@@ -169,7 +169,7 @@
<string name="order_shipping_method">LIEFERUNGSMETHODE</string>    
<string name="order_shipping_address">LIEFERUNGSADRESSE</string>    
<string name="order_payment_method">ZAHLUNGSWEISE</string>    
<string name="order_total">ZWISCHENSUMME</string>
<string name="order_total">KASSE</string>
<string name="order_notee">NACHRICHT</string>
<string name="delivery_date">Lieferungsdatum:</string>
<string name="delivery_time">Lieferungszeit:</string>