diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f757172..7e4cd9f 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 1c8cb4a..f40637e 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java b/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java index d7342d5..b0315bc 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java @@ -437,7 +437,7 @@ public class MainActivity extends BaseActivity { drawerLayout.closeDrawers(); - if(clickedCategoryModel.isProduct()){ + if(clickedCategoryModel.isSpecialCategory()){ if(currentFragmentName.equals(ProductFragment.FRAGMENT_NAME) && currentCategoryId == clickedCategoryModel.getId()) diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java index 0324e03..3744808 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java @@ -6,10 +6,7 @@ public class ApiConstants { //public static final String API_PATH = "http://www.pizzalink.ch/"; public static final String API_PATH = "http://pizzaleu.ddns.net/"; //public static final String API_PATH = "http://pizzamaxx.ch/"; - public static final int CATEGORY_ID_WUNSCHPIZZA = 9999; - public static final int CATEGORY_ID_EKSTRA_KEBAP = 9998; public static final int PRODUCT_ID_WUNSCHPIZZA = 56; - public static final int PRODUCT_ID_EKSTRA_KEBAP = 91; public static final String APP_TYPE_ID_ANDROID = "2"; public static final int APP_ERROR_CODE_AUTHORIZATION = 1; @@ -33,5 +30,5 @@ public class ApiConstants { public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed"; public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true"; - public static final int NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX = 6; + public static final int NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX = 4; } diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java index 67e4a44..243e9a7 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java @@ -150,10 +150,17 @@ public class ProductFragment extends BaseFragment { } private int getProductIdByCategory(){ - if(categoryModel.getId() == ApiConstants.CATEGORY_ID_WUNSCHPIZZA) - return ApiConstants.PRODUCT_ID_WUNSCHPIZZA; - else - return ApiConstants.PRODUCT_ID_EKSTRA_KEBAP; + String productIdString = ""; + if(categoryModel.isSpecialCategory()){ + productIdString = categoryModel.getSpecialProductId(); + } + int productIdInt; + try{ + productIdInt = Integer.valueOf(productIdString); + }catch (Exception e){ + productIdInt = 0; + } + return productIdInt; } private void sortProductsByName(){ diff --git a/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java b/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java index fcac9a6..cad336c 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java @@ -23,6 +23,14 @@ public class CategoryModel implements Serializable{ @SerializedName("name") private String name; + @Expose + @SerializedName("is_special") + private boolean specialCategory; + + @Expose + @SerializedName("product_id") + private String specialProductId; + @Expose @SerializedName("children") private ArrayList subCategoryList; @@ -52,10 +60,6 @@ public class CategoryModel implements Serializable{ return String.valueOf(id); } - public boolean isProduct(){ - return id == ApiConstants.CATEGORY_ID_WUNSCHPIZZA || id == ApiConstants.CATEGORY_ID_EKSTRA_KEBAP; - } - public int getId() { return id; } @@ -80,4 +84,22 @@ public class CategoryModel implements Serializable{ this.subCategoryList = subCategoryList; } + public boolean isSpecialCategory() { + return specialCategory; + } + + public void setSpecialCategory(boolean specialCategory) { + this.specialCategory = specialCategory; + } + + public String getSpecialProductId() { + if(specialProductId == null){ + specialProductId = ""; + } + return specialProductId; + } + + public void setSpecialProductId(String specialProductId) { + this.specialProductId = specialProductId; + } }