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

repeat order

Browse Source
This commit is contained in:
cimenmus
2018-07-12 00:13:46 +03:00
parent 9cd1bf9c71
commit 57c75dd216
13 changed files with 315 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/layout/activity_order_history_details.xml
View File

@@ -130,6 +130,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/order_history_order_note" />
<Button
android:id="@+id/repeatOrderButton"
android:textColor="@color/white"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/background_button_pizzapp_gray"
android:layout_margin="16dp"
android:textSize="12sp"
android:text="@string/repeat_order_uppercased"/>
<android.support.v4.widget.Space
android:layout_width="match_parent"

113
app/src/main/res/layout/row_order_history.xml
View File

@@ -15,52 +15,95 @@
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp">
android:orientation="vertical"
android:paddingTop="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp">
<TextView
android:id="@+id/orderDateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:textSize="16sp"
android:layout_centerVertical="true"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/orderTotalTextView"
android:id="@+id/orderDateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/red"
android:padding="8dp"
android:layout_gravity="center_vertical"/>
fontPath="fonts/Quicksand-Bold.ttf"
android:textSize="16sp"
android:text="3 Juli 2018"
android:layout_centerVertical="true"/>
<ImageView
android:id="@+id/arrow"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_back"
android:tint="@color/black"
android:padding="6dp"
android:rotation="180"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true">
</LinearLayout>
<TextView
android:id="@+id/orderTotalTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:text="CHF 36.50"
fontPath="fonts/Quicksand-Bold.ttf"
android:padding="8dp"
android:layout_gravity="center_vertical"/>
</RelativeLayout>
<ImageView
android:id="@+id/arrow"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_back"
android:tint="@color/black"
android:padding="6dp"
android:rotation="180"/>
</LinearLayout>
</RelativeLayout>
<TextView
android:id="@+id/repeatOrderTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:text="@string/repeat_order_lowercased"
android:layout_gravity="center"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/main_black"
android:gravity="center"/>
<Button
android:textColor="@color/white"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/background_button_pizzapp_gray"
android:layout_marginTop="8dp"
android:layout_marginBottom="12dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:text="@string/repeat_order_lowercased"
android:visibility="gone"/>
</LinearLayout>
</android.support.v7.widget.CardView>

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

@@ -111,6 +111,7 @@
<string name="order_history_total">Gesamtbetrag :</string>    
<string name="order_history_date">Datum</string>    
<string name="order_history_status">Status</string>
<string name="repeat_order_lowercased"><u>Bestellung Wiederholen</u></string>
<!-- OrderHistoryFragment-->
<!-- OrderHistoryDetailsActivity-->
@@ -125,6 +126,7 @@
<string name="order_history_order_shipping_method">LIEFERUNGSMETHODE</string>    
<string name="order_history_order_shipping_address">LIEFERUNGSADRESSE</string>     
<string name="order_history_order_note">NACHRICHT</string> 
<string name="repeat_order_uppercased">BESTELLUNG WIEDERHOLEN</string>
<!-- OrderHistoryDetailsActivity-->
<!-- CreateOrderActivity -->