From af666536d0840f265e06cfe5821229d62595407c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sun, 24 Nov 2019 21:39:33 +0300 Subject: [PATCH] store select dialog store name fix --- .idea/caches/build_file_checksums.ser | Bin 542 -> 542 bytes .idea/caches/gradle_models.ser | Bin 314763 -> 314760 bytes .../android/activity/SplashActivity.java | 4 ++-- .../ch/pizzaleu/android/api/ApiConstants.java | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a323155f261cbf7342ad08b72809ce2ec02deaf3..e17c31770174b69279db1b969b58fb40e44d2949 100644 GIT binary patch delta 37 tcmbQoGLL1#43>H8?M=HaD@u0NGZZq^F&dRHu%=A5Hx_L! zPH8VrVFY5P?Zqj~kFK(*?9ZRiSTMbCBa`sY%IYyKPhZiab)3YW_$iuuo@=m zeuPDrN#^7Aud844Nd7>!C8SW_n38;dp< zr?eNRFaj~t_Tm)gM_1V{8#=o)7ECYP$RxZy&x&Oe8%w^#|BCG@jx1cwY36{@{jQ_VAonk3v;$j79WDqK0aGHG3(t7%vGc2>1{!{<}(&R_* 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 4d2968a..1c79d98 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java @@ -129,14 +129,14 @@ public class SplashActivity extends BaseActivity { final ArrayList postCodeList = new ArrayList<>(); for(StoreModel storeModel : storeList){ storeModel.checkNull(); - postCodeList.add(storeModel.getPostCode()); + postCodeList.add(storeModel.getPostCode() + "-" + storeModel.getCity()); } DialogHelper.showStoreListDialog(postCodeList, new MaterialDialog.ListCallback() { @Override public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) { selectedStoreModel = storeList.get(position); - postCodeTextView.setText(selectedStoreModel.getPostCode()); + postCodeTextView.setText(selectedStoreModel.getPostCode() + "-" + selectedStoreModel.getCity()); SessionHelper.setSelectedStore(selectedStoreModel); ApiService.getInstance().reset(); 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 90b2a6d..f4b5815 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java @@ -4,8 +4,8 @@ public class ApiConstants { public static final int API_READ_TIMEOUT = 30; public static final int API_CONNECT_TIMEOUT = 10; //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 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;