diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a323155..e17c317 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 94e2591..5afdddb 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/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;