From 4e6e476bcc10cce47a09cae9cde821aa4052ef40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Wed, 4 Dec 2019 22:26:51 +0300
Subject: [PATCH] - default category index changed - special category fix

---
 .idea/caches/build_file_checksums.ser         | Bin 542 -> 542 bytes
 .idea/caches/gradle_models.ser                | Bin 314763 -> 314760 bytes
 .../android/activity/MainActivity.java        |   2 +-
 .../ch/pizzaleu/android/api/ApiConstants.java |   5 +--
 .../android/fragment/ProductFragment.java     |  15 ++++++---
 .../pizzaleu/android/model/CategoryModel.java |  30 +++++++++++++++---
 6 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index f75717205b424f8f6ae6daa68e82f372d3cb78ae..7e4cd9fb763979c564b0846c9bd129e5412ab76b 100644
GIT binary patch
delta 37
tcmbQoGLL1#43<k8B7z&|XfRIx$f(0!!XS`XP@q3KpHXb`eMSMs3IOZN3&#Ke

delta 33
pcmbQoGLL1#43@K=a{e3VXfRIx#Hh_&!XP-=kx_c`14aSH3IN0y3XlK*

diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 1c8cb4acd4f329357298cd375f7287f077cc0a8c..f40637ec8597e95e65aa4c926401ad0251299e07 100644
GIT binary patch
delta 125
zcmeC4E!;6%c*A~mF1N~Z1~6cpp69@#z4?oJj18YX=Ybszg$#9!MkNfaDU<DuMVpIL
z+KW>dftYD~aSHRJt87maqskczrWbBx65gI?#j=TwCF1ZlkL@asETZkKK)p;Kw>zF-
a`OL`pZ@cL!mQp50mg%d{u-s$%T>$_c2rKab

delta 141
zcmeB}E!;g@c*A~mF0;PIA_fp(oSx^vqP_WxdW;R9PuEm&hC+rqMxzo2)|AQi#-h!|
zDec86j6lq^y*P#W(N(s#EsMk$3#J!tWD?$<XT`FKjU_#JHRpB}M;6g`4v@Cgq|)^5
pb|+XqGcx|)Zgh&Jl!=SA7-%SiPzi(6<b#&h)8Cw7nZ@*{0szkuFZ%!h

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<CategoryModel> 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;
+    }
 }