diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index e12ffb1..1caffaa 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java index 42a89c7..84266e4 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java @@ -547,7 +547,6 @@ public class MainActivity extends BaseActivity { private CategoryModel getDefaultCategory(){ CategoryModel defaultCategory = null; for(CategoryModel categoryModel: categoryList){ - // || categoryModel.getId() == 20 for test if(categoryModel.isDefault()){ defaultCategory = categoryModel; break; diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java index e1df4ce..9870998 100644 --- a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java @@ -3,8 +3,7 @@ package ch.pizzacucina.android.api; 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://pizzamaxx.ch/"; - //public static final String API_PATH = "http://pizzaleu.ddns.net/"; + public static final String API_PATH = "http://cucinaexpress.ch/"; public static final String APP_TYPE_ID_ANDROID = "2"; public static final int APP_ERROR_CODE_AUTHORIZATION = 1; @@ -44,10 +43,10 @@ public class ApiConstants { public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed"; public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true"; - public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://pizza-cucina.ch/pizzacucina/index.php?route=mobile/service/postFinancePayment&order_id="; + public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://cucinaexpress.ch/pizzacucina/index.php?route=mobile/service/postFinancePayment&order_id="; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_SUCCESS = "postFinancePaymentIsSuccess"; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_FAIL = "postFinancePaymentIsFailed"; - public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.pizza-cucina.ch/"; - public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.pizza-cucina.ch/"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.cucinaexpress.ch/"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.cucinaexpress.ch/"; } diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java index c21a71b..261f9b2 100644 --- a/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java @@ -6,7 +6,7 @@ public class ApiEndPoints { private static final String SUFFIX = "&is_mobile=1"; public static final String API_GET_STORE_LIST = "pizza/servicemagazabelirle.php"; - public static final String API_GET_CAMPAIGN_BANNERS = "pizzacucina/" + PREFIX + "getCampaignBanners" + SUFFIX; + public static final String API_GET_CAMPAIGN_BANNERS = "pizzacucina" + PREFIX + "getCampaignBanners" + SUFFIX; public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX; public static final String API_GET_IGNORED_CATEGORY_IDS= PREFIX + "getIgnoredCategory" + SUFFIX; diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index c796a86..582a5ef 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -41,7 +41,8 @@ android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingStart="24dp" - android:paddingEnd="24dp"/> + android:paddingEnd="24dp" + android:visibility="gone"/>