diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d40442c..e7171f2 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java index 14480fd..35c36c8 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java @@ -54,4 +54,14 @@ public class BaseActivity extends AppCompatActivity { return pInfo.versionCode; } + public String getAppVersionName(){ + PackageInfo pInfo = null; + try { + pInfo = getPackageManager().getPackageInfo(getPackageName(), 0); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + return ""; + } + return pInfo.versionName; + } } diff --git a/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java index 84266e4..cde5f8e 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java @@ -30,6 +30,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import ch.pizzacucina.android.R; import ch.pizzacucina.android.adapter.recycler.NavigationMenuRecyclerAdapter; +import ch.pizzacucina.android.api.ApiConstants; import ch.pizzacucina.android.fragment.CartFragment; import ch.pizzacucina.android.fragment.OrderHistoryFragment; import ch.pizzacucina.android.fragment.StoreInfoFragment; @@ -434,6 +435,10 @@ public class MainActivity extends BaseActivity { private void openProductsScreen(CategoryModel clickedCategoryModel){ + if(clickedCategoryModel.getId() == ApiConstants.PRODUCT_ID_VERSION_MENU){ + return; + } + drawerLayout.closeDrawers(); if(clickedCategoryModel.isSpecialCategory()){ diff --git a/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java index 0d454d5..7414ebf 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/SplashActivity.java @@ -312,8 +312,7 @@ public class SplashActivity extends BaseActivity { if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()){ - CategoryModel.checkNull(response.body().getData()); - SharedPrefsHelper.saveCategoryList(response.body().getData()); + saveCategoryList(response.body().getData()); getPizzaCategoryIds(); } else { @@ -330,6 +329,15 @@ public class SplashActivity extends BaseActivity { }); } + private void saveCategoryList(ArrayList categoryList){ + CategoryModel versionNameCategoryModel = new CategoryModel(); + versionNameCategoryModel.setId(ApiConstants.PRODUCT_ID_VERSION_MENU); + versionNameCategoryModel.setName("v" + getAppVersionName()); + categoryList.add(versionNameCategoryModel); + CategoryModel.checkNull(categoryList); + SharedPrefsHelper.saveCategoryList(categoryList); + } + private void getPizzaCategoryIds(){ Call> call = ApiService.apiInterface.getPizzaCategoryIds(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java index a873490..7784691 100644 --- a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java @@ -10,6 +10,7 @@ public class ApiConstants { public static final int PRODUCT_ID_WUNSCHPIZZA = 56; public static final int PRODUCT_ID_ABEND_MENU = 733; public static final int PRODUCT_ID_MITTAGS_MENU = 732; + public static final int PRODUCT_ID_VERSION_MENU = -111; public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS"; public static final String CAMPAIGN_CODE_KEBAPPASS = "KEBAPPASS"; diff --git a/app/src/main/java/ch/pizzacucina/android/model/CategoryModel.java b/app/src/main/java/ch/pizzacucina/android/model/CategoryModel.java index f217959..0e0d143 100644 --- a/app/src/main/java/ch/pizzacucina/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CategoryModel.java @@ -41,6 +41,10 @@ public class CategoryModel implements Serializable{ public void checkNull(){ if(name == null) name = ""; + if(specialProductId == null) + specialProductId = ""; + if(subCategoryList == null) + subCategoryList = new ArrayList<>(); } public static void checkNull(ArrayList categoryList){