diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 81f8721..3c9adb6 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 854925b..f337aec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,15 +19,15 @@ repositories { android { compileSdkVersion 28 defaultConfig { - applicationId "ch.pizzacucia.android" + applicationId "ch.pizzacucina.android" minSdkVersion 16 targetSdkVersion 28 - versionCode 23 // play store'daki version --> canlı: 0 - dahili test: 17 - versionName "1.45" // play store'daki version --> canlı: 0.00 - dahili test: 1.17 + versionCode 1 // play store'daki version --> canlı: 0 - dahili test: 17 + versionName "1.00" // play store'daki version --> canlı: 0.00 - dahili test: 1.17 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ - onesignal_app_id: '273cb477-d3f0-456d-b0d4-940cfe1ab180', + onesignal_app_id: 'f347ab57-b10f-485d-aa8b-812c8d0f9f6c', // Project number pulled from dashboard, local value is ignored. onesignal_google_project_number: 'REMOTE' ] diff --git a/app/release/output.json b/app/release/output.json index c9cb409..eb48070 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":23,"versionName":"1.45","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.00","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/androidTest/java/ch/pizzacucia/android/ExampleInstrumentedTest.java b/app/src/androidTest/java/ch/pizzacucina/android/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/ch/pizzacucia/android/ExampleInstrumentedTest.java rename to app/src/androidTest/java/ch/pizzacucina/android/ExampleInstrumentedTest.java index 1d0bd3b..9f5f5fc 100644 --- a/app/src/androidTest/java/ch/pizzacucia/android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/ch/pizzacucina/android/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android; +package ch.pizzacucina.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 be08b92..e669891 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="ch.pizzacucina.android"> @@ -31,44 +31,44 @@ { diff --git a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucina/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java index 5a58b9e..a8faeef 100644 --- a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.adapter.recycler; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; -import ch.pizzacucia.android.model.PaymentMethodModel; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.PaymentMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java similarity index 90% rename from app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java index 4caacc2..0a6213d 100644 --- a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.adapter.recycler; +package ch.pizzacucina.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.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; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.helper.PriceHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java similarity index 92% rename from app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java index d231633..851cb5b 100644 --- a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.adapter.recycler; +package ch.pizzacucina.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.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; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.helper.PriceHelper; +import ch.pizzacucina.android.helper.TextHelper; +import ch.pizzacucina.android.model.cart.CartProductModel; public class ProductOnOrderSummaryRecyclerAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java similarity index 90% rename from app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java index 30023a1..9c408de 100644 --- a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.adapter.recycler; +package ch.pizzacucina.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.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; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.helper.PriceHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java index 9c4b7d1..c02301d 100644 --- a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.adapter.recycler; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; -import ch.pizzacucia.android.model.AddressModel; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.AddressModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java index 9738806..1b87efd 100644 --- a/app/src/main/java/ch/pizzacucia/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.adapter.recycler; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.helper.PriceHelper; -import ch.pizzacucia.android.interfaces.RecyclerItemClickListener; -import ch.pizzacucia.android.model.ShippingMethodModel; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.helper.PriceHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.ShippingMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java rename to app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java index e6444ba..e1df4ce 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.android.api; public class ApiConstants { public static final int API_READ_TIMEOUT = 30; diff --git a/app/src/main/java/ch/pizzacucia/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/api/ApiEndPoints.java rename to app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java index ffab73c..c21a71b 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.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 = "pizzacucia/" + PREFIX + "getCampaignBanners" + SUFFIX; + public static final String API_GET_CAMPAIGN_BANNERS = "pizzacucina/" + PREFIX + "getCampaignBanners" + SUFFIX; public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX; public static final String API_GET_IGNORED_CATEGORY_IDS= PREFIX + "getIgnoredCategory" + SUFFIX; diff --git a/app/src/main/java/ch/pizzacucia/android/api/ApiError.java b/app/src/main/java/ch/pizzacucina/android/api/ApiError.java similarity index 95% rename from app/src/main/java/ch/pizzacucia/android/api/ApiError.java rename to app/src/main/java/ch/pizzacucina/android/api/ApiError.java index c027de8..e351e96 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ApiError.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiError.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.android.api; public class ApiError { diff --git a/app/src/main/java/ch/pizzacucia/android/api/ApiErrorUtils.java b/app/src/main/java/ch/pizzacucina/android/api/ApiErrorUtils.java similarity index 90% rename from app/src/main/java/ch/pizzacucia/android/api/ApiErrorUtils.java rename to app/src/main/java/ch/pizzacucina/android/api/ApiErrorUtils.java index ddeba11..4fed813 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ApiErrorUtils.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiErrorUtils.java @@ -1,14 +1,14 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.android.api; import android.content.Intent; import java.lang.annotation.Annotation; -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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.LoginActivity; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.SharedPrefsHelper; import okhttp3.ResponseBody; import retrofit2.Converter; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/api/ApiInterface.java b/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java similarity index 92% rename from app/src/main/java/ch/pizzacucia/android/api/ApiInterface.java rename to app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java index 03a03cb..c26b863 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java @@ -1,31 +1,31 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.android.api; import java.util.HashMap; -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 ch.pizzacucina.android.model.AddNewAddressResponseModel; +import ch.pizzacucina.android.model.AddProductToBasketResponseModel; +import ch.pizzacucina.android.model.AddressModel; +import ch.pizzacucina.android.model.AppVersionModel; +import ch.pizzacucina.android.model.CampaignBannerModel; +import ch.pizzacucina.android.model.CampaignModel; +import ch.pizzacucina.android.model.CheckCouponModel; +import ch.pizzacucina.android.model.CountryModel; +import ch.pizzacucina.android.model.DeleteAddressResponseModel; +import ch.pizzacucina.android.model.PaymentMethodsResponseModel; +import ch.pizzacucina.android.model.PaymentTokenModel; +import ch.pizzacucina.android.model.RemoveProductFromCartResponseModel; +import ch.pizzacucina.android.model.ShippingMethodModel; +import ch.pizzacucina.android.model.StoreInfoModel; +import ch.pizzacucina.android.model.CityModel; +import ch.pizzacucina.android.model.StoreModel; +import ch.pizzacucina.android.model.StoreShiftModel; +import ch.pizzacucina.android.model.ZoneModel; +import ch.pizzacucina.android.model.cart.CartInfoModel; +import ch.pizzacucina.android.model.CategoryModel; +import ch.pizzacucina.android.model.history.OrderHistoryModel; +import ch.pizzacucina.android.model.UserModel; +import ch.pizzacucina.android.model.history.OrderHistoryProductModel; +import ch.pizzacucina.android.model.menu.MenuProductModel; import okhttp3.RequestBody; import retrofit2.Call; import retrofit2.http.Body; diff --git a/app/src/main/java/ch/pizzacucia/android/api/ApiService.java b/app/src/main/java/ch/pizzacucina/android/api/ApiService.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/api/ApiService.java rename to app/src/main/java/ch/pizzacucina/android/api/ApiService.java index 41de68c..29967bc 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ApiService.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiService.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.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.pizzacucia.android.BuildConfig; +import ch.pizzacucina.android.BuildConfig; import okhttp3.Interceptor; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/app/src/main/java/ch/pizzacucia/android/api/BaseResponse.java b/app/src/main/java/ch/pizzacucina/android/api/BaseResponse.java similarity index 93% rename from app/src/main/java/ch/pizzacucia/android/api/BaseResponse.java rename to app/src/main/java/ch/pizzacucina/android/api/BaseResponse.java index 6ff6db9..ccc6638 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/BaseResponse.java +++ b/app/src/main/java/ch/pizzacucina/android/api/BaseResponse.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/api/ResponseArray.java b/app/src/main/java/ch/pizzacucina/android/api/ResponseArray.java similarity index 90% rename from app/src/main/java/ch/pizzacucia/android/api/ResponseArray.java rename to app/src/main/java/ch/pizzacucina/android/api/ResponseArray.java index c79e0b0..99bc0e4 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ResponseArray.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ResponseArray.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/api/ResponseObject.java b/app/src/main/java/ch/pizzacucina/android/api/ResponseObject.java similarity index 89% rename from app/src/main/java/ch/pizzacucia/android/api/ResponseObject.java rename to app/src/main/java/ch/pizzacucina/android/api/ResponseObject.java index 44deed4..0f2b917 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ResponseObject.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ResponseObject.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.api; +package ch.pizzacucina.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/BaseFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/BaseFragment.java similarity index 74% rename from app/src/main/java/ch/pizzacucia/android/fragment/BaseFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/BaseFragment.java index 992f554..195284f 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/BaseFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/BaseFragment.java @@ -1,9 +1,9 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.android.fragment; import android.support.v4.app.Fragment; -import ch.pizzacucia.android.activity.BaseActivity; -import ch.pizzacucia.android.activity.MainActivity; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.MainActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/CampaignBannerFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/CampaignBannerFragment.java similarity index 89% rename from app/src/main/java/ch/pizzacucia/android/fragment/CampaignBannerFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/CampaignBannerFragment.java index 994f9a9..bc17c3a 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/CampaignBannerFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/CampaignBannerFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.helper.ImageLoadHelper; -import ch.pizzacucia.android.model.CampaignBannerModel; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.helper.ImageLoadHelper; +import ch.pizzacucina.android.model.CampaignBannerModel; public class CampaignBannerFragment extends BaseFragment { diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/fragment/CartFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java index af613cc..630efc8 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.CampaignProductListActivity; +import ch.pizzacucina.android.activity.CreateOrderActivity; +import ch.pizzacucina.android.activity.MainActivity; +import ch.pizzacucina.android.adapter.recycler.CartRecyclerAdapter; +import ch.pizzacucina.android.api.ApiEndPoints; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseArray; +import ch.pizzacucina.android.api.ResponseObject; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.PriceHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.helper.SharedPrefsHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.CampaignModel; +import ch.pizzacucina.android.model.RemoveProductFromCartResponseModel; +import ch.pizzacucina.android.model.cart.CartInfoModel; +import ch.pizzacucina.android.model.cart.CartProductModel; +import ch.pizzacucina.android.model.menu.MenuProductModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/MenuFragment.java similarity index 87% rename from app/src/main/java/ch/pizzacucia/android/fragment/MenuFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/MenuFragment.java index d164f5d..7f7bc6c 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/MenuFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/MenuFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.MainActivity; +import ch.pizzacucina.android.activity.ProductDetailsActivity; +import ch.pizzacucina.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseArray; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.CategoryModel; +import ch.pizzacucina.android.model.menu.MenuProductModel; +import ch.pizzacucina.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java similarity index 91% rename from app/src/main/java/ch/pizzacucia/android/fragment/OrderHistoryFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java index 4ad8c86..654bd8a 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.MainActivity; +import ch.pizzacucina.android.activity.OrderHistoryDetailsActivity; +import ch.pizzacucina.android.adapter.recycler.OrderHistoryRecyclerAdapter; +import ch.pizzacucina.android.api.ApiEndPoints; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseArray; +import ch.pizzacucina.android.api.ResponseObject; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.history.OrderHistoryModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/ProductFragment.java similarity index 87% rename from app/src/main/java/ch/pizzacucia/android/fragment/ProductFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/ProductFragment.java index b949cb5..2bede1a 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/ProductFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -13,20 +13,20 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.MainActivity; +import ch.pizzacucina.android.activity.ProductDetailsActivity; +import ch.pizzacucina.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseArray; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.CategoryModel; +import ch.pizzacucina.android.model.menu.MenuProductModel; +import ch.pizzacucina.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java similarity index 92% rename from app/src/main/java/ch/pizzacucia/android/fragment/ProfileFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java index 7ea08ba..711a48d 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.MyAddressesActivity; +import ch.pizzacucina.android.activity.SplashActivity; +import ch.pizzacucina.android.activity.UpdatePasswordActivity; +import ch.pizzacucina.android.activity.UpdateProfileActivity; +import ch.pizzacucina.android.api.ApiConstants; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseObject; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.NetworkHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.helper.SharedPrefsHelper; +import ch.pizzacucina.android.model.UserModel; +import ch.pizzacucina.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/StoreInfoFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/StoreInfoFragment.java similarity index 91% rename from app/src/main/java/ch/pizzacucia/android/fragment/StoreInfoFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/StoreInfoFragment.java index 326de11..c0ef73a 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/StoreInfoFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/StoreInfoFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseObject; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.model.StoreInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderBaseFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderBaseFragment.java similarity index 67% rename from app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderBaseFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderBaseFragment.java index c4b1dc8..360e8cf 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderBaseFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderBaseFragment.java @@ -1,10 +1,10 @@ -package ch.pizzacucia.android.fragment.createOrder; +package ch.pizzacucina.android.fragment.createOrder; import android.widget.TextView; import butterknife.BindView; -import ch.pizzacucia.android.R; -import ch.pizzacucia.android.fragment.BaseFragment; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.fragment.BaseFragment; /** * Created by cimenmus on 21.10.2017. diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderNoteFragment.java similarity index 92% rename from app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderNoteFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderNoteFragment.java index 9ef33c6..c2afa3e 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderNoteFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderNoteFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment.createOrder; +package ch.pizzacucina.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.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; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.CreateOrderActivity; +import ch.pizzacucina.android.api.ApiConstants; +import ch.pizzacucina.android.helper.SharedPrefsHelper; +import ch.pizzacucina.android.model.cart.CartProductModel; +import ch.pizzacucina.android.view.AppEditText; /** * Created by cimenmus on 28.10.2017. diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderResultFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderResultFragment.java similarity index 83% rename from app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderResultFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderResultFragment.java index 8992cb6..8d29d4b 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderResultFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderResultFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment.createOrder; +package ch.pizzacucina.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.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; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.CreateOrderActivity; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderSummaryFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java index fb1b611..7fc4055 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment.createOrder; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.CreateOrderActivity; +import ch.pizzacucina.android.adapter.recycler.OrderPriceRecyclerAdapter; +import ch.pizzacucina.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter; +import ch.pizzacucina.android.api.ApiConstants; +import ch.pizzacucina.android.api.ApiEndPoints; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseObject; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.PriceHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.helper.SharedPrefsHelper; +import ch.pizzacucina.android.model.PaymentMethodModel; +import ch.pizzacucina.android.model.PaymentTokenModel; +import ch.pizzacucina.android.model.StoreShiftModel; +import ch.pizzacucina.android.model.cart.CartInfoModel; +import ch.pizzacucina.android.model.cart.CartProductModel; +import ch.pizzacucina.android.model.cart.CartTotalModel; +import ch.pizzacucina.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java similarity index 93% rename from app/src/main/java/ch/pizzacucia/android/fragment/createOrder/PaymentMethodFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java index 165f645..fd28cc9 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment.createOrder; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.CreateOrderActivity; +import ch.pizzacucina.android.adapter.recycler.PaymentMethodsRecyclerAdapter; +import ch.pizzacucina.android.api.ApiEndPoints; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseObject; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.CheckCouponModel; +import ch.pizzacucina.android.model.PaymentMethodModel; +import ch.pizzacucina.android.model.PaymentMethodsResponseModel; +import ch.pizzacucina.android.model.cart.CartInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingAddressFragment.java similarity index 91% rename from app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingAddressFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingAddressFragment.java index c3e0eaa..e45c22c 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingAddressFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingAddressFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment.createOrder; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.AddAddressActivity; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.CreateOrderActivity; +import ch.pizzacucina.android.adapter.recycler.ShippingAddressesRecyclerAdapter; +import ch.pizzacucina.android.api.ApiConstants; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseArray; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.AddressModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingMethodFragment.java similarity index 89% rename from app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingMethodFragment.java rename to app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingMethodFragment.java index ce06c51..742f0c7 100644 --- a/app/src/main/java/ch/pizzacucia/android/fragment/createOrder/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/ShippingMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.fragment.createOrder; +package ch.pizzacucina.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.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 ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.CreateOrderActivity; +import ch.pizzacucina.android.adapter.recycler.ShippingMethodsRecyclerAdapter; +import ch.pizzacucina.android.api.ApiErrorUtils; +import ch.pizzacucina.android.api.ApiService; +import ch.pizzacucina.android.api.ResponseArray; +import ch.pizzacucina.android.helper.DialogHelper; +import ch.pizzacucina.android.helper.PriceHelper; +import ch.pizzacucina.android.helper.SessionHelper; +import ch.pizzacucina.android.interfaces.RecyclerItemClickListener; +import ch.pizzacucina.android.model.ShippingMethodModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzacucia/android/helper/DateTimeHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/DateTimeHelper.java similarity index 95% rename from app/src/main/java/ch/pizzacucia/android/helper/DateTimeHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/DateTimeHelper.java index 43992f8..b20f1a3 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/DateTimeHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/DateTimeHelper.java @@ -1,11 +1,11 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzacucia.android.R; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/DialogHelper.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/helper/DialogHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/DialogHelper.java index 5515c18..d98e7c4 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/DialogHelper.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.activity.BaseActivity; -import ch.pizzacucia.android.activity.LoginActivity; -import ch.pizzacucia.android.activity.RegisterActivity; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.LoginActivity; +import ch.pizzacucina.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.pizzacucia.android")); + intent.setData(Uri.parse("market://details?id=ch.pizzacucina.android")); BaseActivity.currentActivity.startActivity(intent); BaseActivity.currentActivity.finishAffinity(); } diff --git a/app/src/main/java/ch/pizzacucia/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/DisplayHelper.java similarity index 92% rename from app/src/main/java/ch/pizzacucia/android/helper/DisplayHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/DisplayHelper.java index c611515..9316254 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/DisplayHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/DisplayHelper.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; public class DisplayHelper { diff --git a/app/src/main/java/ch/pizzacucia/android/helper/ImageLoadHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/ImageLoadHelper.java similarity index 86% rename from app/src/main/java/ch/pizzacucia/android/helper/ImageLoadHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/ImageLoadHelper.java index d0ca5f9..c71bee9 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/ImageLoadHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/ImageLoadHelper.java @@ -1,9 +1,9 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import android.widget.ImageView; import com.squareup.picasso.Picasso; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.BaseActivity; public class ImageLoadHelper { diff --git a/app/src/main/java/ch/pizzacucia/android/helper/NetworkHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/NetworkHelper.java similarity index 87% rename from app/src/main/java/ch/pizzacucia/android/helper/NetworkHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/NetworkHelper.java index c789c3e..931efc1 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/NetworkHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/NetworkHelper.java @@ -1,9 +1,9 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.BaseActivity; public class NetworkHelper { diff --git a/app/src/main/java/ch/pizzacucia/android/helper/PasswordHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/PasswordHelper.java similarity index 93% rename from app/src/main/java/ch/pizzacucia/android/helper/PasswordHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/PasswordHelper.java index 730225d..6fc0f7f 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/PasswordHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/PasswordHelper.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import java.util.regex.Pattern; diff --git a/app/src/main/java/ch/pizzacucia/android/helper/PriceHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/PriceHelper.java similarity index 95% rename from app/src/main/java/ch/pizzacucia/android/helper/PriceHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/PriceHelper.java index f71bc0c..6ec8d43 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/PriceHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/PriceHelper.java @@ -1,11 +1,11 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import java.util.ArrayList; -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; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.model.menu.MenuProductModel; +import ch.pizzacucina.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 12/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/SessionHelper.java similarity index 92% rename from app/src/main/java/ch/pizzacucia/android/helper/SessionHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/SessionHelper.java index fb2a75c..8c3363c 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/SessionHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/SessionHelper.java @@ -1,14 +1,14 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -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 ch.pizzacucina.android.model.CheckCouponModel; +import ch.pizzacucina.android.model.CustomerTokenModel; +import ch.pizzacucina.android.model.StoreModel; +import ch.pizzacucina.android.model.UserModel; /** * Created by cimenmus on 11/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/helper/SharedPrefsHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/SharedPrefsHelper.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/helper/SharedPrefsHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/SharedPrefsHelper.java index ba56ea8..a0812ba 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/SharedPrefsHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/SharedPrefsHelper.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import android.content.SharedPreferences; @@ -9,12 +9,12 @@ import java.lang.reflect.Type; import java.util.ArrayList; -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 ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.model.CategoryModel; +import ch.pizzacucina.android.model.CheckCouponModel; +import ch.pizzacucina.android.model.CustomerTokenModel; +import ch.pizzacucina.android.model.StoreModel; +import ch.pizzacucina.android.model.UserModel; import static android.content.Context.MODE_PRIVATE; diff --git a/app/src/main/java/ch/pizzacucia/android/helper/TextHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/TextHelper.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/helper/TextHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/TextHelper.java index 3435bc6..d176b99 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/TextHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/TextHelper.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import android.text.Html; import android.widget.TextView; diff --git a/app/src/main/java/ch/pizzacucia/android/helper/ViewHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/ViewHelper.java similarity index 93% rename from app/src/main/java/ch/pizzacucia/android/helper/ViewHelper.java rename to app/src/main/java/ch/pizzacucina/android/helper/ViewHelper.java index 4e084b5..3b2e958 100644 --- a/app/src/main/java/ch/pizzacucia/android/helper/ViewHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/ViewHelper.java @@ -1,11 +1,11 @@ -package ch.pizzacucia.android.helper; +package ch.pizzacucina.android.helper; import android.app.Activity; import android.content.Context; import android.view.View; import android.view.inputmethod.InputMethodManager; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.activity.BaseActivity; /** * Created by cimenmus on 25/06/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/interfaces/CheckBoxChangedListener.java b/app/src/main/java/ch/pizzacucina/android/interfaces/CheckBoxChangedListener.java similarity index 84% rename from app/src/main/java/ch/pizzacucia/android/interfaces/CheckBoxChangedListener.java rename to app/src/main/java/ch/pizzacucina/android/interfaces/CheckBoxChangedListener.java index 546daf6..008a7f8 100644 --- a/app/src/main/java/ch/pizzacucia/android/interfaces/CheckBoxChangedListener.java +++ b/app/src/main/java/ch/pizzacucina/android/interfaces/CheckBoxChangedListener.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.interfaces; +package ch.pizzacucina.android.interfaces; import android.support.v7.widget.AppCompatCheckBox; diff --git a/app/src/main/java/ch/pizzacucia/android/interfaces/DialogButtonClickListener.java b/app/src/main/java/ch/pizzacucina/android/interfaces/DialogButtonClickListener.java similarity index 79% rename from app/src/main/java/ch/pizzacucia/android/interfaces/DialogButtonClickListener.java rename to app/src/main/java/ch/pizzacucina/android/interfaces/DialogButtonClickListener.java index faa8091..9c3fa8d 100644 --- a/app/src/main/java/ch/pizzacucia/android/interfaces/DialogButtonClickListener.java +++ b/app/src/main/java/ch/pizzacucina/android/interfaces/DialogButtonClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.interfaces; +package ch.pizzacucina.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzacucia/android/interfaces/RecyclerItemClickListener.java b/app/src/main/java/ch/pizzacucina/android/interfaces/RecyclerItemClickListener.java similarity index 80% rename from app/src/main/java/ch/pizzacucia/android/interfaces/RecyclerItemClickListener.java rename to app/src/main/java/ch/pizzacucina/android/interfaces/RecyclerItemClickListener.java index 6c23d48..0bde868 100644 --- a/app/src/main/java/ch/pizzacucia/android/interfaces/RecyclerItemClickListener.java +++ b/app/src/main/java/ch/pizzacucina/android/interfaces/RecyclerItemClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.interfaces; +package ch.pizzacucina.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzacucia/android/model/AddNewAddressResponseModel.java b/app/src/main/java/ch/pizzacucina/android/model/AddNewAddressResponseModel.java similarity index 91% rename from app/src/main/java/ch/pizzacucia/android/model/AddNewAddressResponseModel.java rename to app/src/main/java/ch/pizzacucina/android/model/AddNewAddressResponseModel.java index 83ebf1c..70d8cdd 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/AddNewAddressResponseModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/AddNewAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/AddProductToBasketResponseModel.java b/app/src/main/java/ch/pizzacucina/android/model/AddProductToBasketResponseModel.java similarity index 95% rename from app/src/main/java/ch/pizzacucia/android/model/AddProductToBasketResponseModel.java rename to app/src/main/java/ch/pizzacucina/android/model/AddProductToBasketResponseModel.java index 1d98b50..638a7bf 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/AddProductToBasketResponseModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/AddProductToBasketResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/AddToBasketOptionModel.java b/app/src/main/java/ch/pizzacucina/android/model/AddToBasketOptionModel.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/model/AddToBasketOptionModel.java rename to app/src/main/java/ch/pizzacucina/android/model/AddToBasketOptionModel.java index f3d24ae..09d99ee 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/AddToBasketOptionModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/AddToBasketOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/AddressModel.java b/app/src/main/java/ch/pizzacucina/android/model/AddressModel.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/model/AddressModel.java rename to app/src/main/java/ch/pizzacucina/android/model/AddressModel.java index 318c76c..1419e90 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/AddressModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/AddressModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/AppVersionModel.java b/app/src/main/java/ch/pizzacucina/android/model/AppVersionModel.java similarity index 93% rename from app/src/main/java/ch/pizzacucia/android/model/AppVersionModel.java rename to app/src/main/java/ch/pizzacucina/android/model/AppVersionModel.java index e72cd1d..9ea222d 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/AppVersionModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/AppVersionModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/CampaignBannerModel.java b/app/src/main/java/ch/pizzacucina/android/model/CampaignBannerModel.java similarity index 95% rename from app/src/main/java/ch/pizzacucia/android/model/CampaignBannerModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CampaignBannerModel.java index c617e84..b266bf6 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CampaignBannerModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CampaignBannerModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/CampaignModel.java b/app/src/main/java/ch/pizzacucina/android/model/CampaignModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/CampaignModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CampaignModel.java index 3fcee37..5ccba74 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CampaignModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CampaignModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/CategoryModel.java b/app/src/main/java/ch/pizzacucina/android/model/CategoryModel.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/model/CategoryModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CategoryModel.java index 369b5e0..f217959 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CategoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; 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.pizzacucia.android.helper.SharedPrefsHelper; +import ch.pizzacucina.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/CheckCouponModel.java b/app/src/main/java/ch/pizzacucina/android/model/CheckCouponModel.java similarity index 99% rename from app/src/main/java/ch/pizzacucia/android/model/CheckCouponModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CheckCouponModel.java index 98878cf..600e1ba 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CheckCouponModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CheckCouponModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/CityModel.java b/app/src/main/java/ch/pizzacucina/android/model/CityModel.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/model/CityModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CityModel.java index 5941388..870631b 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CityModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CityModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/CountryModel.java b/app/src/main/java/ch/pizzacucina/android/model/CountryModel.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/model/CountryModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CountryModel.java index 331f390..e23c796 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CountryModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CountryModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/CreateOrderModel.java b/app/src/main/java/ch/pizzacucina/android/model/CreateOrderModel.java similarity index 68% rename from app/src/main/java/ch/pizzacucia/android/model/CreateOrderModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CreateOrderModel.java index 6932c6b..f753bdd 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CreateOrderModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CreateOrderModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/CustomerTokenModel.java b/app/src/main/java/ch/pizzacucina/android/model/CustomerTokenModel.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/model/CustomerTokenModel.java rename to app/src/main/java/ch/pizzacucina/android/model/CustomerTokenModel.java index a43aced..39a677a 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/CustomerTokenModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/CustomerTokenModel.java @@ -1,11 +1,11 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import java.io.Serializable; -import ch.pizzacucia.android.helper.DateTimeHelper; +import ch.pizzacucina.android.helper.DateTimeHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/DeleteAddressResponseModel.java b/app/src/main/java/ch/pizzacucina/android/model/DeleteAddressResponseModel.java similarity index 88% rename from app/src/main/java/ch/pizzacucia/android/model/DeleteAddressResponseModel.java rename to app/src/main/java/ch/pizzacucina/android/model/DeleteAddressResponseModel.java index 63e65d6..8e8013a 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/DeleteAddressResponseModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/DeleteAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodModel.java b/app/src/main/java/ch/pizzacucina/android/model/PaymentMethodModel.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/model/PaymentMethodModel.java rename to app/src/main/java/ch/pizzacucina/android/model/PaymentMethodModel.java index 7b9ed8c..6af76eb 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/PaymentMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.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.pizzacucia.android.api.ApiConstants; +import ch.pizzacucina.android.api.ApiConstants; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodsResponseModel.java b/app/src/main/java/ch/pizzacucina/android/model/PaymentMethodsResponseModel.java similarity index 93% rename from app/src/main/java/ch/pizzacucia/android/model/PaymentMethodsResponseModel.java rename to app/src/main/java/ch/pizzacucina/android/model/PaymentMethodsResponseModel.java index e6e2fdf..f3498be 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/PaymentMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/PaymentMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/PaymentTokenModel.java b/app/src/main/java/ch/pizzacucina/android/model/PaymentTokenModel.java similarity index 85% rename from app/src/main/java/ch/pizzacucia/android/model/PaymentTokenModel.java rename to app/src/main/java/ch/pizzacucina/android/model/PaymentTokenModel.java index 1af3bf3..1197353 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/PaymentTokenModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/PaymentTokenModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; public class PaymentTokenModel { diff --git a/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentDataModel.java b/app/src/main/java/ch/pizzacucina/android/model/PostfinancePaymentDataModel.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentDataModel.java rename to app/src/main/java/ch/pizzacucina/android/model/PostfinancePaymentDataModel.java index b091ef9..a1bd857 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentDataModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/PostfinancePaymentDataModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentResponseModel.java b/app/src/main/java/ch/pizzacucina/android/model/PostfinancePaymentResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentResponseModel.java rename to app/src/main/java/ch/pizzacucina/android/model/PostfinancePaymentResponseModel.java index 1ca72b0..6e637ed 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/PostfinancePaymentResponseModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/PostfinancePaymentResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/RemoveProductFromCartResponseModel.java b/app/src/main/java/ch/pizzacucina/android/model/RemoveProductFromCartResponseModel.java similarity index 91% rename from app/src/main/java/ch/pizzacucia/android/model/RemoveProductFromCartResponseModel.java rename to app/src/main/java/ch/pizzacucina/android/model/RemoveProductFromCartResponseModel.java index f23bd7f..02689e6 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/RemoveProductFromCartResponseModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/RemoveProductFromCartResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodModel.java b/app/src/main/java/ch/pizzacucina/android/model/ShippingMethodModel.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/model/ShippingMethodModel.java rename to app/src/main/java/ch/pizzacucina/android/model/ShippingMethodModel.java index ea87a12..c48816a 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/ShippingMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodsResponseModel.java b/app/src/main/java/ch/pizzacucina/android/model/ShippingMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/model/ShippingMethodsResponseModel.java rename to app/src/main/java/ch/pizzacucina/android/model/ShippingMethodsResponseModel.java index e1e95a7..a8716b3 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/ShippingMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/ShippingMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/StoreInfoModel.java b/app/src/main/java/ch/pizzacucina/android/model/StoreInfoModel.java similarity index 93% rename from app/src/main/java/ch/pizzacucia/android/model/StoreInfoModel.java rename to app/src/main/java/ch/pizzacucina/android/model/StoreInfoModel.java index 66cb021..3e78618 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/StoreInfoModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/StoreInfoModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/StoreModel.java b/app/src/main/java/ch/pizzacucina/android/model/StoreModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/StoreModel.java rename to app/src/main/java/ch/pizzacucina/android/model/StoreModel.java index da409b7..4a9feab 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/StoreModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/StoreModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/StoreShiftModel.java b/app/src/main/java/ch/pizzacucina/android/model/StoreShiftModel.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/model/StoreShiftModel.java rename to app/src/main/java/ch/pizzacucina/android/model/StoreShiftModel.java index 356db24..2e28f36 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/StoreShiftModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/StoreShiftModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/UserModel.java b/app/src/main/java/ch/pizzacucina/android/model/UserModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/UserModel.java rename to app/src/main/java/ch/pizzacucina/android/model/UserModel.java index 19ee789..bbd1f85 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/UserModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/ZoneModel.java b/app/src/main/java/ch/pizzacucina/android/model/ZoneModel.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/model/ZoneModel.java rename to app/src/main/java/ch/pizzacucina/android/model/ZoneModel.java index 1ef751c..9501e0a 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/ZoneModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/ZoneModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model; +package ch.pizzacucina.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzacucina/android/model/cart/CartInfoModel.java similarity index 95% rename from app/src/main/java/ch/pizzacucia/android/model/cart/CartInfoModel.java rename to app/src/main/java/ch/pizzacucina/android/model/cart/CartInfoModel.java index 9ed770a..0d1d722 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/cart/CartInfoModel.java @@ -1,9 +1,9 @@ -package ch.pizzacucia.android.model.cart; +package ch.pizzacucina.android.model.cart; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzacucia.android.api.ApiConstants; +import ch.pizzacucina.android.api.ApiConstants; /** * Created by cimenmus on 05/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductModel.java b/app/src/main/java/ch/pizzacucina/android/model/cart/CartProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/cart/CartProductModel.java rename to app/src/main/java/ch/pizzacucina/android/model/cart/CartProductModel.java index 9fe28c5..b076ca8 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/cart/CartProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.cart; +package ch.pizzacucina.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductOptionModel.java b/app/src/main/java/ch/pizzacucina/android/model/cart/CartProductOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/model/cart/CartProductOptionModel.java rename to app/src/main/java/ch/pizzacucina/android/model/cart/CartProductOptionModel.java index 75f6908..a954bec 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/cart/CartProductOptionModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/cart/CartProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.cart; +package ch.pizzacucina.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzacucina/android/model/cart/CartTotalModel.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/model/cart/CartTotalModel.java rename to app/src/main/java/ch/pizzacucina/android/model/cart/CartTotalModel.java index 337505e..89305aa 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/cart/CartTotalModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/cart/CartTotalModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.cart; +package ch.pizzacucina.android.model.cart; import java.io.Serializable; diff --git a/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryModel.java b/app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryModel.java similarity index 99% rename from app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryModel.java rename to app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryModel.java index 4e94ff1..24de9f9 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.history; +package ch.pizzacucina.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.pizzacucia.android.helper.DateTimeHelper; +import ch.pizzacucina.android.helper.DateTimeHelper; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductModel.java b/app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductModel.java rename to app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryProductModel.java index 9b5f789..ed82e5e 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.history; +package ch.pizzacucina.android.model.history; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductOptionModel.java b/app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductOptionModel.java rename to app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryProductOptionModel.java index 76e8bc8..9e31cc0 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/history/OrderHistoryProductOptionModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/history/OrderHistoryProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.history; +package ch.pizzacucina.android.model.history; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductModel.java b/app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductModel.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductModel.java rename to app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductModel.java index e7eacc3..a2a6a22 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.menu; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionModel.java b/app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionModel.java rename to app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductOptionModel.java index fc08add..46d4332 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.menu; +package ch.pizzacucina.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionValueModel.java b/app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductOptionValueModel.java similarity index 98% rename from app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionValueModel.java rename to app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductOptionValueModel.java index 8943e4c..9b34c3c 100644 --- a/app/src/main/java/ch/pizzacucia/android/model/menu/MenuProductOptionValueModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/menu/MenuProductOptionValueModel.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.model.menu; +package ch.pizzacucina.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzacucia/android/view/AppButton.java b/app/src/main/java/ch/pizzacucina/android/view/AppButton.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/view/AppButton.java rename to app/src/main/java/ch/pizzacucina/android/view/AppButton.java index 299dbb7..89776a0 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/AppButton.java +++ b/app/src/main/java/ch/pizzacucina/android/view/AppButton.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.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.pizzacucia.android.R; +import ch.pizzacucina.android.R; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/view/AppDropdown.java b/app/src/main/java/ch/pizzacucina/android/view/AppDropdown.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/view/AppDropdown.java rename to app/src/main/java/ch/pizzacucina/android/view/AppDropdown.java index 6927266..bb29330 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/AppDropdown.java +++ b/app/src/main/java/ch/pizzacucina/android/view/AppDropdown.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.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.pizzacucia.android.R; +import ch.pizzacucina.android.R; /** * Created by cimenmus on 23.10.2017. diff --git a/app/src/main/java/ch/pizzacucia/android/view/AppDropdownView.java b/app/src/main/java/ch/pizzacucina/android/view/AppDropdownView.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/view/AppDropdownView.java rename to app/src/main/java/ch/pizzacucina/android/view/AppDropdownView.java index c3dd6da..101db15 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/AppDropdownView.java +++ b/app/src/main/java/ch/pizzacucina/android/view/AppDropdownView.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzacucia/android/view/AppEditText.java b/app/src/main/java/ch/pizzacucina/android/view/AppEditText.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/view/AppEditText.java rename to app/src/main/java/ch/pizzacucina/android/view/AppEditText.java index f70d17e..98abf4b 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/AppEditText.java +++ b/app/src/main/java/ch/pizzacucina/android/view/AppEditText.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.activity.BaseActivity; -import ch.pizzacucia.android.helper.PasswordHelper; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.helper.PasswordHelper; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/view/AppInfoView.java b/app/src/main/java/ch/pizzacucina/android/view/AppInfoView.java similarity index 95% rename from app/src/main/java/ch/pizzacucia/android/view/AppInfoView.java rename to app/src/main/java/ch/pizzacucina/android/view/AppInfoView.java index 6116172..9487683 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/AppInfoView.java +++ b/app/src/main/java/ch/pizzacucina/android/view/AppInfoView.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.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.pizzacucia.android.R; +import ch.pizzacucina.android.R; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzacucia/android/view/AppToolbar.java b/app/src/main/java/ch/pizzacucina/android/view/AppToolbar.java similarity index 97% rename from app/src/main/java/ch/pizzacucia/android/view/AppToolbar.java rename to app/src/main/java/ch/pizzacucina/android/view/AppToolbar.java index c24e82f..cdd3ab2 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/AppToolbar.java +++ b/app/src/main/java/ch/pizzacucina/android/view/AppToolbar.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.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.pizzacucia.android.R; -import ch.pizzacucia.android.activity.BaseActivity; +import ch.pizzacucina.android.R; +import ch.pizzacucina.android.activity.BaseActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/view/GridSpacesItemDecoration.java b/app/src/main/java/ch/pizzacucina/android/view/GridSpacesItemDecoration.java similarity index 94% rename from app/src/main/java/ch/pizzacucia/android/view/GridSpacesItemDecoration.java rename to app/src/main/java/ch/pizzacucina/android/view/GridSpacesItemDecoration.java index a28f9ee..f5a0d3e 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/GridSpacesItemDecoration.java +++ b/app/src/main/java/ch/pizzacucina/android/view/GridSpacesItemDecoration.java @@ -1,10 +1,10 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.android.view; import android.graphics.Rect; import android.support.v7.widget.RecyclerView; import android.view.View; -import ch.pizzacucia.android.helper.DisplayHelper; +import ch.pizzacucina.android.helper.DisplayHelper; /** * Created by cimenmus on 20/09/2017. diff --git a/app/src/main/java/ch/pizzacucia/android/view/NoSwipeViewPager.java b/app/src/main/java/ch/pizzacucina/android/view/NoSwipeViewPager.java similarity index 96% rename from app/src/main/java/ch/pizzacucia/android/view/NoSwipeViewPager.java rename to app/src/main/java/ch/pizzacucina/android/view/NoSwipeViewPager.java index 0fdb2c2..ab02874 100644 --- a/app/src/main/java/ch/pizzacucia/android/view/NoSwipeViewPager.java +++ b/app/src/main/java/ch/pizzacucina/android/view/NoSwipeViewPager.java @@ -1,4 +1,4 @@ -package ch.pizzacucia.android.view; +package ch.pizzacucina.android.view; import android.content.Context; import android.support.v4.view.ViewPager; diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml index d60aa6c..3389bf9 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.pizzacucia.android.activity.AddAddressActivity" + tools:context="ch.pizzacucina.android.activity.AddAddressActivity" android:focusable="true" android:focusableInTouchMode="true"> - - - - - - + tools:context="ch.pizzacucina.android.activity.CampaignProductDetailsActivity"> + tools:context="ch.pizzacucina.android.activity.CampaignProductListActivity"> - + tools:context="ch.pizzacucina.android.activity.CreateOrderActivity"> - + tools:context="ch.pizzacucina.android.activity.CreateOrderActivity"> + tools:context="ch.pizzacucina.android.activity.ForgotPasswordActivity"> - - - - - + tools:context="ch.pizzacucina.android.activity.MainActivity"> - + tools:context="ch.pizzacucina.android.activity.MyAddressesActivity"> - - - - - - - - - - - - - - - - - - - - - - - + tools:context="ch.pizzacucina.android.activity.UpdatePasswordActivity"> - - - - + tools:context="ch.pizzacucina.android.activity.UpdateProfileActivity"> - - - - - - - - - - - - - - - - -