radio and checkbox recyclerview changed to dynamic type for campaign product details

2019-06-29 02:10:37 +03:00
parent 757e903a21
commit 380732b3ce
3 changed files with 104 additions and 99 deletions
--- a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
@@ -9,6 +9,8 @@ import android.widget.ImageView;
 import android.widget.TextView;

 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;

 import butterknife.BindString;
@@ -50,10 +52,10 @@ public class CampaignProductDetailsActivity extends BaseActivity {
    @BindView(R.id.productPriceTextView) TextView productPriceTextView;
    @BindView(R.id.productDescriptionTextView) TextView productDescriptionTextView;
    @BindView(R.id.addToCartButton) Button addToCartButton;
-    @BindView(R.id.radioRecyclerHeaderTextView) TextView radioRecyclerHeaderTextView;
-    @BindView(R.id.radioRecyclerView) RecyclerView radioRecyclerView;
-    @BindView(R.id.checkboxRecyclerHeaderTextView) TextView checkboxRecyclerHeaderTextView;
-    @BindView(R.id.checkboxRecyclerView) RecyclerView checkboxRecyclerView;
+    @BindView(R.id.recycler1HeaderTextView) TextView recycler1HeaderTextView;
+    @BindView(R.id.recyclerView1) RecyclerView recyclerView1;
+    @BindView(R.id.recycler2HeaderTextView) TextView recycler2HeaderTextView;
+    @BindView(R.id.recyclerView2) RecyclerView recyclerView2;
    @BindView(R.id.increaseProductCountImageView) ImageView increaseProductCountImageView;
    @BindView(R.id.deccreaseProductCountImageView) ImageView deccreaseProductCountImageView;
    @BindView(R.id.productCountTextView) TextView productCountTextView;
@@ -64,11 +66,6 @@ public class CampaignProductDetailsActivity extends BaseActivity {
    private int productCount = 1;

    private MenuProductModel menuProductModel;
-
-    private ArrayList<MenuProductOptionValueModel> productRadioOptionValueList = new ArrayList<>();
-    private ArrayList<MenuProductOptionValueModel> productCheckboxOptionValueList = new ArrayList<>();
-    private ProductRadioOptionsRecyclerAdapter productRadioOptionsRecyclerAdapter;
-    private ProductCheckboxOptionsRecyclerAdapter productCheckboxOptionsRecyclerAdapter;
    private CampaignModel campaignModel;

    @Override
@@ -155,76 +152,91 @@ public class CampaignProductDetailsActivity extends BaseActivity {
        menuProductModel = (MenuProductModel) getIntent().getSerializableExtra("menuProductModel");
        campaignModel = (CampaignModel) getIntent().getSerializableExtra("campaignModel");
    }
+
    private void initViews(){
        setFields();
-        fillRadioAndCheckboxOptionLists();
-        switch (menuProductModel.getProductOptionType()){
-            case RADIO_AND_CHECKBOX:
-                radioRecyclerView.setVisibility(View.VISIBLE);
-                checkboxRecyclerView.setVisibility(View.VISIBLE);
-                radioRecyclerHeaderTextView.setVisibility(View.VISIBLE);
-                checkboxRecyclerHeaderTextView.setVisibility(View.VISIBLE);
-                initRadioRecyclerView();
-                initCheckboxRecyclerView();
-                break;
-            case RADIO:
-                radioRecyclerHeaderTextView.setVisibility(View.VISIBLE);
-                radioRecyclerView.setVisibility(View.VISIBLE);
-                checkboxRecyclerView.setVisibility(View.GONE);
-                checkboxRecyclerHeaderTextView.setVisibility(View.GONE);
-                initRadioRecyclerView();
-                break;
-            case CHECKBOX:
-                radioRecyclerHeaderTextView.setVisibility(View.GONE);
-                radioRecyclerView.setVisibility(View.GONE);
-                checkboxRecyclerHeaderTextView.setVisibility(View.VISIBLE);
-                checkboxRecyclerView.setVisibility(View.VISIBLE);
-                initCheckboxRecyclerView();
-                break;
-        }
+        initRecyclerViews();
    }

    public void setMenuProductModel(MenuProductModel menuProductModel){
        this.menuProductModel = menuProductModel;
    }

-    private void initRadioRecyclerView(){
-        radioRecyclerView.setNestedScrollingEnabled(false);
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(BaseActivity.currentActivity, 1);
-        radioRecyclerView.setLayoutManager(gridLayoutManager);
-        productRadioOptionsRecyclerAdapter = new ProductRadioOptionsRecyclerAdapter(productRadioOptionValueList, new RecyclerItemClickListener() {
-            @Override
-            public void onItemClick(View view, int position) {
-                if(!productRadioOptionValueList.get(position).isSelected()){
-                    for(MenuProductOptionValueModel menuProductOptionValueModel : productRadioOptionValueList){
-                        menuProductOptionValueModel.setSelected(false);
-                    }
-                    productRadioOptionValueList.get(position).setSelected(true);
-                    productRadioOptionsRecyclerAdapter.notifyDataSetChanged();
-                    productPriceTextView.setText(PriceHelper.calculatePriceAfterRadioOptionValueChanged(
-                            productCount, menuProductModel, productRadioOptionValueList.get(position)));
-                }
+    private void initRecyclerViews(){
+        fixRadioAndCheckbox();
+        for(int i = 0; i < menuProductModel.getProductOptionList().size(); i++){
+            MenuProductOptionModel menuProductOptionModel = menuProductModel.getProductOptionList().get(i);
+            setSelectedPriceShowingOptions(menuProductOptionModel);
+            switch (i){
+                case 0:
+                    initRecyclerView(
+                            recycler1HeaderTextView,
+                            recyclerView1,
+                            menuProductOptionModel);
+                    break;
+                case 1:
+                    initRecyclerView(
+                            recycler2HeaderTextView,
+                            recyclerView2,
+                            menuProductOptionModel);
+                    break;
            }
-        });
-        radioRecyclerView.setAdapter(productRadioOptionsRecyclerAdapter);
+        }
    }

-    private void initCheckboxRecyclerView(){
-        checkboxRecyclerView.setNestedScrollingEnabled(false);
+    private void initRecyclerView(TextView headerTextView,
+                                  RecyclerView recyclerView,
+                                  final MenuProductOptionModel menuProductOptionModel){
+        headerTextView.setText(menuProductOptionModel.getName());
+        recyclerView.setNestedScrollingEnabled(false);
        GridLayoutManager gridLayoutManager = new GridLayoutManager(BaseActivity.currentActivity, 1);
-        checkboxRecyclerView.setLayoutManager(gridLayoutManager);
-        productCheckboxOptionsRecyclerAdapter = new ProductCheckboxOptionsRecyclerAdapter(productCheckboxOptionValueList, new RecyclerItemClickListener() {
-            @Override
-            public void onItemClick(View view, int position) {
-                productCheckboxOptionValueList.get(position).setSelected(
-                        !productCheckboxOptionValueList.get(position).isSelected());
-                productCheckboxOptionsRecyclerAdapter.notifyItemChanged(position);
-                productPriceTextView.setText(
-                        PriceHelper.calculatePriceAfterCheckboxOptionValueChanged(
-                                productCount, menuProductModel, productCheckboxOptionValueList));
-            }
-        });
-        checkboxRecyclerView.setAdapter(productCheckboxOptionsRecyclerAdapter);
+        recyclerView.setLayoutManager(gridLayoutManager);
+
+
+        if(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
+                menuProductOptionModel.getType().toLowerCase().equals("select")){
+
+            final ProductRadioOptionsRecyclerAdapter productRadioOptionsRecyclerAdapter =
+                    new ProductRadioOptionsRecyclerAdapter(menuProductOptionModel.getOptionValueModelList());
+            productRadioOptionsRecyclerAdapter.setRecyclerItemClickListener(new RecyclerItemClickListener() {
+                @Override
+                public void onItemClick(View view, int position) {
+                    ArrayList<MenuProductOptionValueModel> optionValueList = menuProductOptionModel.getOptionValueModelList();
+                    if(!optionValueList.get(position).isSelected()){
+                        for(MenuProductOptionValueModel menuProductOptionValueModel : optionValueList){
+                            menuProductOptionValueModel.setSelected(false);
+                        }
+                        optionValueList.get(position).setSelected(true);
+                        productRadioOptionsRecyclerAdapter.notifyDataSetChanged();
+                        productPriceTextView.setText(PriceHelper.calculatePriceAfterRadioOptionValueChanged(
+                                productCount, menuProductModel, optionValueList.get(position)));
+                    }
+                }
+            });
+            recyclerView.setAdapter(productRadioOptionsRecyclerAdapter);
+            headerTextView.setVisibility(View.VISIBLE);
+            recyclerView.setVisibility(View.VISIBLE);
+        }
+        else{
+
+            final ProductCheckboxOptionsRecyclerAdapter productCheckboxOptionsRecyclerAdapter =
+                    new ProductCheckboxOptionsRecyclerAdapter(menuProductOptionModel.getOptionValueModelList());
+            productCheckboxOptionsRecyclerAdapter.setRecyclerItemClickListener(new RecyclerItemClickListener() {
+                @Override
+                public void onItemClick(View view, int position) {
+                    ArrayList<MenuProductOptionValueModel> optionValueList = menuProductOptionModel.getOptionValueModelList();
+                    optionValueList.get(position).setSelected(
+                            !optionValueList.get(position).isSelected());
+                    productCheckboxOptionsRecyclerAdapter.notifyItemChanged(position);
+                    productPriceTextView.setText(
+                            PriceHelper.calculatePriceAfterCheckboxOptionValueChanged(
+                                    productCount, menuProductModel, optionValueList));
+                }
+            });
+            recyclerView.setAdapter(productCheckboxOptionsRecyclerAdapter);
+            headerTextView.setVisibility(View.VISIBLE);
+            recyclerView.setVisibility(View.VISIBLE);
+        }
    }

    private void setFields(){
@@ -235,20 +247,17 @@ public class CampaignProductDetailsActivity extends BaseActivity {
        productPriceTextView.setText(PriceHelper.getPriceWithCurreny(menuProductModel.getPrice()));
    }

-    private void fillRadioAndCheckboxOptionLists(){
-        for(MenuProductOptionModel menuProductOptionModel : menuProductModel.getProductOptionList()){
-            setSelectedPriceShowingOptions(menuProductOptionModel);
-
-            if(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
-                    menuProductOptionModel.getType().toLowerCase().equals("select")){
-                radioRecyclerHeaderTextView.setText(menuProductOptionModel.getName());
-                productRadioOptionValueList.addAll(menuProductOptionModel.getOptionValueModelList());
-            }
-            else{
-                checkboxRecyclerHeaderTextView.setText(menuProductOptionModel.getName());
-                productCheckboxOptionValueList.addAll(menuProductOptionModel.getOptionValueModelList());
-            }
-        }
+    private void fixRadioAndCheckbox(){
+        ArrayList<MenuProductOptionModel> sortedOptionList = menuProductModel.getProductOptionList();
+        Collections.sort(
+                sortedOptionList,
+                new Comparator<MenuProductOptionModel>() {
+                    @Override
+                    public int compare(MenuProductOptionModel o1, MenuProductOptionModel o2) {
+                        return o2.getType().compareTo(o1.getType());
+                    }
+                });
+        menuProductModel.setProductOptionList(sortedOptionList);
    }

    private void setSelectedPriceShowingOptions(MenuProductOptionModel menuProductOptionModel){
@@ -391,21 +400,15 @@ public class CampaignProductDetailsActivity extends BaseActivity {


    private boolean checkFields(){
-
-        if(radioRecyclerView.getVisibility() == View.VISIBLE &&
-                !isSelectedAtLeastOne(productRadioOptionValueList)){
-            DialogHelper.showAlertDialog(BaseActivity.currentActivity,
-                    radioRecyclerHeaderTextView.getText().toString() + " " + noOptionsSelectedText);
-            return false;
+        for(int i = 0; i < menuProductModel.getProductOptionList().size(); i++){
+            MenuProductOptionModel menuProductOptionValueModel = menuProductModel.getProductOptionList().get(i);
+            boolean isRadio = menuProductOptionValueModel.getType().toLowerCase().equals("radio") || menuProductOptionValueModel.getType().toLowerCase().equals("select");
+            if(!isSelectedAtLeastOne(menuProductModel.getProductOptionList().get(i).getOptionValueModelList())){
+                DialogHelper.showAlertDialog(BaseActivity.currentActivity,
+                        menuProductModel.getProductOptionList().get(i).getName() + " " + noOptionsSelectedText);
+                return false;
+            }
        }
-
-        if(checkboxRecyclerView.getVisibility() == View.VISIBLE &&
-                !isSelectedAtLeastOne(productCheckboxOptionValueList)){
-            DialogHelper.showAlertDialog(BaseActivity.currentActivity,
-                    checkboxRecyclerHeaderTextView.getText().toString() + " " + noOptionsSelectedText);
-            return false;
-        }
-
        return true;
    }

--- a/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
@@ -32,6 +32,7 @@ import ch.pizzamaxx.android.helper.SharedPrefsHelper;
 import ch.pizzamaxx.android.helper.TextHelper;
 import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
 import ch.pizzamaxx.android.model.AddProductToBasketResponseModel;
+import ch.pizzamaxx.android.model.CampaignModel;
 import ch.pizzamaxx.android.model.cart.CartInfoModel;
 import ch.pizzamaxx.android.model.menu.MenuProductModel;
 import ch.pizzamaxx.android.model.menu.MenuProductOptionModel;
@@ -64,6 +65,7 @@ public class ProductDetailsActivity extends BaseActivity {
    private int productCount = 1;

    private MenuProductModel menuProductModel;
+    private CampaignModel campaignModel;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
--- a/app/src/main/res/layout/activity_campaign_product_details.xml
+++ b/app/src/main/res/layout/activity_campaign_product_details.xml
@@ -210,7 +210,7 @@
                    android:layout_marginEnd="12dp"/>

                <TextView
-                    android:id="@+id/radioRecyclerHeaderTextView"
+                    android:id="@+id/recycler1HeaderTextView"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    fontPath="fonts/Quicksand-Bold.ttf"
@@ -221,7 +221,7 @@
                    android:textColor="@color/black"/>

                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/radioRecyclerView"
+                    android:id="@+id/recyclerView1"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:visibility="gone"/>
@@ -236,7 +236,7 @@
                    android:layout_marginEnd="12dp"/>

                <TextView
-                    android:id="@+id/checkboxRecyclerHeaderTextView"
+                    android:id="@+id/recycler2HeaderTextView"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    fontPath="fonts/Quicksand-Bold.ttf"
@@ -246,7 +246,7 @@
                    android:textColor="@color/black"/>

                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/checkboxRecyclerView"
+                    android:id="@+id/recyclerView2"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:visibility="gone"/>