diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 82282ce..e63718d 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -63,6 +63,7 @@ + @@ -73,8 +74,8 @@ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 669a865..2285f98 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 bb27e7f..718f4c3 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/modules.xml b/.idea/modules.xml index 41bbae0..5b855ca 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f5e2949..7792775 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ repositories { android { compileSdkVersion 28 defaultConfig { - applicationId "ch.pizzamaxx.android" + applicationId "ch.pizzaleu.android" minSdkVersion 16 targetSdkVersion 28 versionCode 12 // play store'daki version --> canlı: 11 - dahili test: 6 diff --git a/app/src/androidTest/java/ch/pizzamaxx/android/ExampleInstrumentedTest.java b/app/src/androidTest/java/ch/pizzaleu/android/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/ch/pizzamaxx/android/ExampleInstrumentedTest.java rename to app/src/androidTest/java/ch/pizzaleu/android/ExampleInstrumentedTest.java index 025fd39..248d814 100644 --- a/app/src/androidTest/java/ch/pizzamaxx/android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/ch/pizzaleu/android/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android; +package ch.pizzaleu.android; import android.content.Context; import android.support.test.InstrumentationRegistry; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 083c4e4..68a6281 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="ch.pizzaleu.android"> @@ -31,44 +31,44 @@ { diff --git a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzaleu/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java index ceef46c..8b00658 100644 --- a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.adapter.recycler; +package ch.pizzaleu.android.adapter.recycler; import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.RecyclerView; @@ -10,9 +10,9 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.PaymentMethodModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.PaymentMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java similarity index 90% rename from app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java index fcb783a..2f3ab12 100644 --- a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.adapter.recycler; +package ch.pizzaleu.android.adapter.recycler; import android.support.v7.widget.AppCompatCheckBox; import android.support.v7.widget.RecyclerView; @@ -11,11 +11,11 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.helper.PriceHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.helper.PriceHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java similarity index 92% rename from app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java rename to app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java index 2187f68..6cd7e10 100644 --- a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.adapter.recycler; +package ch.pizzaleu.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -10,11 +10,11 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.helper.PriceHelper; -import ch.pizzamaxx.android.helper.TextHelper; -import ch.pizzamaxx.android.model.cart.CartProductModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.helper.PriceHelper; +import ch.pizzaleu.android.helper.TextHelper; +import ch.pizzaleu.android.model.cart.CartProductModel; public class ProductOnOrderSummaryRecyclerAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java similarity index 90% rename from app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java index 901dfa6..fbc0421 100644 --- a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.adapter.recycler; +package ch.pizzaleu.android.adapter.recycler; import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.RecyclerView; @@ -11,11 +11,11 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.helper.PriceHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.helper.PriceHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java similarity index 95% rename from app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java rename to app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java index 7c672eb..e8dd596 100644 --- a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.adapter.recycler; +package ch.pizzaleu.android.adapter.recycler; import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.RecyclerView; @@ -10,9 +10,9 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.AddressModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.AddressModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java index 1311753..b4bcd88 100644 --- a/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.adapter.recycler; +package ch.pizzaleu.android.adapter.recycler; import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.RecyclerView; @@ -11,10 +11,10 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.helper.PriceHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.ShippingMethodModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.helper.PriceHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.ShippingMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java rename to app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java index 5be892d..90b2a6d 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java @@ -1,10 +1,10 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.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://www.pizzalink.ch/"; - //public static final String API_PATH = "http://pizzapp.ddns.net/"; + //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; diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java similarity index 99% rename from app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java rename to app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java index ef47ed3..65c94e6 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; public class ApiEndPoints { diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiError.java b/app/src/main/java/ch/pizzaleu/android/api/ApiError.java similarity index 95% rename from app/src/main/java/ch/pizzamaxx/android/api/ApiError.java rename to app/src/main/java/ch/pizzaleu/android/api/ApiError.java index 5695631..bf851e8 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiError.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiError.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; public class ApiError { diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiErrorUtils.java b/app/src/main/java/ch/pizzaleu/android/api/ApiErrorUtils.java similarity index 90% rename from app/src/main/java/ch/pizzamaxx/android/api/ApiErrorUtils.java rename to app/src/main/java/ch/pizzaleu/android/api/ApiErrorUtils.java index a965f5f..7a74461 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiErrorUtils.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiErrorUtils.java @@ -1,14 +1,14 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; import android.content.Intent; import java.lang.annotation.Annotation; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.LoginActivity; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.LoginActivity; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.SharedPrefsHelper; import okhttp3.ResponseBody; import retrofit2.Converter; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java b/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java similarity index 92% rename from app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java rename to app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java index 15520e9..6b49891 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java @@ -1,30 +1,30 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; import java.util.HashMap; -import ch.pizzamaxx.android.model.AddNewAddressResponseModel; -import ch.pizzamaxx.android.model.AddProductToBasketResponseModel; -import ch.pizzamaxx.android.model.AddressModel; -import ch.pizzamaxx.android.model.AppVersionModel; -import ch.pizzamaxx.android.model.CampaignModel; -import ch.pizzamaxx.android.model.CheckCouponModel; -import ch.pizzamaxx.android.model.CountryModel; -import ch.pizzamaxx.android.model.DeleteAddressResponseModel; -import ch.pizzamaxx.android.model.PaymentMethodsResponseModel; -import ch.pizzamaxx.android.model.PaymentTokenModel; -import ch.pizzamaxx.android.model.RemoveProductFromCartResponseModel; -import ch.pizzamaxx.android.model.ShippingMethodModel; -import ch.pizzamaxx.android.model.StoreInfoModel; -import ch.pizzamaxx.android.model.CityModel; -import ch.pizzamaxx.android.model.StoreModel; -import ch.pizzamaxx.android.model.StoreShiftModel; -import ch.pizzamaxx.android.model.ZoneModel; -import ch.pizzamaxx.android.model.cart.CartInfoModel; -import ch.pizzamaxx.android.model.CategoryModel; -import ch.pizzamaxx.android.model.history.OrderHistoryModel; -import ch.pizzamaxx.android.model.UserModel; -import ch.pizzamaxx.android.model.history.OrderHistoryProductModel; -import ch.pizzamaxx.android.model.menu.MenuProductModel; +import ch.pizzaleu.android.model.AddNewAddressResponseModel; +import ch.pizzaleu.android.model.AddProductToBasketResponseModel; +import ch.pizzaleu.android.model.AddressModel; +import ch.pizzaleu.android.model.AppVersionModel; +import ch.pizzaleu.android.model.CampaignModel; +import ch.pizzaleu.android.model.CheckCouponModel; +import ch.pizzaleu.android.model.CountryModel; +import ch.pizzaleu.android.model.DeleteAddressResponseModel; +import ch.pizzaleu.android.model.PaymentMethodsResponseModel; +import ch.pizzaleu.android.model.PaymentTokenModel; +import ch.pizzaleu.android.model.RemoveProductFromCartResponseModel; +import ch.pizzaleu.android.model.ShippingMethodModel; +import ch.pizzaleu.android.model.StoreInfoModel; +import ch.pizzaleu.android.model.CityModel; +import ch.pizzaleu.android.model.StoreModel; +import ch.pizzaleu.android.model.StoreShiftModel; +import ch.pizzaleu.android.model.ZoneModel; +import ch.pizzaleu.android.model.cart.CartInfoModel; +import ch.pizzaleu.android.model.CategoryModel; +import ch.pizzaleu.android.model.history.OrderHistoryModel; +import ch.pizzaleu.android.model.UserModel; +import ch.pizzaleu.android.model.history.OrderHistoryProductModel; +import ch.pizzaleu.android.model.menu.MenuProductModel; import okhttp3.RequestBody; import retrofit2.Call; import retrofit2.http.Body; diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java b/app/src/main/java/ch/pizzaleu/android/api/ApiService.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/api/ApiService.java rename to app/src/main/java/ch/pizzaleu/android/api/ApiService.java index b703891..2469236 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiService.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/app/src/main/java/ch/pizzamaxx/android/api/BaseResponse.java b/app/src/main/java/ch/pizzaleu/android/api/BaseResponse.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/api/BaseResponse.java rename to app/src/main/java/ch/pizzaleu/android/api/BaseResponse.java index b8a886b..fb49140 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/BaseResponse.java +++ b/app/src/main/java/ch/pizzaleu/android/api/BaseResponse.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ResponseArray.java b/app/src/main/java/ch/pizzaleu/android/api/ResponseArray.java similarity index 91% rename from app/src/main/java/ch/pizzamaxx/android/api/ResponseArray.java rename to app/src/main/java/ch/pizzaleu/android/api/ResponseArray.java index 7571714..6c64072 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ResponseArray.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ResponseArray.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ResponseObject.java b/app/src/main/java/ch/pizzaleu/android/api/ResponseObject.java similarity index 90% rename from app/src/main/java/ch/pizzamaxx/android/api/ResponseObject.java rename to app/src/main/java/ch/pizzaleu/android/api/ResponseObject.java index dfdc025..40180a9 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ResponseObject.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ResponseObject.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.api; +package ch.pizzaleu.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/BaseFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/BaseFragment.java similarity index 75% rename from app/src/main/java/ch/pizzamaxx/android/fragment/BaseFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/BaseFragment.java index 5bdc71d..e2821bd 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/BaseFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/BaseFragment.java @@ -1,9 +1,9 @@ -package ch.pizzamaxx.android.fragment; +package ch.pizzaleu.android.fragment; import android.support.v4.app.Fragment; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.MainActivity; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.MainActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/CartFragment.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/CartFragment.java index c1330b3..d1ac547 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/CartFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment; +package ch.pizzaleu.android.fragment; import android.content.DialogInterface; import android.content.Intent; @@ -30,27 +30,27 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.CampaignProductListActivity; -import ch.pizzamaxx.android.activity.CreateOrderActivity; -import ch.pizzamaxx.android.activity.MainActivity; -import ch.pizzamaxx.android.adapter.recycler.CartRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiEndPoints; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseArray; -import ch.pizzamaxx.android.api.ResponseObject; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.PriceHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.helper.SharedPrefsHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.CampaignModel; -import ch.pizzamaxx.android.model.RemoveProductFromCartResponseModel; -import ch.pizzamaxx.android.model.cart.CartInfoModel; -import ch.pizzamaxx.android.model.cart.CartProductModel; -import ch.pizzamaxx.android.model.menu.MenuProductModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.CampaignProductListActivity; +import ch.pizzaleu.android.activity.CreateOrderActivity; +import ch.pizzaleu.android.activity.MainActivity; +import ch.pizzaleu.android.adapter.recycler.CartRecyclerAdapter; +import ch.pizzaleu.android.api.ApiEndPoints; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseArray; +import ch.pizzaleu.android.api.ResponseObject; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.PriceHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.helper.SharedPrefsHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.CampaignModel; +import ch.pizzaleu.android.model.RemoveProductFromCartResponseModel; +import ch.pizzaleu.android.model.cart.CartInfoModel; +import ch.pizzaleu.android.model.cart.CartProductModel; +import ch.pizzaleu.android.model.menu.MenuProductModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/MenuFragment.java similarity index 87% rename from app/src/main/java/ch/pizzamaxx/android/fragment/MenuFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/MenuFragment.java index c6d6324..5b25f1d 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/MenuFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/MenuFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment; +package ch.pizzaleu.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -14,20 +14,20 @@ import java.util.Comparator; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.MainActivity; -import ch.pizzamaxx.android.activity.ProductDetailsActivity; -import ch.pizzamaxx.android.adapter.recycler.MenuProductRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseArray; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.CategoryModel; -import ch.pizzamaxx.android.model.menu.MenuProductModel; -import ch.pizzamaxx.android.view.GridSpacesItemDecoration; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.MainActivity; +import ch.pizzaleu.android.activity.ProductDetailsActivity; +import ch.pizzaleu.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseArray; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.CategoryModel; +import ch.pizzaleu.android.model.menu.MenuProductModel; +import ch.pizzaleu.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/OrderHistoryFragment.java similarity index 91% rename from app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/OrderHistoryFragment.java index b00eea6..34070c2 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/OrderHistoryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment; +package ch.pizzaleu.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -14,20 +14,20 @@ import java.util.HashMap; import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.MainActivity; -import ch.pizzamaxx.android.activity.OrderHistoryDetailsActivity; -import ch.pizzamaxx.android.adapter.recycler.OrderHistoryRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiEndPoints; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseArray; -import ch.pizzamaxx.android.api.ResponseObject; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.history.OrderHistoryModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.MainActivity; +import ch.pizzaleu.android.activity.OrderHistoryDetailsActivity; +import ch.pizzaleu.android.adapter.recycler.OrderHistoryRecyclerAdapter; +import ch.pizzaleu.android.api.ApiEndPoints; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseArray; +import ch.pizzaleu.android.api.ResponseObject; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.history.OrderHistoryModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java similarity index 87% rename from app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java index c7377b6..67e4a44 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment; +package ch.pizzaleu.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -13,21 +13,21 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.MainActivity; -import ch.pizzamaxx.android.activity.ProductDetailsActivity; -import ch.pizzamaxx.android.adapter.recycler.MenuProductRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiConstants; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseArray; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.CategoryModel; -import ch.pizzamaxx.android.model.menu.MenuProductModel; -import ch.pizzamaxx.android.view.GridSpacesItemDecoration; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.MainActivity; +import ch.pizzaleu.android.activity.ProductDetailsActivity; +import ch.pizzaleu.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzaleu.android.api.ApiConstants; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseArray; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.CategoryModel; +import ch.pizzaleu.android.model.menu.MenuProductModel; +import ch.pizzaleu.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/ProfileFragment.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/ProfileFragment.java index 438394d..117cfe9 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/ProfileFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment; +package ch.pizzaleu.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -20,22 +20,22 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.MyAddressesActivity; -import ch.pizzamaxx.android.activity.SplashActivity; -import ch.pizzamaxx.android.activity.UpdatePasswordActivity; -import ch.pizzamaxx.android.activity.UpdateProfileActivity; -import ch.pizzamaxx.android.api.ApiConstants; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseObject; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.NetworkHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.helper.SharedPrefsHelper; -import ch.pizzamaxx.android.model.UserModel; -import ch.pizzamaxx.android.view.AppInfoView; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.MyAddressesActivity; +import ch.pizzaleu.android.activity.SplashActivity; +import ch.pizzaleu.android.activity.UpdatePasswordActivity; +import ch.pizzaleu.android.activity.UpdateProfileActivity; +import ch.pizzaleu.android.api.ApiConstants; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseObject; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.NetworkHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.helper.SharedPrefsHelper; +import ch.pizzaleu.android.model.UserModel; +import ch.pizzaleu.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/StoreInfoFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/StoreInfoFragment.java similarity index 92% rename from app/src/main/java/ch/pizzamaxx/android/fragment/StoreInfoFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/StoreInfoFragment.java index 1f77a38..a470353 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/StoreInfoFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/StoreInfoFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment; +package ch.pizzaleu.android.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -9,13 +9,13 @@ import android.webkit.WebView; import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseObject; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.model.StoreInfoModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseObject; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.model.StoreInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderBaseFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderBaseFragment.java similarity index 68% rename from app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderBaseFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderBaseFragment.java index 8246a7e..101dd6b 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderBaseFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderBaseFragment.java @@ -1,10 +1,10 @@ -package ch.pizzamaxx.android.fragment.createOrder; +package ch.pizzaleu.android.fragment.createOrder; import android.widget.TextView; import butterknife.BindView; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.fragment.BaseFragment; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.fragment.BaseFragment; /** * Created by cimenmus on 21.10.2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderNoteFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java index 93bcc67..c104d08 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderNoteFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment.createOrder; +package ch.pizzaleu.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.AppCompatRadioButton; @@ -12,12 +12,12 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.CreateOrderActivity; -import ch.pizzamaxx.android.helper.SharedPrefsHelper; -import ch.pizzamaxx.android.model.cart.CartProductModel; -import ch.pizzamaxx.android.view.AppEditText; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.CreateOrderActivity; +import ch.pizzaleu.android.helper.SharedPrefsHelper; +import ch.pizzaleu.android.model.cart.CartProductModel; +import ch.pizzaleu.android.view.AppEditText; /** * Created by cimenmus on 28.10.2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderResultFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderResultFragment.java similarity index 84% rename from app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderResultFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderResultFragment.java index ef0237d..faecfb3 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderResultFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderResultFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment.createOrder; +package ch.pizzaleu.android.fragment.createOrder; import android.os.Bundle; import android.view.LayoutInflater; @@ -8,11 +8,11 @@ import android.view.ViewGroup; import butterknife.BindString; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.CreateOrderActivity; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.CreateOrderActivity; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java index 101f3b6..46dd016 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment.createOrder; +package ch.pizzaleu.android.fragment.createOrder; import android.app.Activity; import android.content.Intent; @@ -32,27 +32,27 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.CreateOrderActivity; -import ch.pizzamaxx.android.adapter.recycler.OrderPriceRecyclerAdapter; -import ch.pizzamaxx.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiConstants; -import ch.pizzamaxx.android.api.ApiEndPoints; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseObject; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.PriceHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.helper.SharedPrefsHelper; -import ch.pizzamaxx.android.model.PaymentMethodModel; -import ch.pizzamaxx.android.model.PaymentTokenModel; -import ch.pizzamaxx.android.model.StoreShiftModel; -import ch.pizzamaxx.android.model.cart.CartInfoModel; -import ch.pizzamaxx.android.model.cart.CartProductModel; -import ch.pizzamaxx.android.model.cart.CartTotalModel; -import ch.pizzamaxx.android.view.AppInfoView; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.CreateOrderActivity; +import ch.pizzaleu.android.adapter.recycler.OrderPriceRecyclerAdapter; +import ch.pizzaleu.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter; +import ch.pizzaleu.android.api.ApiConstants; +import ch.pizzaleu.android.api.ApiEndPoints; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseObject; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.PriceHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.helper.SharedPrefsHelper; +import ch.pizzaleu.android.model.PaymentMethodModel; +import ch.pizzaleu.android.model.PaymentTokenModel; +import ch.pizzaleu.android.model.StoreShiftModel; +import ch.pizzaleu.android.model.cart.CartInfoModel; +import ch.pizzaleu.android.model.cart.CartProductModel; +import ch.pizzaleu.android.model.cart.CartTotalModel; +import ch.pizzaleu.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java index 4b4b759..57d7579 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment.createOrder; +package ch.pizzaleu.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; @@ -15,21 +15,21 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.CreateOrderActivity; -import ch.pizzamaxx.android.adapter.recycler.PaymentMethodsRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiEndPoints; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseObject; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.CheckCouponModel; -import ch.pizzamaxx.android.model.PaymentMethodModel; -import ch.pizzamaxx.android.model.PaymentMethodsResponseModel; -import ch.pizzamaxx.android.model.cart.CartInfoModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.CreateOrderActivity; +import ch.pizzaleu.android.adapter.recycler.PaymentMethodsRecyclerAdapter; +import ch.pizzaleu.android.api.ApiEndPoints; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseObject; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.CheckCouponModel; +import ch.pizzaleu.android.model.PaymentMethodModel; +import ch.pizzaleu.android.model.PaymentMethodsResponseModel; +import ch.pizzaleu.android.model.cart.CartInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java similarity index 91% rename from app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingAddressFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java index 43513c7..7476dd6 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingAddressFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment.createOrder; +package ch.pizzaleu.android.fragment.createOrder; import android.content.Intent; import android.os.Bundle; @@ -15,18 +15,18 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.AddAddressActivity; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.CreateOrderActivity; -import ch.pizzamaxx.android.adapter.recycler.ShippingAddressesRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseArray; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.AddressModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.AddAddressActivity; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.CreateOrderActivity; +import ch.pizzaleu.android.adapter.recycler.ShippingAddressesRecyclerAdapter; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseArray; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.AddressModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingMethodFragment.java similarity index 89% rename from app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingMethodFragment.java rename to app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingMethodFragment.java index bf08428..5addd40 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.fragment.createOrder; +package ch.pizzaleu.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; @@ -14,18 +14,18 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.CreateOrderActivity; -import ch.pizzamaxx.android.adapter.recycler.ShippingMethodsRecyclerAdapter; -import ch.pizzamaxx.android.api.ApiErrorUtils; -import ch.pizzamaxx.android.api.ApiService; -import ch.pizzamaxx.android.api.ResponseArray; -import ch.pizzamaxx.android.helper.DialogHelper; -import ch.pizzamaxx.android.helper.PriceHelper; -import ch.pizzamaxx.android.helper.SessionHelper; -import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; -import ch.pizzamaxx.android.model.ShippingMethodModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.CreateOrderActivity; +import ch.pizzaleu.android.adapter.recycler.ShippingMethodsRecyclerAdapter; +import ch.pizzaleu.android.api.ApiErrorUtils; +import ch.pizzaleu.android.api.ApiService; +import ch.pizzaleu.android.api.ResponseArray; +import ch.pizzaleu.android.helper.DialogHelper; +import ch.pizzaleu.android.helper.PriceHelper; +import ch.pizzaleu.android.helper.SessionHelper; +import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; +import ch.pizzaleu.android.model.ShippingMethodModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/DateTimeHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/DateTimeHelper.java similarity index 95% rename from app/src/main/java/ch/pizzamaxx/android/helper/DateTimeHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/DateTimeHelper.java index ad78dde..98aa683 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/DateTimeHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/DateTimeHelper.java @@ -1,11 +1,11 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/DialogHelper.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/helper/DialogHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/DialogHelper.java index 8ee8dfa..2b3d41d 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/DialogHelper.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import android.content.Context; import android.content.DialogInterface; @@ -11,10 +11,10 @@ import com.afollestad.materialdialogs.MaterialDialog; import java.util.ArrayList; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.activity.LoginActivity; -import ch.pizzamaxx.android.activity.RegisterActivity; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.LoginActivity; +import ch.pizzaleu.android.activity.RegisterActivity; public class DialogHelper { @@ -236,7 +236,7 @@ public class DialogHelper { @Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse("market://details?id=ch.pizzamaxx.android")); + intent.setData(Uri.parse("market://details?id=ch.pizzaleu.android")); BaseActivity.currentActivity.startActivity(intent); BaseActivity.currentActivity.finishAffinity(); } diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/DisplayHelper.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/helper/DisplayHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/DisplayHelper.java index 6386fc2..fda7fb4 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/DisplayHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/DisplayHelper.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import android.annotation.TargetApi; import android.os.Build; @@ -7,8 +7,8 @@ import android.util.DisplayMetrics; import android.view.Window; import android.view.WindowManager; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; public class DisplayHelper { diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/ImageLoadHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/ImageLoadHelper.java similarity index 87% rename from app/src/main/java/ch/pizzamaxx/android/helper/ImageLoadHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/ImageLoadHelper.java index 4ac47bb..66c3f9a 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/ImageLoadHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/ImageLoadHelper.java @@ -1,9 +1,9 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import android.widget.ImageView; import com.squareup.picasso.Picasso; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.BaseActivity; public class ImageLoadHelper { diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/NetworkHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/NetworkHelper.java similarity index 88% rename from app/src/main/java/ch/pizzamaxx/android/helper/NetworkHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/NetworkHelper.java index 3961f36..ca1f36b 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/NetworkHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/NetworkHelper.java @@ -1,9 +1,9 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.BaseActivity; public class NetworkHelper { diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/PasswordHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/PasswordHelper.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/helper/PasswordHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/PasswordHelper.java index c32856b..b6f21c5 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/PasswordHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/PasswordHelper.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import java.util.regex.Pattern; diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/PriceHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/PriceHelper.java similarity index 95% rename from app/src/main/java/ch/pizzamaxx/android/helper/PriceHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/PriceHelper.java index 3af3590..b8fcf21 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/PriceHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/PriceHelper.java @@ -1,11 +1,11 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import java.util.ArrayList; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.model.menu.MenuProductModel; -import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.model.menu.MenuProductModel; +import ch.pizzaleu.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 12/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/SessionHelper.java similarity index 92% rename from app/src/main/java/ch/pizzamaxx/android/helper/SessionHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/SessionHelper.java index 321fdd9..243d1f2 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/SessionHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/SessionHelper.java @@ -1,14 +1,14 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzamaxx.android.model.CheckCouponModel; -import ch.pizzamaxx.android.model.CustomerTokenModel; -import ch.pizzamaxx.android.model.StoreModel; -import ch.pizzamaxx.android.model.UserModel; +import ch.pizzaleu.android.model.CheckCouponModel; +import ch.pizzaleu.android.model.CustomerTokenModel; +import ch.pizzaleu.android.model.StoreModel; +import ch.pizzaleu.android.model.UserModel; /** * Created by cimenmus on 11/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/SharedPrefsHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/SharedPrefsHelper.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/helper/SharedPrefsHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/SharedPrefsHelper.java index 91d246f..82ea609 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/SharedPrefsHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/SharedPrefsHelper.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import android.content.SharedPreferences; @@ -9,12 +9,12 @@ import java.lang.reflect.Type; import java.util.ArrayList; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.model.CategoryModel; -import ch.pizzamaxx.android.model.CheckCouponModel; -import ch.pizzamaxx.android.model.CustomerTokenModel; -import ch.pizzamaxx.android.model.StoreModel; -import ch.pizzamaxx.android.model.UserModel; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.model.CategoryModel; +import ch.pizzaleu.android.model.CheckCouponModel; +import ch.pizzaleu.android.model.CustomerTokenModel; +import ch.pizzaleu.android.model.StoreModel; +import ch.pizzaleu.android.model.UserModel; import static android.content.Context.MODE_PRIVATE; diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/TextHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/TextHelper.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/helper/TextHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/TextHelper.java index e01d185..218cd02 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/TextHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/TextHelper.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import android.text.Html; import android.widget.TextView; diff --git a/app/src/main/java/ch/pizzamaxx/android/helper/ViewHelper.java b/app/src/main/java/ch/pizzaleu/android/helper/ViewHelper.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/helper/ViewHelper.java rename to app/src/main/java/ch/pizzaleu/android/helper/ViewHelper.java index 7880019..6d7eb3f 100644 --- a/app/src/main/java/ch/pizzamaxx/android/helper/ViewHelper.java +++ b/app/src/main/java/ch/pizzaleu/android/helper/ViewHelper.java @@ -1,11 +1,11 @@ -package ch.pizzamaxx.android.helper; +package ch.pizzaleu.android.helper; import android.app.Activity; import android.content.Context; import android.view.View; import android.view.inputmethod.InputMethodManager; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.activity.BaseActivity; /** * Created by cimenmus on 25/06/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/interfaces/CheckBoxChangedListener.java b/app/src/main/java/ch/pizzaleu/android/interfaces/CheckBoxChangedListener.java similarity index 84% rename from app/src/main/java/ch/pizzamaxx/android/interfaces/CheckBoxChangedListener.java rename to app/src/main/java/ch/pizzaleu/android/interfaces/CheckBoxChangedListener.java index 760516c..1ce8b46 100644 --- a/app/src/main/java/ch/pizzamaxx/android/interfaces/CheckBoxChangedListener.java +++ b/app/src/main/java/ch/pizzaleu/android/interfaces/CheckBoxChangedListener.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.interfaces; +package ch.pizzaleu.android.interfaces; import android.support.v7.widget.AppCompatCheckBox; diff --git a/app/src/main/java/ch/pizzamaxx/android/interfaces/DialogButtonClickListener.java b/app/src/main/java/ch/pizzaleu/android/interfaces/DialogButtonClickListener.java similarity index 80% rename from app/src/main/java/ch/pizzamaxx/android/interfaces/DialogButtonClickListener.java rename to app/src/main/java/ch/pizzaleu/android/interfaces/DialogButtonClickListener.java index f90f763..c871fae 100644 --- a/app/src/main/java/ch/pizzamaxx/android/interfaces/DialogButtonClickListener.java +++ b/app/src/main/java/ch/pizzaleu/android/interfaces/DialogButtonClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.interfaces; +package ch.pizzaleu.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzamaxx/android/interfaces/RecyclerItemClickListener.java b/app/src/main/java/ch/pizzaleu/android/interfaces/RecyclerItemClickListener.java similarity index 81% rename from app/src/main/java/ch/pizzamaxx/android/interfaces/RecyclerItemClickListener.java rename to app/src/main/java/ch/pizzaleu/android/interfaces/RecyclerItemClickListener.java index e4d92ee..6edb417 100644 --- a/app/src/main/java/ch/pizzamaxx/android/interfaces/RecyclerItemClickListener.java +++ b/app/src/main/java/ch/pizzaleu/android/interfaces/RecyclerItemClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.interfaces; +package ch.pizzaleu.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/AddNewAddressResponseModel.java b/app/src/main/java/ch/pizzaleu/android/model/AddNewAddressResponseModel.java similarity index 92% rename from app/src/main/java/ch/pizzamaxx/android/model/AddNewAddressResponseModel.java rename to app/src/main/java/ch/pizzaleu/android/model/AddNewAddressResponseModel.java index f679a0c..42c9c87 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/AddNewAddressResponseModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/AddNewAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/AddProductToBasketResponseModel.java b/app/src/main/java/ch/pizzaleu/android/model/AddProductToBasketResponseModel.java similarity index 95% rename from app/src/main/java/ch/pizzamaxx/android/model/AddProductToBasketResponseModel.java rename to app/src/main/java/ch/pizzaleu/android/model/AddProductToBasketResponseModel.java index 6d53c22..dd3a0a5 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/AddProductToBasketResponseModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/AddProductToBasketResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/AddToBasketOptionModel.java b/app/src/main/java/ch/pizzaleu/android/model/AddToBasketOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/model/AddToBasketOptionModel.java rename to app/src/main/java/ch/pizzaleu/android/model/AddToBasketOptionModel.java index 4928838..808eb7b 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/AddToBasketOptionModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/AddToBasketOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/AddressModel.java b/app/src/main/java/ch/pizzaleu/android/model/AddressModel.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/model/AddressModel.java rename to app/src/main/java/ch/pizzaleu/android/model/AddressModel.java index 8922847..6765f1f 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/AddressModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/AddressModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/AppVersionModel.java b/app/src/main/java/ch/pizzaleu/android/model/AppVersionModel.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/model/AppVersionModel.java rename to app/src/main/java/ch/pizzaleu/android/model/AppVersionModel.java index 11bec19..81d01d4 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/AppVersionModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/AppVersionModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/CampaignModel.java b/app/src/main/java/ch/pizzaleu/android/model/CampaignModel.java similarity index 99% rename from app/src/main/java/ch/pizzamaxx/android/model/CampaignModel.java rename to app/src/main/java/ch/pizzaleu/android/model/CampaignModel.java index c52443b..9d68fde 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/CampaignModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CampaignModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/CategoryModel.java b/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/model/CategoryModel.java rename to app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java index fc94c28..fcac9a6 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -6,8 +6,8 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzamaxx.android.api.ApiConstants; -import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzaleu.android.api.ApiConstants; +import ch.pizzaleu.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/CheckCouponModel.java b/app/src/main/java/ch/pizzaleu/android/model/CheckCouponModel.java similarity index 99% rename from app/src/main/java/ch/pizzamaxx/android/model/CheckCouponModel.java rename to app/src/main/java/ch/pizzaleu/android/model/CheckCouponModel.java index 4ab819f..b42472e 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/CheckCouponModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CheckCouponModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/CityModel.java b/app/src/main/java/ch/pizzaleu/android/model/CityModel.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/model/CityModel.java rename to app/src/main/java/ch/pizzaleu/android/model/CityModel.java index 8bcaff1..4561df5 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/CityModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CityModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/CountryModel.java b/app/src/main/java/ch/pizzaleu/android/model/CountryModel.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/model/CountryModel.java rename to app/src/main/java/ch/pizzaleu/android/model/CountryModel.java index a741759..8ea5ad0 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/CountryModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CountryModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/CreateOrderModel.java b/app/src/main/java/ch/pizzaleu/android/model/CreateOrderModel.java similarity index 69% rename from app/src/main/java/ch/pizzamaxx/android/model/CreateOrderModel.java rename to app/src/main/java/ch/pizzaleu/android/model/CreateOrderModel.java index 38b56a9..6201aae 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/CreateOrderModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CreateOrderModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/CustomerTokenModel.java b/app/src/main/java/ch/pizzaleu/android/model/CustomerTokenModel.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/model/CustomerTokenModel.java rename to app/src/main/java/ch/pizzaleu/android/model/CustomerTokenModel.java index f1de809..d2b76f4 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/CustomerTokenModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/CustomerTokenModel.java @@ -1,11 +1,11 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import java.io.Serializable; -import ch.pizzamaxx.android.helper.DateTimeHelper; +import ch.pizzaleu.android.helper.DateTimeHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/DeleteAddressResponseModel.java b/app/src/main/java/ch/pizzaleu/android/model/DeleteAddressResponseModel.java similarity index 88% rename from app/src/main/java/ch/pizzamaxx/android/model/DeleteAddressResponseModel.java rename to app/src/main/java/ch/pizzaleu/android/model/DeleteAddressResponseModel.java index 41599aa..82589f4 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/DeleteAddressResponseModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/DeleteAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodModel.java b/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodModel.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodModel.java rename to app/src/main/java/ch/pizzaleu/android/model/PaymentMethodModel.java index a5740e1..e916305 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import ch.pizzamaxx.android.api.ApiConstants; +import ch.pizzaleu.android.api.ApiConstants; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodsResponseModel.java b/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodsResponseModel.java rename to app/src/main/java/ch/pizzaleu/android/model/PaymentMethodsResponseModel.java index f4ad792..8821f1a 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/PaymentTokenModel.java b/app/src/main/java/ch/pizzaleu/android/model/PaymentTokenModel.java similarity index 85% rename from app/src/main/java/ch/pizzamaxx/android/model/PaymentTokenModel.java rename to app/src/main/java/ch/pizzaleu/android/model/PaymentTokenModel.java index 15ac06a..0e36f6f 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/PaymentTokenModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/PaymentTokenModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; public class PaymentTokenModel { diff --git a/app/src/main/java/ch/pizzamaxx/android/model/RemoveProductFromCartResponseModel.java b/app/src/main/java/ch/pizzaleu/android/model/RemoveProductFromCartResponseModel.java similarity index 91% rename from app/src/main/java/ch/pizzamaxx/android/model/RemoveProductFromCartResponseModel.java rename to app/src/main/java/ch/pizzaleu/android/model/RemoveProductFromCartResponseModel.java index 6984c40..8aafd0e 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/RemoveProductFromCartResponseModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/RemoveProductFromCartResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodModel.java b/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodModel.java rename to app/src/main/java/ch/pizzaleu/android/model/ShippingMethodModel.java index 30b2bfa..80a0992 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodsResponseModel.java b/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodsResponseModel.java rename to app/src/main/java/ch/pizzaleu/android/model/ShippingMethodsResponseModel.java index 88b0fc6..47057d2 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/StoreInfoModel.java b/app/src/main/java/ch/pizzaleu/android/model/StoreInfoModel.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/model/StoreInfoModel.java rename to app/src/main/java/ch/pizzaleu/android/model/StoreInfoModel.java index b05fe27..3fd66ed 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/StoreInfoModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/StoreInfoModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/StoreModel.java b/app/src/main/java/ch/pizzaleu/android/model/StoreModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/StoreModel.java rename to app/src/main/java/ch/pizzaleu/android/model/StoreModel.java index 8467cc1..850d195 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/StoreModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/StoreModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/StoreShiftModel.java b/app/src/main/java/ch/pizzaleu/android/model/StoreShiftModel.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/model/StoreShiftModel.java rename to app/src/main/java/ch/pizzaleu/android/model/StoreShiftModel.java index ce4894e..792d2e9 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/StoreShiftModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/StoreShiftModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java b/app/src/main/java/ch/pizzaleu/android/model/UserModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/UserModel.java rename to app/src/main/java/ch/pizzaleu/android/model/UserModel.java index 30e6f74..92d1329 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/UserModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/ZoneModel.java b/app/src/main/java/ch/pizzaleu/android/model/ZoneModel.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/model/ZoneModel.java rename to app/src/main/java/ch/pizzaleu/android/model/ZoneModel.java index a3282dd..2f402a7 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/ZoneModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/ZoneModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model; +package ch.pizzaleu.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzaleu/android/model/cart/CartInfoModel.java similarity index 95% rename from app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java rename to app/src/main/java/ch/pizzaleu/android/model/cart/CartInfoModel.java index 7509344..9f9a651 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/cart/CartInfoModel.java @@ -1,9 +1,9 @@ -package ch.pizzamaxx.android.model.cart; +package ch.pizzaleu.android.model.cart; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzamaxx.android.api.ApiConstants; +import ch.pizzaleu.android.api.ApiConstants; /** * Created by cimenmus on 05/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductModel.java b/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductModel.java rename to app/src/main/java/ch/pizzaleu/android/model/cart/CartProductModel.java index 249a503..8b31639 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.cart; +package ch.pizzaleu.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductOptionModel.java b/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductOptionModel.java rename to app/src/main/java/ch/pizzaleu/android/model/cart/CartProductOptionModel.java index 3f368ce..374d7b4 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductOptionModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.cart; +package ch.pizzaleu.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java similarity index 93% rename from app/src/main/java/ch/pizzamaxx/android/model/cart/CartTotalModel.java rename to app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java index 6a49e4b..ebc6730 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartTotalModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.cart; +package ch.pizzaleu.android.model.cart; import java.io.Serializable; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryModel.java b/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryModel.java similarity index 99% rename from app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryModel.java rename to app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryModel.java index a5bb219..52b5677 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.history; +package ch.pizzaleu.android.model.history; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzamaxx.android.helper.DateTimeHelper; +import ch.pizzaleu.android.helper.DateTimeHelper; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductModel.java b/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductModel.java rename to app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductModel.java index 6cfed0b..bb3bd96 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.history; +package ch.pizzaleu.android.model.history; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductOptionModel.java b/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductOptionModel.java rename to app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductOptionModel.java index 27753df..74ea5dd 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductOptionModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.history; +package ch.pizzaleu.android.model.history; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductModel.java b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductModel.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductModel.java rename to app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductModel.java index cecaa51..a50c92e 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.menu; +package ch.pizzaleu.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -6,8 +6,8 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionModel.java b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionModel.java rename to app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java index 8489ff3..30dec99 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.menu; +package ch.pizzaleu.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionValueModel.java b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionValueModel.java similarity index 98% rename from app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionValueModel.java rename to app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionValueModel.java index 2c7a05c..c925cab 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionValueModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionValueModel.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.model.menu; +package ch.pizzaleu.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzamaxx/android/view/AppButton.java b/app/src/main/java/ch/pizzaleu/android/view/AppButton.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/view/AppButton.java rename to app/src/main/java/ch/pizzaleu/android/view/AppButton.java index 06f0934..54f7c47 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/AppButton.java +++ b/app/src/main/java/ch/pizzaleu/android/view/AppButton.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -8,7 +8,7 @@ import android.view.View; import android.widget.Button; import android.widget.LinearLayout; -import ch.pizzamaxx.android.R; +import ch.pizzaleu.android.R; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/view/AppDropdown.java b/app/src/main/java/ch/pizzaleu/android/view/AppDropdown.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/view/AppDropdown.java rename to app/src/main/java/ch/pizzaleu/android/view/AppDropdown.java index 2fbc9db..6e025e0 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/AppDropdown.java +++ b/app/src/main/java/ch/pizzaleu/android/view/AppDropdown.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -9,7 +9,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import ch.pizzamaxx.android.R; +import ch.pizzaleu.android.R; /** * Created by cimenmus on 23.10.2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/view/AppDropdownView.java b/app/src/main/java/ch/pizzaleu/android/view/AppDropdownView.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/view/AppDropdownView.java rename to app/src/main/java/ch/pizzaleu/android/view/AppDropdownView.java index ac95f7d..89865fc 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/AppDropdownView.java +++ b/app/src/main/java/ch/pizzaleu/android/view/AppDropdownView.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -9,8 +9,8 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/view/AppEditText.java b/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/view/AppEditText.java rename to app/src/main/java/ch/pizzaleu/android/view/AppEditText.java index abb71da..6430d9e 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/AppEditText.java +++ b/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -16,9 +16,9 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; -import ch.pizzamaxx.android.helper.PasswordHelper; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzaleu.android.helper.PasswordHelper; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/view/AppInfoView.java b/app/src/main/java/ch/pizzaleu/android/view/AppInfoView.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/view/AppInfoView.java rename to app/src/main/java/ch/pizzaleu/android/view/AppInfoView.java index 491fe5c..e8aff2c 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/AppInfoView.java +++ b/app/src/main/java/ch/pizzaleu/android/view/AppInfoView.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -7,7 +7,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import ch.pizzamaxx.android.R; +import ch.pizzaleu.android.R; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/view/AppToolbar.java b/app/src/main/java/ch/pizzaleu/android/view/AppToolbar.java similarity index 97% rename from app/src/main/java/ch/pizzamaxx/android/view/AppToolbar.java rename to app/src/main/java/ch/pizzaleu/android/view/AppToolbar.java index ceaaee0..bb2ff62 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/AppToolbar.java +++ b/app/src/main/java/ch/pizzaleu/android/view/AppToolbar.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.content.Context; import android.content.res.TypedArray; @@ -8,8 +8,8 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import ch.pizzamaxx.android.R; -import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzaleu.android.R; +import ch.pizzaleu.android.activity.BaseActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/view/GridSpacesItemDecoration.java b/app/src/main/java/ch/pizzaleu/android/view/GridSpacesItemDecoration.java similarity index 94% rename from app/src/main/java/ch/pizzamaxx/android/view/GridSpacesItemDecoration.java rename to app/src/main/java/ch/pizzaleu/android/view/GridSpacesItemDecoration.java index 04a5719..2a44be2 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/GridSpacesItemDecoration.java +++ b/app/src/main/java/ch/pizzaleu/android/view/GridSpacesItemDecoration.java @@ -1,10 +1,10 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.graphics.Rect; import android.support.v7.widget.RecyclerView; import android.view.View; -import ch.pizzamaxx.android.helper.DisplayHelper; +import ch.pizzaleu.android.helper.DisplayHelper; /** * Created by cimenmus on 20/09/2017. diff --git a/app/src/main/java/ch/pizzamaxx/android/view/NoSwipeViewPager.java b/app/src/main/java/ch/pizzaleu/android/view/NoSwipeViewPager.java similarity index 96% rename from app/src/main/java/ch/pizzamaxx/android/view/NoSwipeViewPager.java rename to app/src/main/java/ch/pizzaleu/android/view/NoSwipeViewPager.java index 8255bae..f6d440c 100644 --- a/app/src/main/java/ch/pizzamaxx/android/view/NoSwipeViewPager.java +++ b/app/src/main/java/ch/pizzaleu/android/view/NoSwipeViewPager.java @@ -1,4 +1,4 @@ -package ch.pizzamaxx.android.view; +package ch.pizzaleu.android.view; import android.content.Context; import android.support.v4.view.ViewPager; diff --git a/app/src/main/res/drawable-nodpi/pizzamaxx_logo.png b/app/src/main/res/drawable-nodpi/pizzaleu_logo.png similarity index 100% rename from app/src/main/res/drawable-nodpi/pizzamaxx_logo.png rename to app/src/main/res/drawable-nodpi/pizzaleu_logo.png diff --git a/app/src/main/res/drawable/background_button_add_cart.xml b/app/src/main/res/drawable/background_button_add_cart.xml index bd2d034..b6bb0f1 100644 --- a/app/src/main/res/drawable/background_button_add_cart.xml +++ b/app/src/main/res/drawable/background_button_add_cart.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_product_cart_price.xml b/app/src/main/res/drawable/background_product_cart_price.xml index 722d303..2861fdb 100644 --- a/app/src/main/res/drawable/background_product_cart_price.xml +++ b/app/src/main/res/drawable/background_product_cart_price.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/ic_bottom_nav_item_cart_red.xml b/app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml similarity index 93% rename from app/src/main/res/drawable/ic_bottom_nav_item_cart_red.xml rename to app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml index 6c8fd8d..4644566 100644 --- a/app/src/main/res/drawable/ic_bottom_nav_item_cart_red.xml +++ b/app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/ic_bottom_nav_item_cart_white.xml b/app/src/main/res/drawable/ic_bottom_nav_item_cart_yellow.xml similarity index 93% rename from app/src/main/res/drawable/ic_bottom_nav_item_cart_white.xml rename to app/src/main/res/drawable/ic_bottom_nav_item_cart_yellow.xml index 8fb4f91..6e9967e 100644 --- a/app/src/main/res/drawable/ic_bottom_nav_item_cart_white.xml +++ b/app/src/main/res/drawable/ic_bottom_nav_item_cart_yellow.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/pizzaleu_splash_logo.png b/app/src/main/res/drawable/pizzaleu_splash_logo.png new file mode 100644 index 0000000..44a545f Binary files /dev/null and b/app/src/main/res/drawable/pizzaleu_splash_logo.png differ diff --git a/app/src/main/res/drawable/pizzamax_splash_logo.png b/app/src/main/res/drawable/pizzamax_splash_logo.png deleted file mode 100644 index 361837a..0000000 Binary files a/app/src/main/res/drawable/pizzamax_splash_logo.png and /dev/null differ diff --git a/app/src/main/res/drawable/selector_bottom_navigation_item.xml b/app/src/main/res/drawable/selector_bottom_navigation_item.xml index 923ca20..c340d6d 100644 --- a/app/src/main/res/drawable/selector_bottom_navigation_item.xml +++ b/app/src/main/res/drawable/selector_bottom_navigation_item.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml index 46a3148..167379d 100644 --- a/app/src/main/res/layout/activity_add_address.xml +++ b/app/src/main/res/layout/activity_add_address.xml @@ -7,11 +7,11 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white" - tools:context="ch.pizzamaxx.android.activity.AddAddressActivity" + tools:context="ch.pizzaleu.android.activity.AddAddressActivity" android:focusable="true" android:focusableInTouchMode="true"> - - - - - - + tools:context="ch.pizzaleu.android.activity.CampaignProductDetailsActivity"> + tools:context="ch.pizzaleu.android.activity.CampaignProductListActivity"> - + tools:context="ch.pizzaleu.android.activity.CreateOrderActivity"> - + tools:context="ch.pizzaleu.android.activity.CreateOrderActivity"> + tools:context="ch.pizzaleu.android.activity.ForgotPasswordActivity"> - - - - - + tools:context="ch.pizzaleu.android.activity.MainActivity"> - + android:src="@drawable/ic_bottom_nav_item_cart_gray"/> + android:textColor="@color/venus"/> @@ -196,7 +196,7 @@ android:layout_height="64dp" android:background="@drawable/background_button_cart" android:gravity="center" - android:src="@drawable/ic_bottom_nav_item_cart_white" + android:src="@drawable/ic_bottom_nav_item_cart_gray" android:layout_alignParentBottom="true" android:layout_centerInParent="true" android:elevation="9dp" diff --git a/app/src/main/res/layout/activity_my_addresses.xml b/app/src/main/res/layout/activity_my_addresses.xml index d815ee9..e60b912 100644 --- a/app/src/main/res/layout/activity_my_addresses.xml +++ b/app/src/main/res/layout/activity_my_addresses.xml @@ -6,9 +6,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/white" - tools:context="ch.pizzamaxx.android.activity.MyAddressesActivity"> + tools:context="ch.pizzaleu.android.activity.MyAddressesActivity"> - - - - - - - - - - - - - - - - - - - - - - - @@ -50,7 +50,7 @@ android:text="@string/choose_post_code" android:layout_centerInParent="true" android:textSize="12sp" - android:textColor="@color/white"/> + android:textColor="@color/main_black"/> @@ -68,7 +68,7 @@