campaign fix
This commit is contained in:
@@ -40,7 +40,6 @@ import ch.pizzapp.android.helper.DialogHelper;
|
||||
import ch.pizzapp.android.helper.PriceHelper;
|
||||
import ch.pizzapp.android.helper.SessionHelper;
|
||||
import ch.pizzapp.android.helper.SharedPrefsHelper;
|
||||
import ch.pizzapp.android.model.CampaignModel;
|
||||
import ch.pizzapp.android.model.CategoryModel;
|
||||
import ch.pizzapp.android.view.AppToolbar;
|
||||
import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
|
||||
@@ -77,7 +76,6 @@ public class MainActivity extends BaseActivity {
|
||||
private NavigationMenuRecyclerAdapter navigationMenuRecyclerAdapter;
|
||||
//private Badge badge;
|
||||
private Animation animUp,animDown;
|
||||
private CampaignModel campaignModel;
|
||||
|
||||
private SectionedRecyclerViewAdapter sectionAdapter = new SectionedRecyclerViewAdapter();
|
||||
|
||||
@@ -95,9 +93,14 @@ public class MainActivity extends BaseActivity {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
setCartItemCount();
|
||||
}
|
||||
|
||||
private void getDataFromIntent(){
|
||||
isStartWithOrderHistory = getIntent().getBooleanExtra("isStartWithOrderHistory", false);
|
||||
campaignModel = (CampaignModel)getIntent().getSerializableExtra("campaignModel");
|
||||
}
|
||||
|
||||
private void initViews(){
|
||||
@@ -158,10 +161,6 @@ public class MainActivity extends BaseActivity {
|
||||
if(isStartWithOrderHistory){
|
||||
bottomNavigationView.setCurrentItem(1);
|
||||
}
|
||||
else if (campaignModel != null) {
|
||||
CategoryModel campaignCategoryModel = new CategoryModel(campaignModel);
|
||||
openProductsScreen(campaignCategoryModel);
|
||||
}
|
||||
else {
|
||||
openProductsScreen(categoryList.get(2));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user