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

order services

Browse Source
This commit is contained in:
cimenmus
2017-10-21 21:23:17 +03:00
parent eb6b9b9bb9
commit 1283fbb631
25 changed files with 482 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/res/layout/activity_order.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<LinearLayout
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"
@@ -22,8 +22,7 @@
android:id="@+id/stepIndicatorLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_below="@+id/orderToolbar">
android:orientation="vertical">
<com.badoualy.stepperindicator.StepperIndicator
android:id="@+id/stepperIndicator"
@@ -42,57 +41,7 @@
<FrameLayout
android:id="@+id/orderFragmentsContainer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/actvity_default_background_color_1"
android:layout_below="@+id/stepIndicatorLayout"
android:layout_above="@+id/ordersBottomLayout"/>
android:layout_height="match_parent"
android:background="@color/actvity_default_background_color_1" />
<LinearLayout
android:id="@+id/ordersBottomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/shadow"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<TextView
android:id="@+id/previousTextView"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="@color/red"
android:text="@string/previous"
android:textStyle="bold"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:gravity="center" />
<TextView
android:id="@+id/nextTextView"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="@color/red"
android:text="@string/next"
android:textStyle="bold"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:gravity="center" />
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>

5
app/src/main/res/layout/fragment_order_result.xml
View File

@@ -10,6 +10,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Order Result"
android:layout_centerInParent="true"/>
android:layout_centerInParent="true"
android:layout_above="@+id/ordersBottomLayout"/>
<include layout="@layout/layout_orders_bottom"/>
</RelativeLayout>

5
app/src/main/res/layout/fragment_order_summary.xml
View File

@@ -10,6 +10,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Order Summary"
android:layout_centerInParent="true"/>
android:layout_centerInParent="true"
android:layout_above="@+id/ordersBottomLayout"/>
<include layout="@layout/layout_orders_bottom"/>
</RelativeLayout>

5
app/src/main/res/layout/fragment_payment_method.xml
View File

@@ -10,6 +10,9 @@
android:id="@+id/paymentMethodsRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"/>
android:scrollbars="vertical"
android:layout_above="@+id/ordersBottomLayout"/>
<include layout="@layout/layout_orders_bottom"/>
</RelativeLayout>

5
app/src/main/res/layout/fragment_shipping_address.xml
View File

@@ -10,6 +10,9 @@
android:id="@+id/shippingAddressesRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"/>
android:scrollbars="vertical"
android:layout_above="@+id/ordersBottomLayout"/>
<include layout="@layout/layout_orders_bottom"/>
</RelativeLayout>

5
app/src/main/res/layout/fragment_shipping_method.xml
View File

@@ -10,6 +10,9 @@
android:id="@+id/shippingMethodsRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"/>
android:scrollbars="vertical"
android:layout_above="@+id/ordersBottomLayout"/>
<include layout="@layout/layout_orders_bottom"/>
</RelativeLayout>

48
app/src/main/res/layout/layout_orders_bottom.xml Normal file
View File

@@ -0,0 +1,48 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ordersBottomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/shadow"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<TextView
android:id="@+id/previousTextView"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="@color/red"
android:text="@string/previous"
android:textStyle="bold"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:gravity="center" />
<TextView
android:id="@+id/nextTextView"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="@color/red"
android:text="@string/next"
android:textStyle="bold"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:gravity="center" />
</RelativeLayout>
</LinearLayout>

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

@@ -133,6 +133,13 @@
<string name="next">NEXT</string>
<string name="previous">PREVIOUS</string>
<string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
<string name="alert_choose_shipping_address">Lütfen bir teslimat adresi seçiniz ya da yeni bir teslimat adresi ekleyiniz.</string>
<string name="alert_choose_payment_method">Lütfen bir ödeme yöntemi seçiniz.</string>
<string name="confirm_order">APPROVE</string>
<string name="done_order">DONE</string>
<string-array name="stepperLabels">
<item>Shipping Method</item>
<item>Shipping Address</item>