diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 51a7f4b..fde7dc3 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/modules.xml b/.idea/modules.xml index 104fa2f..b80d3dd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,10 +2,10 @@ - + + - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3349935..e8fb200 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ repositories { android { compileSdkVersion 28 defaultConfig { - applicationId "ch.pizzaleu.android" + applicationId "ch.pizzacucia.android" minSdkVersion 16 targetSdkVersion 28 versionCode 23 // play store'daki version --> canlı: 0 - dahili test: 17 diff --git a/app/src/androidTest/java/ch/pizzaleu/android/ExampleInstrumentedTest.java b/app/src/androidTest/java/ch/pizzacucia/android/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/ch/pizzaleu/android/ExampleInstrumentedTest.java rename to app/src/androidTest/java/ch/pizzacucia/android/ExampleInstrumentedTest.java index 248d814..1d0bd3b 100644 --- a/app/src/androidTest/java/ch/pizzaleu/android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/ch/pizzacucia/android/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android; +package ch.pizzacucia.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 7d20927..be08b92 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="ch.pizzacucia.android"> @@ -31,44 +31,44 @@ - + diff --git a/app/src/main/java/ch/pizzaleu/android/App.java b/app/src/main/java/ch/pizzacucia/android/App.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/App.java rename to app/src/main/java/ch/pizzacucia/android/App.java index 74a184a..63c6f78 100644 --- a/app/src/main/java/ch/pizzaleu/android/App.java +++ b/app/src/main/java/ch/pizzacucia/android/App.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android; +package ch.pizzacucia.android; import android.support.multidex.MultiDexApplication; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/AddAddressActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/AddAddressActivity.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/activity/AddAddressActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/AddAddressActivity.java index 274d81c..93941aa 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/AddAddressActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/AddAddressActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.support.annotation.NonNull; @@ -16,21 +16,21 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -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.helper.ViewHelper; -import ch.pizzaleu.android.model.AddNewAddressResponseModel; -import ch.pizzaleu.android.model.CityModel; -import ch.pizzaleu.android.model.CountryModel; -import ch.pizzaleu.android.model.ZoneModel; -import ch.pizzaleu.android.view.AppDropdownView; -import ch.pizzaleu.android.view.AppEditText; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.ViewHelper; +import ch.pizzacucia.android.model.AddNewAddressResponseModel; +import ch.pizzacucia.android.model.CityModel; +import ch.pizzacucia.android.model.CountryModel; +import ch.pizzacucia.android.model.ZoneModel; +import ch.pizzacucia.android.view.AppDropdownView; +import ch.pizzacucia.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/BaseActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/BaseActivity.java similarity index 92% rename from app/src/main/java/ch/pizzaleu/android/activity/BaseActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/BaseActivity.java index 3d17db8..0db9404 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/BaseActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Context; import android.os.Build; @@ -6,7 +6,7 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import ch.pizzaleu.android.helper.DisplayHelper; +import ch.pizzacucia.android.helper.DisplayHelper; import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; /** diff --git a/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/CampaignProductDetailsActivity.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/CampaignProductDetailsActivity.java index 581422e..46009f3 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/CampaignProductDetailsActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.os.Bundle; import android.support.annotation.NonNull; @@ -21,27 +21,27 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; -import ch.pizzaleu.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; -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.ImageLoadHelper; -import ch.pizzaleu.android.helper.PriceHelper; -import ch.pizzaleu.android.helper.SessionHelper; -import ch.pizzaleu.android.helper.SharedPrefsHelper; -import ch.pizzaleu.android.helper.TextHelper; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.AddProductToBasketResponseModel; -import ch.pizzaleu.android.model.CampaignModel; -import ch.pizzaleu.android.model.cart.CartInfoModel; -import ch.pizzaleu.android.model.menu.MenuProductModel; -import ch.pizzaleu.android.model.menu.MenuProductOptionModel; -import ch.pizzaleu.android.model.menu.MenuProductOptionValueModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; +import ch.pizzacucia.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.ImageLoadHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.helper.TextHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.AddProductToBasketResponseModel; +import ch.pizzacucia.android.model.CampaignModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.model.menu.MenuProductModel; +import ch.pizzacucia.android.model.menu.MenuProductOptionModel; +import ch.pizzacucia.android.model.menu.MenuProductOptionValueModel; import okhttp3.FormBody; import okhttp3.RequestBody; import retrofit2.Call; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductListActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/CampaignProductListActivity.java similarity index 88% rename from app/src/main/java/ch/pizzaleu/android/activity/CampaignProductListActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/CampaignProductListActivity.java index ff46494..715832d 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductListActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/CampaignProductListActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.os.Bundle; @@ -12,18 +12,18 @@ import java.util.Comparator; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -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.CampaignModel; -import ch.pizzaleu.android.model.menu.MenuProductModel; -import ch.pizzaleu.android.view.AppToolbar; -import ch.pizzaleu.android.view.GridSpacesItemDecoration; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.CampaignModel; +import ch.pizzacucia.android.model.menu.MenuProductModel; +import ch.pizzacucia.android.view.AppToolbar; +import ch.pizzacucia.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/CreateOrderActivity.java similarity index 92% rename from app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/CreateOrderActivity.java index 32bef61..47ea721 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/CreateOrderActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.os.Bundle; @@ -6,7 +6,6 @@ import android.support.v4.app.FragmentManager; import android.support.v7.widget.CardView; import android.view.View; import android.webkit.WebView; -import android.widget.FrameLayout; import com.badoualy.stepperindicator.StepperIndicator; import com.braintreepayments.api.dropin.utils.PaymentMethodType; @@ -15,19 +14,19 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.api.ApiConstants; -import ch.pizzaleu.android.fragment.createOrder.CreateOrderNoteFragment; -import ch.pizzaleu.android.fragment.createOrder.CreateOrderResultFragment; -import ch.pizzaleu.android.fragment.createOrder.CreateOrderSummaryFragment; -import ch.pizzaleu.android.fragment.createOrder.PaymentMethodFragment; -import ch.pizzaleu.android.fragment.createOrder.ShippingAddressFragment; -import ch.pizzaleu.android.fragment.createOrder.ShippingMethodFragment; -import ch.pizzaleu.android.helper.SharedPrefsHelper; -import ch.pizzaleu.android.model.AddressModel; -import ch.pizzaleu.android.model.PaymentMethodModel; -import ch.pizzaleu.android.model.ShippingMethodModel; -import ch.pizzaleu.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.fragment.createOrder.CreateOrderNoteFragment; +import ch.pizzacucia.android.fragment.createOrder.CreateOrderResultFragment; +import ch.pizzacucia.android.fragment.createOrder.CreateOrderSummaryFragment; +import ch.pizzacucia.android.fragment.createOrder.PaymentMethodFragment; +import ch.pizzacucia.android.fragment.createOrder.ShippingAddressFragment; +import ch.pizzacucia.android.fragment.createOrder.ShippingMethodFragment; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.model.AddressModel; +import ch.pizzacucia.android.model.PaymentMethodModel; +import ch.pizzacucia.android.model.ShippingMethodModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; public class CreateOrderActivity extends BaseActivity { diff --git a/app/src/main/java/ch/pizzaleu/android/activity/ForgotPasswordActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/ForgotPasswordActivity.java similarity index 88% rename from app/src/main/java/ch/pizzaleu/android/activity/ForgotPasswordActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/ForgotPasswordActivity.java index 5f967ea..24db3e1 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/ForgotPasswordActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/ForgotPasswordActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.support.annotation.NonNull; @@ -12,14 +12,14 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -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.helper.ViewHelper; -import ch.pizzaleu.android.view.AppEditText; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.ViewHelper; +import ch.pizzacucia.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/LoginActivity.java similarity index 89% rename from app/src/main/java/ch/pizzaleu/android/activity/LoginActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/LoginActivity.java index d74732f..61cf647 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/LoginActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/LoginActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.os.Bundle; @@ -12,21 +12,21 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -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.helper.ViewHelper; -import ch.pizzaleu.android.model.CustomerTokenModel; -import ch.pizzaleu.android.model.UserModel; -import ch.pizzaleu.android.model.cart.CartInfoModel; -import ch.pizzaleu.android.view.AppEditText; -import ch.pizzaleu.android.view.AppToolbar; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.helper.ViewHelper; +import ch.pizzacucia.android.model.CustomerTokenModel; +import ch.pizzacucia.android.model.UserModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.view.AppEditText; +import ch.pizzacucia.android.view.AppToolbar; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java index e04f9cf..ef50c72 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -28,21 +28,20 @@ import butterknife.BindColor; import butterknife.BindDrawable; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.adapter.recycler.NavigationMenuRecyclerAdapter; -import ch.pizzaleu.android.api.ApiConstants; -import ch.pizzaleu.android.fragment.CartFragment; -import ch.pizzaleu.android.fragment.OrderHistoryFragment; -import ch.pizzaleu.android.fragment.StoreInfoFragment; -import ch.pizzaleu.android.fragment.MenuFragment; -import ch.pizzaleu.android.fragment.ProductFragment; -import ch.pizzaleu.android.fragment.ProfileFragment; -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.CategoryModel; -import ch.pizzaleu.android.view.AppToolbar; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.adapter.recycler.NavigationMenuRecyclerAdapter; +import ch.pizzacucia.android.fragment.CartFragment; +import ch.pizzacucia.android.fragment.OrderHistoryFragment; +import ch.pizzacucia.android.fragment.StoreInfoFragment; +import ch.pizzacucia.android.fragment.MenuFragment; +import ch.pizzacucia.android.fragment.ProductFragment; +import ch.pizzacucia.android.fragment.ProfileFragment; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.model.CategoryModel; +import ch.pizzacucia.android.view.AppToolbar; import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters; import io.github.luizgrp.sectionedrecyclerviewadapter.SectionedRecyclerViewAdapter; import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/MyAddressesActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/MyAddressesActivity.java similarity index 90% rename from app/src/main/java/ch/pizzaleu/android/activity/MyAddressesActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/MyAddressesActivity.java index f826b76..b74a506 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/MyAddressesActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/MyAddressesActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.support.annotation.NonNull; @@ -17,18 +17,18 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.adapter.recycler.MyAddressesRecyclerAdapter; -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.AddressModel; -import ch.pizzaleu.android.model.DeleteAddressResponseModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.adapter.recycler.MyAddressesRecyclerAdapter; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.AddressModel; +import ch.pizzacucia.android.model.DeleteAddressResponseModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/OrderHistoryDetailsActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/OrderHistoryDetailsActivity.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/activity/OrderHistoryDetailsActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/OrderHistoryDetailsActivity.java index 8b62cd2..6952b67 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/OrderHistoryDetailsActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/OrderHistoryDetailsActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.os.Bundle; @@ -11,20 +11,20 @@ import java.util.HashMap; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -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.TextHelper; -import ch.pizzaleu.android.model.history.OrderHistoryModel; -import ch.pizzaleu.android.model.history.OrderHistoryProductModel; -import ch.pizzaleu.android.model.history.OrderHistoryProductOptionModel; -import ch.pizzaleu.android.view.AppInfoView; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.TextHelper; +import ch.pizzacucia.android.model.history.OrderHistoryModel; +import ch.pizzacucia.android.model.history.OrderHistoryProductModel; +import ch.pizzacucia.android.model.history.OrderHistoryProductOptionModel; +import ch.pizzacucia.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/ProductDetailsActivity.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/ProductDetailsActivity.java index 820ef27..19b0951 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/ProductDetailsActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.os.Bundle; import android.support.annotation.NonNull; @@ -21,27 +21,27 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; -import ch.pizzaleu.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; -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.ImageLoadHelper; -import ch.pizzaleu.android.helper.PriceHelper; -import ch.pizzaleu.android.helper.SessionHelper; -import ch.pizzaleu.android.helper.SharedPrefsHelper; -import ch.pizzaleu.android.helper.TextHelper; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.AddProductToBasketResponseModel; -import ch.pizzaleu.android.model.CampaignModel; -import ch.pizzaleu.android.model.cart.CartInfoModel; -import ch.pizzaleu.android.model.menu.MenuProductModel; -import ch.pizzaleu.android.model.menu.MenuProductOptionModel; -import ch.pizzaleu.android.model.menu.MenuProductOptionValueModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; +import ch.pizzacucia.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.ImageLoadHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.helper.TextHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.AddProductToBasketResponseModel; +import ch.pizzacucia.android.model.CampaignModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.model.menu.MenuProductModel; +import ch.pizzacucia.android.model.menu.MenuProductOptionModel; +import ch.pizzacucia.android.model.menu.MenuProductOptionValueModel; import okhttp3.FormBody; import okhttp3.RequestBody; import retrofit2.Call; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/RegisterActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/RegisterActivity.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/activity/RegisterActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/RegisterActivity.java index f36fa70..fd75bf2 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/RegisterActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/RegisterActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.os.Bundle; @@ -17,22 +17,22 @@ import butterknife.BindView; import butterknife.BindViews; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -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.helper.SharedPrefsHelper; -import ch.pizzaleu.android.helper.ViewHelper; -import ch.pizzaleu.android.model.CityModel; -import ch.pizzaleu.android.model.CountryModel; -import ch.pizzaleu.android.model.CustomerTokenModel; -import ch.pizzaleu.android.model.UserModel; -import ch.pizzaleu.android.model.ZoneModel; -import ch.pizzaleu.android.view.AppDropdownView; -import ch.pizzaleu.android.view.AppEditText; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.helper.ViewHelper; +import ch.pizzacucia.android.model.CityModel; +import ch.pizzacucia.android.model.CountryModel; +import ch.pizzacucia.android.model.CustomerTokenModel; +import ch.pizzacucia.android.model.UserModel; +import ch.pizzacucia.android.model.ZoneModel; +import ch.pizzacucia.android.view.AppDropdownView; +import ch.pizzacucia.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/SplashActivity.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/SplashActivity.java index fe452f0..a48c8ba 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/SplashActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.content.Intent; import android.content.pm.PackageInfo; @@ -21,24 +21,24 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.adapter.pager.CampaignBannerPagerAdapter; -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.ResponseArray; -import ch.pizzaleu.android.api.ResponseObject; -import ch.pizzaleu.android.helper.DialogHelper; -import ch.pizzaleu.android.helper.NetworkHelper; -import ch.pizzaleu.android.helper.PriceHelper; -import ch.pizzaleu.android.helper.SessionHelper; -import ch.pizzaleu.android.helper.SharedPrefsHelper; -import ch.pizzaleu.android.model.AppVersionModel; -import ch.pizzaleu.android.model.CampaignBannerModel; -import ch.pizzaleu.android.model.CategoryModel; -import ch.pizzaleu.android.model.StoreModel; -import ch.pizzaleu.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.adapter.pager.CampaignBannerPagerAdapter; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.NetworkHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.model.AppVersionModel; +import ch.pizzacucia.android.model.CampaignBannerModel; +import ch.pizzacucia.android.model.CategoryModel; +import ch.pizzacucia.android.model.StoreModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; import me.relex.circleindicator.CircleIndicator; import retrofit2.Call; import retrofit2.Callback; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/UpdatePasswordActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/UpdatePasswordActivity.java similarity index 88% rename from app/src/main/java/ch/pizzaleu/android/activity/UpdatePasswordActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/UpdatePasswordActivity.java index 2791603..b473191 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/UpdatePasswordActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/UpdatePasswordActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.os.Bundle; import android.widget.Button; @@ -9,15 +9,15 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -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.helper.ViewHelper; -import ch.pizzaleu.android.view.AppEditText; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.ViewHelper; +import ch.pizzacucia.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/activity/UpdateProfileActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/UpdateProfileActivity.java similarity index 90% rename from app/src/main/java/ch/pizzaleu/android/activity/UpdateProfileActivity.java rename to app/src/main/java/ch/pizzacucia/android/activity/UpdateProfileActivity.java index f9dab29..abfdec0 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/UpdateProfileActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/UpdateProfileActivity.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.activity; +package ch.pizzacucia.android.activity; import android.support.annotation.NonNull; import android.os.Bundle; @@ -13,15 +13,15 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -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.model.UserModel; -import ch.pizzaleu.android.view.AppEditText; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.model.UserModel; +import ch.pizzacucia.android.view.AppEditText; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/pager/CampaignBannerPagerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/pager/CampaignBannerPagerAdapter.java similarity index 83% rename from app/src/main/java/ch/pizzaleu/android/adapter/pager/CampaignBannerPagerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/pager/CampaignBannerPagerAdapter.java index 7866df3..30bb45d 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/pager/CampaignBannerPagerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/pager/CampaignBannerPagerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.pager; +package ch.pizzacucia.android.adapter.pager; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -6,8 +6,8 @@ import android.support.v4.app.FragmentPagerAdapter; import java.util.ArrayList; -import ch.pizzaleu.android.fragment.CampaignBannerFragment; -import ch.pizzaleu.android.model.CampaignBannerModel; +import ch.pizzacucia.android.fragment.CampaignBannerFragment; +import ch.pizzacucia.android.model.CampaignBannerModel; public class CampaignBannerPagerAdapter extends FragmentPagerAdapter { diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/pager/OrderPagerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/pager/OrderPagerAdapter.java similarity index 73% rename from app/src/main/java/ch/pizzaleu/android/adapter/pager/OrderPagerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/pager/OrderPagerAdapter.java index 14b9ece..037b982 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/pager/OrderPagerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/pager/OrderPagerAdapter.java @@ -1,14 +1,14 @@ -package ch.pizzaleu.android.adapter.pager; +package ch.pizzacucia.android.adapter.pager; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; -import ch.pizzaleu.android.fragment.createOrder.CreateOrderResultFragment; -import ch.pizzaleu.android.fragment.createOrder.CreateOrderSummaryFragment; -import ch.pizzaleu.android.fragment.createOrder.PaymentMethodFragment; -import ch.pizzaleu.android.fragment.createOrder.ShippingAddressFragment; -import ch.pizzaleu.android.fragment.createOrder.ShippingMethodFragment; +import ch.pizzacucia.android.fragment.createOrder.CreateOrderResultFragment; +import ch.pizzacucia.android.fragment.createOrder.CreateOrderSummaryFragment; +import ch.pizzacucia.android.fragment.createOrder.PaymentMethodFragment; +import ch.pizzacucia.android.fragment.createOrder.ShippingAddressFragment; +import ch.pizzacucia.android.fragment.createOrder.ShippingMethodFragment; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/CartRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/CartRecyclerAdapter.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/CartRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/CartRecyclerAdapter.java index ac38951..00ded14 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/CartRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/CartRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -11,11 +11,11 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.helper.PriceHelper; -import ch.pizzaleu.android.helper.TextHelper; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.cart.CartProductModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.TextHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.cart.CartProductModel; /** * Created by cimenmus on 05/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/MenuProductRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/MenuProductRecyclerAdapter.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/MenuProductRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/MenuProductRecyclerAdapter.java index 392fbe8..e2fcedf 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/MenuProductRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/MenuProductRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -12,12 +12,12 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.helper.ImageLoadHelper; -import ch.pizzaleu.android.helper.PriceHelper; -import ch.pizzaleu.android.helper.TextHelper; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.menu.MenuProductModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.helper.ImageLoadHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.TextHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.menu.MenuProductModel; /** * Created by cimenmus on 20/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/MyAddressesRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/MyAddressesRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/MyAddressesRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/MyAddressesRecyclerAdapter.java index 5ade1a6..1aaef57 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/MyAddressesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/MyAddressesRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -11,9 +11,9 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.AddressModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.AddressModel; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/NavigationMenuRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/NavigationMenuRecyclerAdapter.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/NavigationMenuRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/NavigationMenuRecyclerAdapter.java index 1ae04ba..70064d3 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/NavigationMenuRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/NavigationMenuRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -10,10 +10,10 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.CategoryModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.CategoryModel; /** * Created by cimenmus on 02/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/OrderHistoryRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/OrderHistoryRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/OrderHistoryRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/OrderHistoryRecyclerAdapter.java index 98aa9dc..d99e795 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/OrderHistoryRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/OrderHistoryRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -10,10 +10,10 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.helper.PriceHelper; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.history.OrderHistoryModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.history.OrderHistoryModel; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/OrderPriceRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/OrderPriceRecyclerAdapter.java similarity index 89% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/OrderPriceRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/OrderPriceRecyclerAdapter.java index 3eb56bf..b0c924f 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/OrderPriceRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/OrderPriceRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.android.adapter.recycler; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -10,9 +10,9 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; -import ch.pizzaleu.android.model.cart.CartTotalModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.model.cart.CartTotalModel; public class OrderPriceRecyclerAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java index 8b00658..5a58b9e 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.PaymentMethodModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.PaymentMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java similarity index 90% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java index 2f3ab12..4caacc2 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.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.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; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java similarity index 92% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java index 6cd7e10..d231633 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.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.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; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.TextHelper; +import ch.pizzacucia.android.model.cart.CartProductModel; public class ProductOnOrderSummaryRecyclerAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java similarity index 90% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java index fbc0421..30023a1 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.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.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; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java index e8dd596..9c4b7d1 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.AddressModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.AddressModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java index b4bcd88..9738806 100644 --- a/app/src/main/java/ch/pizzaleu/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.adapter.recycler; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.helper.PriceHelper; -import ch.pizzaleu.android.interfaces.RecyclerItemClickListener; -import ch.pizzaleu.android.model.ShippingMethodModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.ShippingMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java b/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java rename to app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java index 4814cd0..a6e1609 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; public class ApiConstants { public static final int API_READ_TIMEOUT = 30; @@ -44,10 +44,10 @@ public class ApiConstants { public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed"; public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true"; - public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://pizza-leu.ch/pizzaleu/index.php?route=mobile/service/postFinancePayment&order_id="; + public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://pizza-cucina.ch/pizzacucina/index.php?route=mobile/service/postFinancePayment&order_id="; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_SUCCESS = "postFinancePaymentIsSuccess"; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_FAIL = "postFinancePaymentIsFailed"; - public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.pizza-leu.ch/"; - public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.pizza-leu.ch/"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.pizza-cucina.ch/"; + public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.pizza-cucina.ch/"; } diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzacucia/android/api/ApiEndPoints.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java rename to app/src/main/java/ch/pizzacucia/android/api/ApiEndPoints.java index 82ddbe2..ffab73c 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ApiEndPoints.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; public class ApiEndPoints { @@ -6,7 +6,7 @@ public class ApiEndPoints { private static final String SUFFIX = "&is_mobile=1"; public static final String API_GET_STORE_LIST = "pizza/servicemagazabelirle.php"; - public static final String API_GET_CAMPAIGN_BANNERS = "pizzaleu/" + PREFIX + "getCampaignBanners" + SUFFIX; + public static final String API_GET_CAMPAIGN_BANNERS = "pizzacucia/" + PREFIX + "getCampaignBanners" + SUFFIX; public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX; public static final String API_GET_IGNORED_CATEGORY_IDS= PREFIX + "getIgnoredCategory" + SUFFIX; diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiError.java b/app/src/main/java/ch/pizzacucia/android/api/ApiError.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/api/ApiError.java rename to app/src/main/java/ch/pizzacucia/android/api/ApiError.java index bf851e8..c027de8 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiError.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ApiError.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; public class ApiError { diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiErrorUtils.java b/app/src/main/java/ch/pizzacucia/android/api/ApiErrorUtils.java similarity index 90% rename from app/src/main/java/ch/pizzaleu/android/api/ApiErrorUtils.java rename to app/src/main/java/ch/pizzacucia/android/api/ApiErrorUtils.java index 7a74461..ddeba11 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiErrorUtils.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ApiErrorUtils.java @@ -1,14 +1,14 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; import android.content.Intent; import java.lang.annotation.Annotation; -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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.LoginActivity; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; import okhttp3.ResponseBody; import retrofit2.Converter; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java b/app/src/main/java/ch/pizzacucia/android/api/ApiInterface.java similarity index 92% rename from app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java rename to app/src/main/java/ch/pizzacucia/android/api/ApiInterface.java index 5f75cf2..03a03cb 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ApiInterface.java @@ -1,31 +1,31 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; import java.util.HashMap; -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.CampaignBannerModel; -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 ch.pizzacucia.android.model.AddNewAddressResponseModel; +import ch.pizzacucia.android.model.AddProductToBasketResponseModel; +import ch.pizzacucia.android.model.AddressModel; +import ch.pizzacucia.android.model.AppVersionModel; +import ch.pizzacucia.android.model.CampaignBannerModel; +import ch.pizzacucia.android.model.CampaignModel; +import ch.pizzacucia.android.model.CheckCouponModel; +import ch.pizzacucia.android.model.CountryModel; +import ch.pizzacucia.android.model.DeleteAddressResponseModel; +import ch.pizzacucia.android.model.PaymentMethodsResponseModel; +import ch.pizzacucia.android.model.PaymentTokenModel; +import ch.pizzacucia.android.model.RemoveProductFromCartResponseModel; +import ch.pizzacucia.android.model.ShippingMethodModel; +import ch.pizzacucia.android.model.StoreInfoModel; +import ch.pizzacucia.android.model.CityModel; +import ch.pizzacucia.android.model.StoreModel; +import ch.pizzacucia.android.model.StoreShiftModel; +import ch.pizzacucia.android.model.ZoneModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.model.CategoryModel; +import ch.pizzacucia.android.model.history.OrderHistoryModel; +import ch.pizzacucia.android.model.UserModel; +import ch.pizzacucia.android.model.history.OrderHistoryProductModel; +import ch.pizzacucia.android.model.menu.MenuProductModel; import okhttp3.RequestBody; import retrofit2.Call; import retrofit2.http.Body; diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiService.java b/app/src/main/java/ch/pizzacucia/android/api/ApiService.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/api/ApiService.java rename to app/src/main/java/ch/pizzacucia/android/api/ApiService.java index 1e1ea10..41de68c 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiService.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ApiService.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -6,7 +6,7 @@ import com.google.gson.GsonBuilder; import java.io.IOException; import java.util.concurrent.TimeUnit; -import ch.pizzaleu.android.BuildConfig; +import ch.pizzacucia.android.BuildConfig; import okhttp3.Interceptor; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/app/src/main/java/ch/pizzaleu/android/api/BaseResponse.java b/app/src/main/java/ch/pizzacucia/android/api/BaseResponse.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/api/BaseResponse.java rename to app/src/main/java/ch/pizzacucia/android/api/BaseResponse.java index fb49140..6ff6db9 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/BaseResponse.java +++ b/app/src/main/java/ch/pizzacucia/android/api/BaseResponse.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/api/ResponseArray.java b/app/src/main/java/ch/pizzacucia/android/api/ResponseArray.java similarity index 91% rename from app/src/main/java/ch/pizzaleu/android/api/ResponseArray.java rename to app/src/main/java/ch/pizzacucia/android/api/ResponseArray.java index 6c64072..c79e0b0 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ResponseArray.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ResponseArray.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/api/ResponseObject.java b/app/src/main/java/ch/pizzacucia/android/api/ResponseObject.java similarity index 89% rename from app/src/main/java/ch/pizzaleu/android/api/ResponseObject.java rename to app/src/main/java/ch/pizzacucia/android/api/ResponseObject.java index 40180a9..44deed4 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ResponseObject.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ResponseObject.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.api; +package ch.pizzacucia.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/BaseFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/BaseFragment.java similarity index 75% rename from app/src/main/java/ch/pizzaleu/android/fragment/BaseFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/BaseFragment.java index e2821bd..992f554 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/BaseFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/BaseFragment.java @@ -1,9 +1,9 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.android.fragment; import android.support.v4.app.Fragment; -import ch.pizzaleu.android.activity.BaseActivity; -import ch.pizzaleu.android.activity.MainActivity; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.MainActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/CampaignBannerFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/CampaignBannerFragment.java similarity index 90% rename from app/src/main/java/ch/pizzaleu/android/fragment/CampaignBannerFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/CampaignBannerFragment.java index 631bd6c..994f9a9 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/CampaignBannerFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/CampaignBannerFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.android.fragment; import android.os.Bundle; import android.support.v7.widget.AppCompatImageView; @@ -8,9 +8,9 @@ import android.view.ViewGroup; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.helper.ImageLoadHelper; -import ch.pizzaleu.android.model.CampaignBannerModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.helper.ImageLoadHelper; +import ch.pizzacucia.android.model.CampaignBannerModel; public class CampaignBannerFragment extends BaseFragment { diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/CartFragment.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/fragment/CartFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/CartFragment.java index d1ac547..af613cc 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/CartFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.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.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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.CampaignProductListActivity; +import ch.pizzacucia.android.activity.CreateOrderActivity; +import ch.pizzacucia.android.activity.MainActivity; +import ch.pizzacucia.android.adapter.recycler.CartRecyclerAdapter; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.CampaignModel; +import ch.pizzacucia.android.model.RemoveProductFromCartResponseModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.model.cart.CartProductModel; +import ch.pizzacucia.android.model.menu.MenuProductModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/MenuFragment.java similarity index 87% rename from app/src/main/java/ch/pizzaleu/android/fragment/MenuFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/MenuFragment.java index 5b25f1d..d164f5d 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/MenuFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/MenuFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.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.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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.MainActivity; +import ch.pizzacucia.android.activity.ProductDetailsActivity; +import ch.pizzacucia.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.CategoryModel; +import ch.pizzacucia.android.model.menu.MenuProductModel; +import ch.pizzacucia.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/OrderHistoryFragment.java similarity index 91% rename from app/src/main/java/ch/pizzaleu/android/fragment/OrderHistoryFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/OrderHistoryFragment.java index 34070c2..4ad8c86 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/OrderHistoryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.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.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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.MainActivity; +import ch.pizzacucia.android.activity.OrderHistoryDetailsActivity; +import ch.pizzacucia.android.adapter.recycler.OrderHistoryRecyclerAdapter; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.history.OrderHistoryModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/ProductFragment.java similarity index 87% rename from app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/ProductFragment.java index 243e9a7..b949cb5 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/ProductFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -13,21 +13,20 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.MainActivity; +import ch.pizzacucia.android.activity.ProductDetailsActivity; +import ch.pizzacucia.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.CategoryModel; +import ch.pizzacucia.android.model.menu.MenuProductModel; +import ch.pizzacucia.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/ProfileFragment.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/fragment/ProfileFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/ProfileFragment.java index 117cfe9..7ea08ba 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/ProfileFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.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.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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.MyAddressesActivity; +import ch.pizzacucia.android.activity.SplashActivity; +import ch.pizzacucia.android.activity.UpdatePasswordActivity; +import ch.pizzacucia.android.activity.UpdateProfileActivity; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.NetworkHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.model.UserModel; +import ch.pizzacucia.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/StoreInfoFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/StoreInfoFragment.java similarity index 92% rename from app/src/main/java/ch/pizzaleu/android/fragment/StoreInfoFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/StoreInfoFragment.java index a470353..326de11 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/StoreInfoFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/StoreInfoFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment; +package ch.pizzacucia.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.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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.model.StoreInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderBaseFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderBaseFragment.java similarity index 68% rename from app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderBaseFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderBaseFragment.java index 101dd6b..c4b1dc8 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderBaseFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderBaseFragment.java @@ -1,10 +1,10 @@ -package ch.pizzaleu.android.fragment.createOrder; +package ch.pizzacucia.android.fragment.createOrder; import android.widget.TextView; import butterknife.BindView; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.fragment.BaseFragment; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.fragment.BaseFragment; /** * Created by cimenmus on 21.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderNoteFragment.java similarity index 92% rename from app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderNoteFragment.java index 1d2332b..9ef33c6 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderNoteFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment.createOrder; +package ch.pizzacucia.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.AppCompatRadioButton; @@ -12,13 +12,13 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; -import ch.pizzaleu.android.activity.CreateOrderActivity; -import ch.pizzaleu.android.api.ApiConstants; -import ch.pizzaleu.android.helper.SharedPrefsHelper; -import ch.pizzaleu.android.model.cart.CartProductModel; -import ch.pizzaleu.android.view.AppEditText; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.CreateOrderActivity; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.model.cart.CartProductModel; +import ch.pizzacucia.android.view.AppEditText; /** * Created by cimenmus on 28.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderResultFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderResultFragment.java similarity index 83% rename from app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderResultFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderResultFragment.java index faecfb3..8992cb6 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderResultFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderResultFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment.createOrder; +package ch.pizzacucia.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.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; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.CreateOrderActivity; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderSummaryFragment.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderSummaryFragment.java index b41b4b1..fb1b611 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment.createOrder; +package ch.pizzacucia.android.fragment.createOrder; import android.app.Activity; import android.content.Intent; @@ -39,27 +39,27 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.CreateOrderActivity; +import ch.pizzacucia.android.adapter.recycler.OrderPriceRecyclerAdapter; +import ch.pizzacucia.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.model.PaymentMethodModel; +import ch.pizzacucia.android.model.PaymentTokenModel; +import ch.pizzacucia.android.model.StoreShiftModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; +import ch.pizzacucia.android.model.cart.CartProductModel; +import ch.pizzacucia.android.model.cart.CartTotalModel; +import ch.pizzacucia.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/PaymentMethodFragment.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/createOrder/PaymentMethodFragment.java index e052ca3..165f645 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/PaymentMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment.createOrder; +package ch.pizzacucia.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.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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.CreateOrderActivity; +import ch.pizzacucia.android.adapter.recycler.PaymentMethodsRecyclerAdapter; +import ch.pizzacucia.android.api.ApiEndPoints; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseObject; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.CheckCouponModel; +import ch.pizzacucia.android.model.PaymentMethodModel; +import ch.pizzacucia.android.model.PaymentMethodsResponseModel; +import ch.pizzacucia.android.model.cart.CartInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingAddressFragment.java similarity index 91% rename from app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingAddressFragment.java index 2dbb01a..c3e0eaa 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingAddressFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment.createOrder; +package ch.pizzacucia.android.fragment.createOrder; import android.content.Intent; import android.os.Bundle; @@ -17,19 +17,19 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -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.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.AddressModel; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.AddAddressActivity; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.CreateOrderActivity; +import ch.pizzacucia.android.adapter.recycler.ShippingAddressesRecyclerAdapter; +import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.AddressModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingMethodFragment.java similarity index 89% rename from app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingMethodFragment.java rename to app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingMethodFragment.java index 5addd40..ce06c51 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.fragment.createOrder; +package ch.pizzacucia.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.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 ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.CreateOrderActivity; +import ch.pizzacucia.android.adapter.recycler.ShippingMethodsRecyclerAdapter; +import ch.pizzacucia.android.api.ApiErrorUtils; +import ch.pizzacucia.android.api.ApiService; +import ch.pizzacucia.android.api.ResponseArray; +import ch.pizzacucia.android.helper.DialogHelper; +import ch.pizzacucia.android.helper.PriceHelper; +import ch.pizzacucia.android.helper.SessionHelper; +import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucia.android.model.ShippingMethodModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzaleu/android/helper/DateTimeHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/DateTimeHelper.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/helper/DateTimeHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/DateTimeHelper.java index 98aa683..43992f8 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/DateTimeHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/DateTimeHelper.java @@ -1,11 +1,11 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/DialogHelper.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/helper/DialogHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/DialogHelper.java index 5254103..5515c18 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/DialogHelper.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; -import ch.pizzaleu.android.activity.LoginActivity; -import ch.pizzaleu.android.activity.RegisterActivity; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.LoginActivity; +import ch.pizzacucia.android.activity.RegisterActivity; public class DialogHelper { @@ -264,7 +264,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.pizzaleu.android")); + intent.setData(Uri.parse("market://details?id=ch.pizzacucia.android")); BaseActivity.currentActivity.startActivity(intent); BaseActivity.currentActivity.finishAffinity(); } diff --git a/app/src/main/java/ch/pizzaleu/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/DisplayHelper.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/helper/DisplayHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/DisplayHelper.java index fda7fb4..c611515 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/DisplayHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/DisplayHelper.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; public class DisplayHelper { diff --git a/app/src/main/java/ch/pizzaleu/android/helper/ImageLoadHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/ImageLoadHelper.java similarity index 86% rename from app/src/main/java/ch/pizzaleu/android/helper/ImageLoadHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/ImageLoadHelper.java index 66c3f9a..d0ca5f9 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/ImageLoadHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/ImageLoadHelper.java @@ -1,9 +1,9 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import android.widget.ImageView; import com.squareup.picasso.Picasso; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.BaseActivity; public class ImageLoadHelper { diff --git a/app/src/main/java/ch/pizzaleu/android/helper/NetworkHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/NetworkHelper.java similarity index 88% rename from app/src/main/java/ch/pizzaleu/android/helper/NetworkHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/NetworkHelper.java index ca1f36b..c789c3e 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/NetworkHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/NetworkHelper.java @@ -1,9 +1,9 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.BaseActivity; public class NetworkHelper { diff --git a/app/src/main/java/ch/pizzaleu/android/helper/PasswordHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/PasswordHelper.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/helper/PasswordHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/PasswordHelper.java index b6f21c5..730225d 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/PasswordHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/PasswordHelper.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import java.util.regex.Pattern; diff --git a/app/src/main/java/ch/pizzaleu/android/helper/PriceHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/PriceHelper.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/helper/PriceHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/PriceHelper.java index b8fcf21..f71bc0c 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/PriceHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/PriceHelper.java @@ -1,11 +1,11 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import java.util.ArrayList; -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; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.model.menu.MenuProductModel; +import ch.pizzacucia.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 12/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/SessionHelper.java similarity index 92% rename from app/src/main/java/ch/pizzaleu/android/helper/SessionHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/SessionHelper.java index 243d1f2..fb2a75c 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/SessionHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/SessionHelper.java @@ -1,14 +1,14 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -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 ch.pizzacucia.android.model.CheckCouponModel; +import ch.pizzacucia.android.model.CustomerTokenModel; +import ch.pizzacucia.android.model.StoreModel; +import ch.pizzacucia.android.model.UserModel; /** * Created by cimenmus on 11/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/helper/SharedPrefsHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/SharedPrefsHelper.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/helper/SharedPrefsHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/SharedPrefsHelper.java index 82ea609..ba56ea8 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/SharedPrefsHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/SharedPrefsHelper.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import android.content.SharedPreferences; @@ -9,12 +9,12 @@ import java.lang.reflect.Type; import java.util.ArrayList; -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 ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.model.CategoryModel; +import ch.pizzacucia.android.model.CheckCouponModel; +import ch.pizzacucia.android.model.CustomerTokenModel; +import ch.pizzacucia.android.model.StoreModel; +import ch.pizzacucia.android.model.UserModel; import static android.content.Context.MODE_PRIVATE; diff --git a/app/src/main/java/ch/pizzaleu/android/helper/TextHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/TextHelper.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/helper/TextHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/TextHelper.java index 218cd02..3435bc6 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/TextHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/TextHelper.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import android.text.Html; import android.widget.TextView; diff --git a/app/src/main/java/ch/pizzaleu/android/helper/ViewHelper.java b/app/src/main/java/ch/pizzacucia/android/helper/ViewHelper.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/helper/ViewHelper.java rename to app/src/main/java/ch/pizzacucia/android/helper/ViewHelper.java index 6d7eb3f..4e084b5 100644 --- a/app/src/main/java/ch/pizzaleu/android/helper/ViewHelper.java +++ b/app/src/main/java/ch/pizzacucia/android/helper/ViewHelper.java @@ -1,11 +1,11 @@ -package ch.pizzaleu.android.helper; +package ch.pizzacucia.android.helper; import android.app.Activity; import android.content.Context; import android.view.View; import android.view.inputmethod.InputMethodManager; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.activity.BaseActivity; /** * Created by cimenmus on 25/06/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/interfaces/CheckBoxChangedListener.java b/app/src/main/java/ch/pizzacucia/android/interfaces/CheckBoxChangedListener.java similarity index 84% rename from app/src/main/java/ch/pizzaleu/android/interfaces/CheckBoxChangedListener.java rename to app/src/main/java/ch/pizzacucia/android/interfaces/CheckBoxChangedListener.java index 1ce8b46..546daf6 100644 --- a/app/src/main/java/ch/pizzaleu/android/interfaces/CheckBoxChangedListener.java +++ b/app/src/main/java/ch/pizzacucia/android/interfaces/CheckBoxChangedListener.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.interfaces; +package ch.pizzacucia.android.interfaces; import android.support.v7.widget.AppCompatCheckBox; diff --git a/app/src/main/java/ch/pizzaleu/android/interfaces/DialogButtonClickListener.java b/app/src/main/java/ch/pizzacucia/android/interfaces/DialogButtonClickListener.java similarity index 79% rename from app/src/main/java/ch/pizzaleu/android/interfaces/DialogButtonClickListener.java rename to app/src/main/java/ch/pizzacucia/android/interfaces/DialogButtonClickListener.java index c871fae..faa8091 100644 --- a/app/src/main/java/ch/pizzaleu/android/interfaces/DialogButtonClickListener.java +++ b/app/src/main/java/ch/pizzacucia/android/interfaces/DialogButtonClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.interfaces; +package ch.pizzacucia.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzaleu/android/interfaces/RecyclerItemClickListener.java b/app/src/main/java/ch/pizzacucia/android/interfaces/RecyclerItemClickListener.java similarity index 80% rename from app/src/main/java/ch/pizzaleu/android/interfaces/RecyclerItemClickListener.java rename to app/src/main/java/ch/pizzacucia/android/interfaces/RecyclerItemClickListener.java index 6edb417..6c23d48 100644 --- a/app/src/main/java/ch/pizzaleu/android/interfaces/RecyclerItemClickListener.java +++ b/app/src/main/java/ch/pizzacucia/android/interfaces/RecyclerItemClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.interfaces; +package ch.pizzacucia.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzaleu/android/model/AddNewAddressResponseModel.java b/app/src/main/java/ch/pizzacucia/android/model/AddNewAddressResponseModel.java similarity index 91% rename from app/src/main/java/ch/pizzaleu/android/model/AddNewAddressResponseModel.java rename to app/src/main/java/ch/pizzacucia/android/model/AddNewAddressResponseModel.java index 42c9c87..83ebf1c 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/AddNewAddressResponseModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/AddNewAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/AddProductToBasketResponseModel.java b/app/src/main/java/ch/pizzacucia/android/model/AddProductToBasketResponseModel.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/model/AddProductToBasketResponseModel.java rename to app/src/main/java/ch/pizzacucia/android/model/AddProductToBasketResponseModel.java index dd3a0a5..1d98b50 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/AddProductToBasketResponseModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/AddProductToBasketResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/AddToBasketOptionModel.java b/app/src/main/java/ch/pizzacucia/android/model/AddToBasketOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/model/AddToBasketOptionModel.java rename to app/src/main/java/ch/pizzacucia/android/model/AddToBasketOptionModel.java index 808eb7b..f3d24ae 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/AddToBasketOptionModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/AddToBasketOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/AddressModel.java b/app/src/main/java/ch/pizzacucia/android/model/AddressModel.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/model/AddressModel.java rename to app/src/main/java/ch/pizzacucia/android/model/AddressModel.java index 6765f1f..318c76c 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/AddressModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/AddressModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/AppVersionModel.java b/app/src/main/java/ch/pizzacucia/android/model/AppVersionModel.java similarity index 93% rename from app/src/main/java/ch/pizzaleu/android/model/AppVersionModel.java rename to app/src/main/java/ch/pizzacucia/android/model/AppVersionModel.java index 81d01d4..e72cd1d 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/AppVersionModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/AppVersionModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/CampaignBannerModel.java b/app/src/main/java/ch/pizzacucia/android/model/CampaignBannerModel.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/model/CampaignBannerModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CampaignBannerModel.java index 16a0364..c617e84 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CampaignBannerModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CampaignBannerModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/CampaignModel.java b/app/src/main/java/ch/pizzacucia/android/model/CampaignModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/CampaignModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CampaignModel.java index 9d68fde..3fcee37 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CampaignModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CampaignModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java b/app/src/main/java/ch/pizzacucia/android/model/CategoryModel.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CategoryModel.java index cf9a395..369b5e0 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CategoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -6,8 +6,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzaleu.android.api.ApiConstants; -import ch.pizzaleu.android.helper.SharedPrefsHelper; +import ch.pizzacucia.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/CheckCouponModel.java b/app/src/main/java/ch/pizzacucia/android/model/CheckCouponModel.java similarity index 99% rename from app/src/main/java/ch/pizzaleu/android/model/CheckCouponModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CheckCouponModel.java index b42472e..98878cf 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CheckCouponModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CheckCouponModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/CityModel.java b/app/src/main/java/ch/pizzacucia/android/model/CityModel.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/model/CityModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CityModel.java index 4561df5..5941388 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CityModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CityModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/CountryModel.java b/app/src/main/java/ch/pizzacucia/android/model/CountryModel.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/model/CountryModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CountryModel.java index 8ea5ad0..331f390 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CountryModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CountryModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/CreateOrderModel.java b/app/src/main/java/ch/pizzacucia/android/model/CreateOrderModel.java similarity index 68% rename from app/src/main/java/ch/pizzaleu/android/model/CreateOrderModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CreateOrderModel.java index 6201aae..6932c6b 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CreateOrderModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CreateOrderModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/CustomerTokenModel.java b/app/src/main/java/ch/pizzacucia/android/model/CustomerTokenModel.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/model/CustomerTokenModel.java rename to app/src/main/java/ch/pizzacucia/android/model/CustomerTokenModel.java index d2b76f4..a43aced 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/CustomerTokenModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/CustomerTokenModel.java @@ -1,11 +1,11 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import java.io.Serializable; -import ch.pizzaleu.android.helper.DateTimeHelper; +import ch.pizzacucia.android.helper.DateTimeHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/DeleteAddressResponseModel.java b/app/src/main/java/ch/pizzacucia/android/model/DeleteAddressResponseModel.java similarity index 88% rename from app/src/main/java/ch/pizzaleu/android/model/DeleteAddressResponseModel.java rename to app/src/main/java/ch/pizzacucia/android/model/DeleteAddressResponseModel.java index 82589f4..63e65d6 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/DeleteAddressResponseModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/DeleteAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodModel.java b/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodModel.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/model/PaymentMethodModel.java rename to app/src/main/java/ch/pizzacucia/android/model/PaymentMethodModel.java index 106a161..7b9ed8c 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.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.pizzaleu.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiConstants; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodsResponseModel.java b/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/model/PaymentMethodsResponseModel.java rename to app/src/main/java/ch/pizzacucia/android/model/PaymentMethodsResponseModel.java index 8821f1a..e6e2fdf 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/PaymentMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/PaymentTokenModel.java b/app/src/main/java/ch/pizzacucia/android/model/PaymentTokenModel.java similarity index 85% rename from app/src/main/java/ch/pizzaleu/android/model/PaymentTokenModel.java rename to app/src/main/java/ch/pizzacucia/android/model/PaymentTokenModel.java index 0e36f6f..1af3bf3 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/PaymentTokenModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/PaymentTokenModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; public class PaymentTokenModel { diff --git a/app/src/main/java/ch/pizzaleu/android/model/PostfinancePaymentDataModel.java b/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentDataModel.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/model/PostfinancePaymentDataModel.java rename to app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentDataModel.java index fe81569..b091ef9 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/PostfinancePaymentDataModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentDataModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/PostfinancePaymentResponseModel.java b/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/model/PostfinancePaymentResponseModel.java rename to app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentResponseModel.java index 821555a..1ca72b0 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/PostfinancePaymentResponseModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/RemoveProductFromCartResponseModel.java b/app/src/main/java/ch/pizzacucia/android/model/RemoveProductFromCartResponseModel.java similarity index 91% rename from app/src/main/java/ch/pizzaleu/android/model/RemoveProductFromCartResponseModel.java rename to app/src/main/java/ch/pizzacucia/android/model/RemoveProductFromCartResponseModel.java index 8aafd0e..f23bd7f 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/RemoveProductFromCartResponseModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/RemoveProductFromCartResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodModel.java b/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/ShippingMethodModel.java rename to app/src/main/java/ch/pizzacucia/android/model/ShippingMethodModel.java index 80a0992..ea87a12 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodsResponseModel.java b/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/model/ShippingMethodsResponseModel.java rename to app/src/main/java/ch/pizzacucia/android/model/ShippingMethodsResponseModel.java index 47057d2..e1e95a7 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/ShippingMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/StoreInfoModel.java b/app/src/main/java/ch/pizzacucia/android/model/StoreInfoModel.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/model/StoreInfoModel.java rename to app/src/main/java/ch/pizzacucia/android/model/StoreInfoModel.java index 3fd66ed..66cb021 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/StoreInfoModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/StoreInfoModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/StoreModel.java b/app/src/main/java/ch/pizzacucia/android/model/StoreModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/StoreModel.java rename to app/src/main/java/ch/pizzacucia/android/model/StoreModel.java index 850d195..da409b7 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/StoreModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/StoreModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/StoreShiftModel.java b/app/src/main/java/ch/pizzacucia/android/model/StoreShiftModel.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/model/StoreShiftModel.java rename to app/src/main/java/ch/pizzacucia/android/model/StoreShiftModel.java index 792d2e9..356db24 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/StoreShiftModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/StoreShiftModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/UserModel.java b/app/src/main/java/ch/pizzacucia/android/model/UserModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/UserModel.java rename to app/src/main/java/ch/pizzacucia/android/model/UserModel.java index 92d1329..19ee789 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/UserModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/ZoneModel.java b/app/src/main/java/ch/pizzacucia/android/model/ZoneModel.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/model/ZoneModel.java rename to app/src/main/java/ch/pizzacucia/android/model/ZoneModel.java index 2f402a7..1ef751c 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/ZoneModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/ZoneModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model; +package ch.pizzacucia.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzacucia/android/model/cart/CartInfoModel.java similarity index 95% rename from app/src/main/java/ch/pizzaleu/android/model/cart/CartInfoModel.java rename to app/src/main/java/ch/pizzacucia/android/model/cart/CartInfoModel.java index 9f9a651..9ed770a 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/cart/CartInfoModel.java @@ -1,9 +1,9 @@ -package ch.pizzaleu.android.model.cart; +package ch.pizzacucia.android.model.cart; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzaleu.android.api.ApiConstants; +import ch.pizzacucia.android.api.ApiConstants; /** * Created by cimenmus on 05/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductModel.java b/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/cart/CartProductModel.java rename to app/src/main/java/ch/pizzacucia/android/model/cart/CartProductModel.java index 8b31639..9fe28c5 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.cart; +package ch.pizzacucia.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductOptionModel.java b/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/model/cart/CartProductOptionModel.java rename to app/src/main/java/ch/pizzacucia/android/model/cart/CartProductOptionModel.java index 374d7b4..75f6908 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/cart/CartProductOptionModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.cart; +package ch.pizzacucia.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzacucia/android/model/cart/CartTotalModel.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java rename to app/src/main/java/ch/pizzacucia/android/model/cart/CartTotalModel.java index a69e3cc..337505e 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/cart/CartTotalModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.cart; +package ch.pizzacucia.android.model.cart; import java.io.Serializable; diff --git a/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryModel.java b/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryModel.java similarity index 99% rename from app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryModel.java rename to app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryModel.java index 52b5677..4e94ff1 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.history; +package ch.pizzacucia.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.pizzaleu.android.helper.DateTimeHelper; +import ch.pizzacucia.android.helper.DateTimeHelper; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductModel.java b/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductModel.java rename to app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductModel.java index bb3bd96..9b5f789 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.history; +package ch.pizzacucia.android.model.history; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductOptionModel.java b/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductOptionModel.java rename to app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductOptionModel.java index 74ea5dd..76e8bc8 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/history/OrderHistoryProductOptionModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.history; +package ch.pizzacucia.android.model.history; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductModel.java b/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductModel.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductModel.java rename to app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductModel.java index a50c92e..e7eacc3 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.menu; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java b/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java rename to app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionModel.java index ab48891..fc08add 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.menu; +package ch.pizzacucia.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionValueModel.java b/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionValueModel.java similarity index 98% rename from app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionValueModel.java rename to app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionValueModel.java index c925cab..8943e4c 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionValueModel.java +++ b/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionValueModel.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.model.menu; +package ch.pizzacucia.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzaleu/android/view/AppButton.java b/app/src/main/java/ch/pizzacucia/android/view/AppButton.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/view/AppButton.java rename to app/src/main/java/ch/pizzacucia/android/view/AppButton.java index 54f7c47..299dbb7 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/AppButton.java +++ b/app/src/main/java/ch/pizzacucia/android/view/AppButton.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.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.pizzaleu.android.R; +import ch.pizzacucia.android.R; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/view/AppDropdown.java b/app/src/main/java/ch/pizzacucia/android/view/AppDropdown.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/view/AppDropdown.java rename to app/src/main/java/ch/pizzacucia/android/view/AppDropdown.java index 6e025e0..6927266 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/AppDropdown.java +++ b/app/src/main/java/ch/pizzacucia/android/view/AppDropdown.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.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.pizzaleu.android.R; +import ch.pizzacucia.android.R; /** * Created by cimenmus on 23.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/view/AppDropdownView.java b/app/src/main/java/ch/pizzacucia/android/view/AppDropdownView.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/view/AppDropdownView.java rename to app/src/main/java/ch/pizzacucia/android/view/AppDropdownView.java index 89865fc..c3dd6da 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/AppDropdownView.java +++ b/app/src/main/java/ch/pizzacucia/android/view/AppDropdownView.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java b/app/src/main/java/ch/pizzacucia/android/view/AppEditText.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/view/AppEditText.java rename to app/src/main/java/ch/pizzacucia/android/view/AppEditText.java index ade875b..f70d17e 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java +++ b/app/src/main/java/ch/pizzacucia/android/view/AppEditText.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; -import ch.pizzaleu.android.helper.PasswordHelper; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucia.android.helper.PasswordHelper; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/view/AppInfoView.java b/app/src/main/java/ch/pizzacucia/android/view/AppInfoView.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/view/AppInfoView.java rename to app/src/main/java/ch/pizzacucia/android/view/AppInfoView.java index e8aff2c..6116172 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/AppInfoView.java +++ b/app/src/main/java/ch/pizzacucia/android/view/AppInfoView.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.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.pizzaleu.android.R; +import ch.pizzacucia.android.R; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzaleu/android/view/AppToolbar.java b/app/src/main/java/ch/pizzacucia/android/view/AppToolbar.java similarity index 97% rename from app/src/main/java/ch/pizzaleu/android/view/AppToolbar.java rename to app/src/main/java/ch/pizzacucia/android/view/AppToolbar.java index bb2ff62..c24e82f 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/AppToolbar.java +++ b/app/src/main/java/ch/pizzacucia/android/view/AppToolbar.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.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.pizzaleu.android.R; -import ch.pizzaleu.android.activity.BaseActivity; +import ch.pizzacucia.android.R; +import ch.pizzacucia.android.activity.BaseActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/view/GridSpacesItemDecoration.java b/app/src/main/java/ch/pizzacucia/android/view/GridSpacesItemDecoration.java similarity index 94% rename from app/src/main/java/ch/pizzaleu/android/view/GridSpacesItemDecoration.java rename to app/src/main/java/ch/pizzacucia/android/view/GridSpacesItemDecoration.java index 2a44be2..a28f9ee 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/GridSpacesItemDecoration.java +++ b/app/src/main/java/ch/pizzacucia/android/view/GridSpacesItemDecoration.java @@ -1,10 +1,10 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.android.view; import android.graphics.Rect; import android.support.v7.widget.RecyclerView; import android.view.View; -import ch.pizzaleu.android.helper.DisplayHelper; +import ch.pizzacucia.android.helper.DisplayHelper; /** * Created by cimenmus on 20/09/2017. diff --git a/app/src/main/java/ch/pizzaleu/android/view/NoSwipeViewPager.java b/app/src/main/java/ch/pizzacucia/android/view/NoSwipeViewPager.java similarity index 96% rename from app/src/main/java/ch/pizzaleu/android/view/NoSwipeViewPager.java rename to app/src/main/java/ch/pizzacucia/android/view/NoSwipeViewPager.java index f6d440c..0fdb2c2 100644 --- a/app/src/main/java/ch/pizzaleu/android/view/NoSwipeViewPager.java +++ b/app/src/main/java/ch/pizzacucia/android/view/NoSwipeViewPager.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android.view; +package ch.pizzacucia.android.view; import android.content.Context; import android.support.v4.view.ViewPager; diff --git a/app/src/main/res/drawable-nodpi/pizzaleu_logo.png b/app/src/main/res/drawable-nodpi/pizzacucina_logo.png similarity index 100% rename from app/src/main/res/drawable-nodpi/pizzaleu_logo.png rename to app/src/main/res/drawable-nodpi/pizzacucina_logo.png diff --git a/app/src/main/res/drawable/pizzaleu_splash_logo.png b/app/src/main/res/drawable/pizzacucina_splash_logo.png similarity index 100% rename from app/src/main/res/drawable/pizzaleu_splash_logo.png rename to app/src/main/res/drawable/pizzacucina_splash_logo.png diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml index 167379d..d60aa6c 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.pizzaleu.android.activity.AddAddressActivity" + tools:context="ch.pizzacucia.android.activity.AddAddressActivity" android:focusable="true" android:focusableInTouchMode="true"> - - - - - - + tools:context="ch.pizzacucia.android.activity.CampaignProductDetailsActivity"> + tools:context="ch.pizzacucia.android.activity.CampaignProductListActivity"> - + tools:context="ch.pizzacucia.android.activity.CreateOrderActivity"> - + tools:context="ch.pizzacucia.android.activity.CreateOrderActivity"> + tools:context="ch.pizzacucia.android.activity.ForgotPasswordActivity"> - - - - - + tools:context="ch.pizzacucia.android.activity.MainActivity"> - + tools:context="ch.pizzacucia.android.activity.MyAddressesActivity"> - - - - - - - - - - - - - - - - - - - - - - - + tools:context="ch.pizzacucia.android.activity.UpdatePasswordActivity"> - - - - + tools:context="ch.pizzacucia.android.activity.UpdateProfileActivity"> - - - - - - - - - - - Pizza Leu + Ristorante Cucina Es ist ein Fehler aufgetreten. Warnung Es ist ein Fehler aufgetreten. @@ -32,7 +32,7 @@    Keine Internetverbindung. Bitte versuchen Sie es später noch einmal. - Sie müssen die Pizza Leu-Applikation aktualisieren, um sie zu verwenden. + Sie müssen die Ristorante Cucina-Applikation aktualisieren, um sie zu verwenden. AKTUALISIEREN Wählen Sie Postleitzahl Postleitzahl @@ -59,7 +59,7 @@ Registrieren     - Willkommensgeschenk\nAls Dankeschön erhalten Sie 10 % Rabatt mit dem Code: PIZZALEU     + Willkommensgeschenk\nAls Dankeschön erhalten Sie 10 % Rabatt mit dem Code: RISTORANTECUCINA     Vorname     Nachname     Natel     diff --git a/app/src/test/java/ch/pizzaleu/android/ExampleUnitTest.java b/app/src/test/java/ch/pizzacucia/android/ExampleUnitTest.java similarity index 92% rename from app/src/test/java/ch/pizzaleu/android/ExampleUnitTest.java rename to app/src/test/java/ch/pizzacucia/android/ExampleUnitTest.java index b4cef1f..3f68025 100644 --- a/app/src/test/java/ch/pizzaleu/android/ExampleUnitTest.java +++ b/app/src/test/java/ch/pizzacucia/android/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package ch.pizzaleu.android; +package ch.pizzacucia.android; import org.junit.Test; diff --git a/pizzacucina_keystore.txt b/pizzacucina_keystore.txt new file mode 100644 index 0000000..5821c68 --- /dev/null +++ b/pizzacucina_keystore.txt @@ -0,0 +1,5 @@ +keystore password : zuh07819 +key alias : pizzacucina +key password :zuh07819 + +jks dosyası "pizzacucina_jks" dosyası. Sonunda .jks uzantısı yok, bu sekilde üretti. Sonuna .jks eklenirse hata veriyor. diff --git a/pizzaleu_jks b/pizzaleu_jks deleted file mode 100644 index 9e383cd..0000000 Binary files a/pizzaleu_jks and /dev/null differ diff --git a/pizzaleu_keystore.txt b/pizzaleu_keystore.txt deleted file mode 100644 index aa85362..0000000 --- a/pizzaleu_keystore.txt +++ /dev/null @@ -1,5 +0,0 @@ -keystore password : zuh07819 -key alias : pizzaleu -key password :zuh07819 - -jks dosyası "pizzaleu_jks" dosyası. Sonunda .jks uzantısı yok, bu sekilde üretti. Sonuna .jks eklenirse hata veriyor.