From c242a41d6cbfa369eda6de47761191d1be41693c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Tue, 10 Dec 2019 00:27:49 +0300 Subject: [PATCH] - default category indext changed to dynamic - splash screen design changed - getShiipngmethodsArray(), getPaymentMethodsArray(), addOrder2() service urls changed --- .idea/caches/build_file_checksums.ser | Bin 542 -> 542 bytes .idea/caches/gradle_models.ser | Bin 317664 -> 317661 bytes .../android/activity/MainActivity.java | 15 ++++++++++-- .../android/activity/SplashActivity.java | 9 ------- .../ch/pizzaleu/android/api/ApiConstants.java | 1 - .../ch/pizzaleu/android/api/ApiEndPoints.java | 6 ++--- .../pizzaleu/android/model/CategoryModel.java | 8 +++++++ app/src/main/res/layout/activity_splash.xml | 22 +++++++++--------- 8 files changed, 35 insertions(+), 26 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ad57f646626b1e501ecfa223bfb212f051fdc971..598e61dac5fa4f28857783e013dedb52f6ce29ba 100644 GIT binary patch delta 15 XcmbQoGLL1#43^ic`F3uc)5Hh>GnNLP delta 15 XcmbQoGLL1#43=k(fBiPjX<`HbGz$i^ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 2638743066ea989839936155b6eb5671ae2c8b09..c128dc853f10cb7d9f5dcf21e76f5e96b355efbe 100644 GIT binary patch delta 133 zcmV;00DAx6u@l{~6R`FO1_Wo1>;M3hkVG%DD+%8`1g?+ozJm@%hYm&ohYm&pw+==F ziQoj-YvIV3L9qlCx3DGzvIYnkyNG&zasV%r{|Oqmge?TbhXru}egXxzP_+aD0R};F n0Db}LliwalmtZFZ1-GWQ1mhk7Ft>`;1a$%dHkQ}~-U2OnhFvk2 delta 123 zcmV->0EGYDu@m626R`FO20o8FXaE3{kVG%DD+%8`1UY?>!-Eb+hYm&ohYm&pw+==F ziQoi^Q|gVEL9qlCx3DGzvIYn^biLJnasV%r{|Oqmge?TbhX`~41!QGnb!WFtwFCnJ d0YbM?wgfdF0Wr6S)dY0{0XLWZ*96`IE_f5NEV%#x 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