From 334171c8ca58b02512eedccf30c1bf68cb3693fc Mon Sep 17 00:00:00 2001 From: cimenmus Date: Sun, 19 Nov 2017 22:29:57 +0300 Subject: [PATCH] dialog to activity for product properties --- .../activity/ProductPropertiesActivity.java | 14 ++++++++++++- .../android/fragment/MenuFragment.java | 21 ++++++++++++++++++- .../android/fragment/ProductFragment.java | 20 +++++++++++++++++- .../layout/activity_product_properties.xml | 12 ++++++++++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java b/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java index 42bab34..dbb6521 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java @@ -15,6 +15,7 @@ import java.util.HashMap; import butterknife.BindString; import butterknife.BindView; +import butterknife.ButterKnife; import butterknife.OnClick; import ch.pizzalink.android.R; import ch.pizzalink.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; @@ -41,6 +42,7 @@ import retrofit2.Response; public class ProductPropertiesActivity extends BaseActivity { @BindView(R.id.closeImageView) ImageView closeImageView; + @BindView(R.id.backIcon) ImageView backIcon; @BindView(R.id.productImageView) ImageView productImageView; @BindView(R.id.productNameTextView) TextView productNameTextView; @BindView(R.id.productPriceTextView) TextView productPriceTextView; @@ -68,15 +70,20 @@ public class ProductPropertiesActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_product_properties); + ButterKnife.bind(this); + getDataFromIntent(); + initViews(); } @OnClick({R.id.closeImageView, + R.id.backIcon, R.id.increaseProductCountImageView, R.id.deccreaseProductCountImageView, R.id.addToCartButton}) public void onCLick(View view){ switch (view.getId()){ case R.id.closeImageView: + case R.id.backIcon: finish(); break; case R.id.increaseProductCountImageView: @@ -130,9 +137,11 @@ public class ProductPropertiesActivity extends BaseActivity { } } } - } + private void getDataFromIntent(){ + menuProductModel = (MenuProductModel) getIntent().getSerializableExtra("menuProductModel"); + } private void initViews(){ setFields(); fillRadioAndCheckboxOptionLists(); @@ -321,10 +330,13 @@ public class ProductPropertiesActivity extends BaseActivity { response.body().isSuccess()){ SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size()); SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getTotals().get(0).getText())); + /* MainActivity mainActivity = (MainActivity) getActivity(); mainActivity.setCartItemCount(); */ + setResult(RESULT_OK); + finish(); } diff --git a/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java index a2caa39..5ab9537 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java @@ -1,5 +1,6 @@ package ch.pizzalink.android.fragment; +import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; @@ -15,6 +16,8 @@ import butterknife.BindView; import butterknife.ButterKnife; import ch.pizzalink.android.R; import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzalink.android.activity.MainActivity; +import ch.pizzalink.android.activity.ProductPropertiesActivity; import ch.pizzalink.android.adapter.recycler.MenuProductRecyclerAdapter; import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzalink.android.api.ApiService; @@ -30,6 +33,8 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import static android.app.Activity.RESULT_OK; + /** * Created by cimenmus on 02/10/2017. */ @@ -39,6 +44,8 @@ public class MenuFragment extends BaseFragment { @BindView(R.id.menuProductRecyclerView) RecyclerView menuProductRecyclerView; public static final String FRAGMENT_NAME = "menuFragment"; + private int REQUEST_CODE_PRODUCT_PROPERTIES = 3765; + private ArrayList menuProductList = new ArrayList<>(); private MenuProductRecyclerAdapter menuProductRecyclerAdapter; private CategoryModel categoryModel; @@ -68,6 +75,15 @@ public class MenuFragment extends BaseFragment { return view; } + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES && resultCode == RESULT_OK){ + MainActivity mainActivity = (MainActivity) getActivity(); + mainActivity.setCartItemCount(); + } + } + private void getDataFromArguments(){ categoryModel = (CategoryModel) getArguments().getSerializable("categoryModel"); } @@ -86,7 +102,10 @@ public class MenuFragment extends BaseFragment { new RecyclerItemClickListener() { @Override public void onItemClick(View view, int position) { - showBottomsheetDialog(menuProductList.get(position)); + Intent productPropertiesIntent = new Intent(BaseActivity.currentActivity, ProductPropertiesActivity.class); + productPropertiesIntent.putExtra("menuProductModel", menuProductList.get(position)); + startActivityForResult(productPropertiesIntent, REQUEST_CODE_PRODUCT_PROPERTIES); + //showBottomsheetDialog(menuProductList.get(position)); } }); menuProductRecyclerView.addItemDecoration(new GridSpacesItemDecoration(DisplayHelper.dpToPx(12))); diff --git a/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java index 4547bba..45e152c 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java @@ -1,5 +1,6 @@ package ch.pizzalink.android.fragment; +import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; @@ -13,6 +14,8 @@ import butterknife.BindView; import butterknife.ButterKnife; import ch.pizzalink.android.R; import ch.pizzalink.android.activity.BaseActivity; +import ch.pizzalink.android.activity.MainActivity; +import ch.pizzalink.android.activity.ProductPropertiesActivity; import ch.pizzalink.android.adapter.recycler.MenuProductRecyclerAdapter; import ch.pizzalink.android.api.ApiConstants; import ch.pizzalink.android.api.ApiErrorUtils; @@ -29,6 +32,8 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import static android.app.Activity.RESULT_OK; + /** * Created by cimenmus on 19/09/2017. */ @@ -38,6 +43,8 @@ public class ProductFragment extends BaseFragment { @BindView(R.id.customProductRecyclerView) RecyclerView customProductRecyclerView; public static final String FRAGMENT_NAME = "productFragment"; + private int REQUEST_CODE_PRODUCT_PROPERTIES = 3768; + private ArrayList productList = new ArrayList<>(); private MenuProductRecyclerAdapter menuProductRecyclerAdapter; private CategoryModel categoryModel; @@ -67,6 +74,14 @@ public class ProductFragment extends BaseFragment { return view; } + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES && resultCode == RESULT_OK){ + MainActivity mainActivity = (MainActivity) getActivity(); + mainActivity.setCartItemCount(); + } + } + private void getDataFromArguments(){ categoryModel = (CategoryModel) getArguments().getSerializable("categoryModel"); } @@ -85,7 +100,10 @@ public class ProductFragment extends BaseFragment { new RecyclerItemClickListener() { @Override public void onItemClick(View view, int position) { - showBottomsheetDialog(productList.get(position)); + Intent productPropertiesIntent = new Intent(BaseActivity.currentActivity, ProductPropertiesActivity.class); + productPropertiesIntent.putExtra("menuProductModel", productList.get(position)); + startActivityForResult(productPropertiesIntent, REQUEST_CODE_PRODUCT_PROPERTIES); + //showBottomsheetDialog(productList.get(position)); } }); customProductRecyclerView.addItemDecoration(new GridSpacesItemDecoration(DisplayHelper.dpToPx(12))); diff --git a/app/src/main/res/layout/activity_product_properties.xml b/app/src/main/res/layout/activity_product_properties.xml index d5be8e9..deb2ded 100644 --- a/app/src/main/res/layout/activity_product_properties.xml +++ b/app/src/main/res/layout/activity_product_properties.xml @@ -22,13 +22,23 @@ android:orientation="vertical" android:background="@color/white"> + + + android:padding="12dp" + android:visibility="visible"/>