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

service base url changed, test codes removed for umimplemented services, category id changed to string

Browse Source
This commit is contained in:
mustafa içmen
2020-11-13 21:07:06 +03:00
parent 8d47d9da0a
commit 2e0beab8e6
4 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java
View File

@@ -72,7 +72,7 @@ public class MainActivity extends BaseActivity {
private FragmentManager fragmentManager;
private String currentFragmentName = "";
private int currentCategoryId = -1;
private String currentCategoryId = "";
private boolean isStartWithOrderHistory, isStartWithCart;
private ArrayList<CategoryModel> categoryList = new ArrayList<>();
private NavigationMenuRecyclerAdapter navigationMenuRecyclerAdapter;
@@ -226,7 +226,7 @@ public class MainActivity extends BaseActivity {
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, CartFragment.newInstance()).commit();
currentFragmentName = CartFragment.FRAGMENT_NAME;
currentCategoryId = -1;
currentCategoryId = "";
cartTotalRelativeLayout.setVisibility(View.GONE);
shoppingCartImageView.setImageDrawable(yellowCartDrawable);
@@ -244,7 +244,7 @@ public class MainActivity extends BaseActivity {
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, OrderHistoryFragment.newInstance()).commit();
currentFragmentName = OrderHistoryFragment.FRAGMENT_NAME;
currentCategoryId = -1;
currentCategoryId = "";
cartTotalRelativeLayout.setVisibility(View.GONE);
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
@@ -262,7 +262,7 @@ public class MainActivity extends BaseActivity {
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, ProfileFragment.newInstance()).commit();
currentFragmentName = ProfileFragment.FRAGMENT_NAME;
currentCategoryId = -1;
currentCategoryId = "";
cartTotalRelativeLayout.setVisibility(View.GONE);
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
@@ -276,7 +276,7 @@ public class MainActivity extends BaseActivity {
fragmentManager.beginTransaction().replace(R.id.fragmentContainer, StoreInfoFragment.newInstance()).commit();
currentFragmentName = StoreInfoFragment.FRAGMENT_NAME;
currentCategoryId = -1;
currentCategoryId = "";
cartTotalRelativeLayout.setVisibility(View.GONE);
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
@@ -435,7 +435,7 @@ public class MainActivity extends BaseActivity {
private void openProductsScreen(CategoryModel clickedCategoryModel){
if(clickedCategoryModel.getId() == ApiConstants.PRODUCT_ID_VERSION_MENU){
if(clickedCategoryModel.getId().equals(ApiConstants.PRODUCT_ID_VERSION_MENU)){
return;
}