diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index ad57f64..598e61d 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 2638743..c128dc8 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 b0315bc..e04f9cf 100644
--- a/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java
+++ b/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java
@@ -168,7 +168,7 @@ public class MainActivity extends BaseActivity {
bottomNavigationView.setCurrentItem(2);
}
else {
- openProductsScreen(categoryList.get(ApiConstants.NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX));
+ openProductsScreen(getDefaultCategory());
}
}
private void initBottomNavigationView(){
@@ -193,7 +193,7 @@ public class MainActivity extends BaseActivity {
currentFragmentName = MenuFragment.FRAGMENT_NAME;
*/
- openProductsScreen(categoryList.get(ApiConstants.NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX));
+ openProductsScreen(getDefaultCategory());
shoppingCartImageView.setImageDrawable(grayCartDrawable);
shoppingCartTextView.setTextColor(grayColor);
@@ -545,4 +545,15 @@ public class MainActivity extends BaseActivity {
}
}
+ private CategoryModel getDefaultCategory(){
+ CategoryModel defaultCategory = null;
+ for(CategoryModel categoryModel: categoryList){
+ if(categoryModel.isDefault()){
+ defaultCategory = categoryModel;
+ break;
+ }
+ }
+ return defaultCategory;
+ }
+
}
diff --git a/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java
index def9a99..3e2783c 100644
--- a/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java
+++ b/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java
@@ -47,7 +47,6 @@ import retrofit2.Response;
public class SplashActivity extends BaseActivity {
- @BindView(R.id.pizzappSplashLogoImageView) ImageView pizzappSplashLogoImageView;
@BindView(R.id.campaignBannerRecyclerView) RecyclerView campaignBannerRecyclerView;
@BindView(R.id.postCodeTextView) TextView postCodeTextView;
@@ -146,14 +145,6 @@ public class SplashActivity extends BaseActivity {
campaignBannerList.addAll(response.body().getData());
sortCampaignBannerList();
campaignBannerRecyclerAdapter.notifyDataSetChanged();
- if(campaignBannerList.isEmpty()){
- pizzappSplashLogoImageView.setVisibility(View.VISIBLE);
- campaignBannerRecyclerView.setVisibility(View.GONE);
- }
- else {
- pizzappSplashLogoImageView.setVisibility(View.GONE);
- campaignBannerRecyclerView.setVisibility(View.VISIBLE);
- }
}
else {
ApiErrorUtils.parseError(response);
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 9d4d5c2..7b74398 100644
--- a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java
+++ b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java
@@ -44,5 +44,4 @@ 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 = 4;
}
diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java
index 7e074a7..82ddbe2 100644
--- a/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java
+++ b/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java
@@ -18,9 +18,9 @@ public class ApiEndPoints {
public static final String API_GET_CLEAR_CART = PREFIX + "clearBasket" + SUFFIX;
public static final String API_GET_PRODUCTS_BY_CATEGORY = PREFIX + "getProductsByCategory" + SUFFIX;
public static final String API_GET_PRODUCT = PREFIX + "getProduct" + SUFFIX;
- public static final String API_GET_SHIPPING_METHODS = PREFIX + "getShippingMethodsArray" + SUFFIX;
+ public static final String API_GET_SHIPPING_METHODS = PREFIX + "getShippingMethods" + SUFFIX;
public static final String API_GET_CUSTOMER_ADDRESSES = PREFIX + "getAddresses" + SUFFIX;
- public static final String API_GET_PAYMENT_METHODS = PREFIX + "getPaymentMethodsArray" + SUFFIX;
+ public static final String API_GET_PAYMENT_METHODS = PREFIX + "getPaymentMethods" + SUFFIX;
public static final String API_CHECK_UPDATE = PREFIX + "checkUpdate" + SUFFIX;
public static final String API_FORGOT_PASSWORD = PREFIX + "forgotPassword" + SUFFIX;
public static final String API_GET_CITY_LIST = PREFIX + "getCities" + SUFFIX;
@@ -39,7 +39,7 @@ public class ApiEndPoints {
public static final String API_ADD_PRODUCTS_TO_BASKET = PREFIX + "addProductsToBasket" + SUFFIX + "&token=";
public static final String API_ADD_NEW_ADDRESS = PREFIX + "addAddress" + SUFFIX + "&token=";
public static final String API_DELETE_ADDRESS = PREFIX + "deleteAddress" + SUFFIX + "&token=";
- public static final String API_CREATE_ORDER = PREFIX + "addOrder2" + SUFFIX + "&token=";
+ public static final String API_CREATE_ORDER = PREFIX + "addOrder" + SUFFIX + "&token=";
public static final String API_UPDATE_PASSWORD = PREFIX + "passwordUpdate" + SUFFIX + "&token=";
public static final String API_UPDATE_PROFILE = PREFIX + "updateCustomerInfo" + SUFFIX + "&token=";
public static final String API_REMOVE_RPODUCT_FORM_CART = PREFIX + "removeProductFromBasket" + SUFFIX + "&token=";
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 cad336c..cf9a395 100644
--- a/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java
+++ b/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java
@@ -27,6 +27,10 @@ public class CategoryModel implements Serializable{
@SerializedName("is_special")
private boolean specialCategory;
+ @Expose
+ @SerializedName("is_default")
+ private boolean isDefault;
+
@Expose
@SerializedName("product_id")
private String specialProductId;
@@ -102,4 +106,8 @@ public class CategoryModel implements Serializable{
public void setSpecialProductId(String specialProductId) {
this.specialProductId = specialProductId;
}
+
+ public boolean isDefault() {
+ return isDefault;
+ }
}
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index f86e9fd..0a16b17 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -23,23 +23,15 @@
android:src="@drawable/pizzaleu_splash_logo"
android:adjustViewBounds="true"
android:layout_margin="16dp"
- android:scaleType="fitXY"
- android:visibility="gone"/>
-
-
+ android:scaleType="fitXY" />
+ android:layout_margin="8dp">
+
+
\ No newline at end of file