diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderPriceRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderPriceRecyclerAdapter.java new file mode 100644 index 0000000..69b246f --- /dev/null +++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderPriceRecyclerAdapter.java @@ -0,0 +1,54 @@ +package ch.pizzapp.android.adapter.recycler; + +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import java.util.ArrayList; + +import butterknife.BindView; +import butterknife.ButterKnife; +import ch.pizzapp.android.R; +import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzapp.android.helper.PriceHelper; +import ch.pizzapp.android.model.cart.CartTotalModel; + +public class OrderPriceRecyclerAdapter extends RecyclerView.Adapter { + + private ArrayList cartTotalList; + + public static class ViewHolder extends RecyclerView.ViewHolder{ + + @BindView(R.id.totalNameTextView) TextView totalNameTextView; + @BindView(R.id.totalPriceTextView) TextView totalPriceTextView; + + public ViewHolder(final View view) { + super(view); + ButterKnife.bind(this, view); + } + } + + public OrderPriceRecyclerAdapter(ArrayList cartTotalList){ + this.cartTotalList = cartTotalList; + } + + @Override + public OrderPriceRecyclerAdapter.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) { + View root = LayoutInflater.from(BaseActivity.currentActivity).inflate(R.layout.row_price_total, viewGroup, false); + return new OrderPriceRecyclerAdapter.ViewHolder(root); + } + + @Override + public void onBindViewHolder(OrderPriceRecyclerAdapter.ViewHolder holder, int position) { + holder.totalNameTextView.setText(cartTotalList.get(position).getTitle()); + holder.totalPriceTextView.setText(cartTotalList.get(position).getText()); + } + + @Override + public int getItemCount() { + return cartTotalList.size(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java index 737ba9c..37cd8d6 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -4,6 +4,8 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -32,6 +34,7 @@ import ch.pizzapp.android.R; import ch.pizzapp.android.activity.BaseActivity; import ch.pizzapp.android.activity.CampaignProductListActivity; import ch.pizzapp.android.activity.CreateOrderActivity; +import ch.pizzapp.android.adapter.recycler.OrderPriceRecyclerAdapter; import ch.pizzapp.android.api.ApiConstants; import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiErrorUtils; @@ -59,18 +62,13 @@ import static android.app.Activity.RESULT_OK; public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { - @BindView(R.id.orderPersonFullnamePizzalinkInfoLayout) - AppInfoView orderPersonFullnamePizzalinkInfoLayout; - @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) - AppInfoView orderShippingMethodPizzalinkInfoLayout; - @BindView(R.id.orderShippingAddressPizzalinkInfoLayout) - AppInfoView orderShippingAddressPizzalinkInfoLayout; - @BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) - AppInfoView orderPaymentMethodPizzalinkInfoLayout; - @BindView(R.id.orderTotalPizzalinkInfoLayout) - AppInfoView orderTotalPizzalinkInfoLayout; - @BindView(R.id.orderNotePizzalinkInfoLayout) - AppInfoView orderNotePizzalinkInfoLayout; + @BindView(R.id.orderPersonFullnamePizzalinkInfoLayout) AppInfoView orderPersonFullnamePizzalinkInfoLayout; + @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) AppInfoView orderShippingMethodPizzalinkInfoLayout; + @BindView(R.id.orderShippingAddressPizzalinkInfoLayout) AppInfoView orderShippingAddressPizzalinkInfoLayout; + @BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) AppInfoView orderPaymentMethodPizzalinkInfoLayout; + //@BindView(R.id.orderTotalPizzalinkInfoLayout) AppInfoView orderTotalPizzalinkInfoLayout; + @BindView(R.id.orderPriceRecyclerView) RecyclerView orderPriceRecyclerView; + @BindView(R.id.orderNotePizzalinkInfoLayout) AppInfoView orderNotePizzalinkInfoLayout; @BindString(R.string.confirm_order) String confirmOrderText; @BindString(R.string.slice_pizza) String slicePizzaText; @@ -92,6 +90,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { private final int REQUEST_CODE_BRAINTREE_PAYMENT = 3784; private CreateOrderActivity createOrderActivity; private String dateOfOrder, timeOfOrder; + private ArrayList cartTotalList = new ArrayList<>(); + private OrderPriceRecyclerAdapter orderPriceRecyclerAdapter; public CreateOrderSummaryFragment() {} @@ -169,6 +169,13 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { orderNotePizzalinkInfoLayout.setVisibility(View.VISIBLE); orderNotePizzalinkInfoLayout.setText(createOrderActivity.getOrderNote()); } + + + orderPriceRecyclerAdapter = new OrderPriceRecyclerAdapter(cartTotalList); + + orderPriceRecyclerView.setLayoutManager(new LinearLayoutManager(BaseActivity.currentActivity)); + orderPriceRecyclerView.setNestedScrollingEnabled(false); + orderPriceRecyclerView.setAdapter(orderPriceRecyclerAdapter); } private void checkPizzapassCampaign(){ @@ -724,8 +731,13 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()){ - //createOrderActivity.setCartInfo(response.body().getData()); - setOrderTotalText(response.body().getData()); + CartInfoModel cartInfoModel = response.body().getData(); + cartInfoModel.checkNull(); + createOrderActivity.setCartInfo(cartInfoModel); + //setOrderTotalText(response.body().getData()); + cartTotalList.clear(); + cartTotalList.addAll(cartInfoModel.getTotalsList()); + orderPriceRecyclerAdapter.notifyDataSetChanged(); } else ApiErrorUtils.parseError(response); @@ -837,6 +849,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { .build(); } + /* private void setOrderTotalText(CartInfoModel cartInfoModel){ CartTotalModel subtotalModel = new CartTotalModel("",""); @@ -879,8 +892,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { //.append(PriceHelper.roundFractions(totalModel.getText())) .toString(); } - orderTotalPizzalinkInfoLayout.setText(totalText); + //orderTotalPizzalinkInfoLayout.setText(totalText); } + */ } diff --git a/app/src/main/res/layout/fragment_create_order_summary.xml b/app/src/main/res/layout/fragment_create_order_summary.xml index bcad841..9218a45 100644 --- a/app/src/main/res/layout/fragment_create_order_summary.xml +++ b/app/src/main/res/layout/fragment_create_order_summary.xml @@ -1,12 +1,15 @@ - + android:background="@color/white" + tools:ignore="MissingPrefix"> - + + + + + - + diff --git a/app/src/main/res/layout/row_price_total.xml b/app/src/main/res/layout/row_price_total.xml new file mode 100644 index 0000000..1204ddd --- /dev/null +++ b/app/src/main/res/layout/row_price_total.xml @@ -0,0 +1,38 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57f4428..63d50f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -169,7 +169,7 @@ LIEFERUNGSMETHODE     LIEFERUNGSADRESSE     ZAHLUNGSWEISE     - ZWISCHENSUMME + KASSE NACHRICHT Lieferungsdatum: Lieferungszeit: