diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..82282ce --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,143 @@ + + + + + + \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a61cfc6..b9584a0 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index a155d80..33b8896 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/modules.xml b/.idea/modules.xml index 9c86e17..41bbae0 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 801d472..1ec356c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ repositories { android { compileSdkVersion 28 defaultConfig { - applicationId "ch.pizzapp.capri" + applicationId "ch.pizzamaxx.capri" minSdkVersion 16 targetSdkVersion 28 versionCode 26 // play store'daki version --> canlı: 25 - dahili test: 24 @@ -27,7 +27,7 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ - onesignal_app_id: '8cff62c3-88f0-4dcf-ab72-36d9aa272e30', + onesignal_app_id: 'deeeccf5-0d0b-4457-a54f-ec7b6d06092d', // Project number pulled from dashboard, local value is ignored. onesignal_google_project_number: 'REMOTE' ] diff --git a/app/src/androidTest/java/ch/pizzapp/android/ExampleInstrumentedTest.java b/app/src/androidTest/java/ch/pizzamaxx/android/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/ch/pizzapp/android/ExampleInstrumentedTest.java rename to app/src/androidTest/java/ch/pizzamaxx/android/ExampleInstrumentedTest.java index 2bebff6..025fd39 100644 --- a/app/src/androidTest/java/ch/pizzapp/android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/ch/pizzamaxx/android/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android; +package ch.pizzamaxx.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 b14d980..edb469b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,17 +1,17 @@ + package="ch.pizzamaxx.android"> @@ -22,7 +22,7 @@ /> @@ -31,44 +31,44 @@ { diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzamaxx/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java index 6e43b4a..ceef46c 100644 --- a/app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java @@ -1,19 +1,18 @@ -package ch.pizzapp.android.adapter.recycler; +package ch.pizzamaxx.android.adapter.recycler; import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzapp.android.R; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.PaymentMethodModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.PaymentMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java similarity index 89% rename from app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java index 62e9653..e63c49f 100644 --- a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.adapter.recycler; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java similarity index 92% rename from app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java rename to app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java index 200a504..2187f68 100644 --- a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.adapter.recycler; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.helper.TextHelper; -import ch.pizzapp.android.model.cart.CartProductModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.helper.TextHelper; +import ch.pizzamaxx.android.model.cart.CartProductModel; public class ProductOnOrderSummaryRecyclerAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java similarity index 89% rename from app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java rename to app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java index 7c7ca71..16ae732 100644 --- a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.adapter.recycler; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java rename to app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java index ac177ff..7c672eb 100644 --- a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java @@ -1,19 +1,18 @@ -package ch.pizzapp.android.adapter.recycler; +package ch.pizzamaxx.android.adapter.recycler; import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzapp.android.R; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.AddressModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.AddressModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java rename to app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java index bfba328..1311753 100644 --- a/app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.adapter.recycler; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.ShippingMethodModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.ShippingMethodModel; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java similarity index 87% rename from app/src/main/java/ch/pizzapp/android/api/ApiConstants.java rename to app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java index 14950d7..4883bef 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; public class ApiConstants { public static final int API_READ_TIMEOUT = 30; @@ -16,10 +16,6 @@ public class ApiConstants { public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS"; public static final String CAMPAIGN_CODE_CHAMPAGNE = "CHAMPAGNE"; - public static final String BRAINTREE_TOKENIZATION_KEY_SANDBOX = "sandbox_wk7668t4_v332h2jkpq44r8w8"; - public static final String BRAINTREE_TOKENIZATION_KEY_PRODUCTION = "production_ftdg993w_6hsg7g69zg83hx69"; - - public static final String PAYMENT_METHOD_CODE_CREDIT_DEBIT_CARD = "braintree"; // Credit / Debit Card public static final String PAYMENT_METHOD_CODE_BANK_CASH = "cod"; // Bar public static final String PAYMENT_METHOD_CODE_TRANSFER = "bank_transfer"; // Kreditkarten-Kartenzahlung diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java rename to app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java index 3295b26..dbfb583 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java @@ -1,6 +1,4 @@ -package ch.pizzapp.android.api; - -import ch.pizzapp.android.helper.SessionHelper; +package ch.pizzamaxx.android.api; public class ApiEndPoints { diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiError.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiError.java similarity index 95% rename from app/src/main/java/ch/pizzapp/android/api/ApiError.java rename to app/src/main/java/ch/pizzamaxx/android/api/ApiError.java index f46ee28..5695631 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiError.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiError.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; public class ApiError { diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiErrorUtils.java similarity index 90% rename from app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java rename to app/src/main/java/ch/pizzamaxx/android/api/ApiErrorUtils.java index 531adbf..a965f5f 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiErrorUtils.java @@ -1,15 +1,14 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; import android.content.Intent; -import java.io.IOException; import java.lang.annotation.Annotation; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.LoginActivity; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.LoginActivity; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; import okhttp3.ResponseBody; import retrofit2.Converter; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java similarity index 92% rename from app/src/main/java/ch/pizzapp/android/api/ApiInterface.java rename to app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java index 8e00c5b..1ae5e45 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java @@ -1,30 +1,30 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; import java.util.HashMap; -import ch.pizzapp.android.model.AddNewAddressResponseModel; -import ch.pizzapp.android.model.AddProductToBasketResponseModel; -import ch.pizzapp.android.model.AddressModel; -import ch.pizzapp.android.model.AppVersionModel; -import ch.pizzapp.android.model.CampaignModel; -import ch.pizzapp.android.model.CheckCouponModel; -import ch.pizzapp.android.model.CountryModel; -import ch.pizzapp.android.model.DeleteAddressResponseModel; -import ch.pizzapp.android.model.PaymentMethodsResponseModel; -import ch.pizzapp.android.model.PaymentTokenModel; -import ch.pizzapp.android.model.RemoveProductFromCartResponseModel; -import ch.pizzapp.android.model.ShippingMethodModel; -import ch.pizzapp.android.model.StoreInfoModel; -import ch.pizzapp.android.model.CityModel; -import ch.pizzapp.android.model.StoreModel; -import ch.pizzapp.android.model.StoreShiftModel; -import ch.pizzapp.android.model.ZoneModel; -import ch.pizzapp.android.model.cart.CartInfoModel; -import ch.pizzapp.android.model.CategoryModel; -import ch.pizzapp.android.model.history.OrderHistoryModel; -import ch.pizzapp.android.model.UserModel; -import ch.pizzapp.android.model.history.OrderHistoryProductModel; -import ch.pizzapp.android.model.menu.MenuProductModel; +import ch.pizzamaxx.android.model.AddNewAddressResponseModel; +import ch.pizzamaxx.android.model.AddProductToBasketResponseModel; +import ch.pizzamaxx.android.model.AddressModel; +import ch.pizzamaxx.android.model.AppVersionModel; +import ch.pizzamaxx.android.model.CampaignModel; +import ch.pizzamaxx.android.model.CheckCouponModel; +import ch.pizzamaxx.android.model.CountryModel; +import ch.pizzamaxx.android.model.DeleteAddressResponseModel; +import ch.pizzamaxx.android.model.PaymentMethodsResponseModel; +import ch.pizzamaxx.android.model.PaymentTokenModel; +import ch.pizzamaxx.android.model.RemoveProductFromCartResponseModel; +import ch.pizzamaxx.android.model.ShippingMethodModel; +import ch.pizzamaxx.android.model.StoreInfoModel; +import ch.pizzamaxx.android.model.CityModel; +import ch.pizzamaxx.android.model.StoreModel; +import ch.pizzamaxx.android.model.StoreShiftModel; +import ch.pizzamaxx.android.model.ZoneModel; +import ch.pizzamaxx.android.model.cart.CartInfoModel; +import ch.pizzamaxx.android.model.CategoryModel; +import ch.pizzamaxx.android.model.history.OrderHistoryModel; +import ch.pizzamaxx.android.model.UserModel; +import ch.pizzamaxx.android.model.history.OrderHistoryProductModel; +import ch.pizzamaxx.android.model.menu.MenuProductModel; import okhttp3.RequestBody; import retrofit2.Call; import retrofit2.http.Body; diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiService.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java similarity index 57% rename from app/src/main/java/ch/pizzapp/android/api/ApiService.java rename to app/src/main/java/ch/pizzamaxx/android/api/ApiService.java index ff90680..5a43ae5 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiService.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -50,7 +50,7 @@ public class ApiService { HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level logging.setLevel(HttpLoggingInterceptor.Level.BODY); - builder.addInterceptor(logging); + //builder.addInterceptor(logging); OkHttpClient client = builder.build(); @@ -63,4 +63,41 @@ public class ApiService { apiInterface = retrofit.create(ApiInterface.class); } + public void reset3dsTest() { + Gson gson = new GsonBuilder() + .setLenient() + .create(); + + + OkHttpClient.Builder builder = new OkHttpClient().newBuilder(); + builder.readTimeout(ApiConstants.API_READ_TIMEOUT, TimeUnit.SECONDS); + builder.connectTimeout(ApiConstants.API_CONNECT_TIMEOUT, TimeUnit.SECONDS); + + builder.addInterceptor(new Interceptor() { + @Override + public Response intercept(Interceptor.Chain chain) throws IOException { + + Request.Builder builder = chain.request().newBuilder(); + builder.addHeader("Content-Type", "application/json"); + + Request request = builder.build(); + return chain.proceed(request); + } + }); + + HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level + logging.setLevel(HttpLoggingInterceptor.Level.BODY); + //builder.addInterceptor(logging); + + OkHttpClient client = builder.build(); + + retrofit = new Retrofit.Builder() + .baseUrl("http://pizzamaxx.ch/") + .addConverterFactory(GsonConverterFactory.create(gson)) + .client(client) + .build(); + + apiInterface = retrofit.create(ApiInterface.class); + } + } \ No newline at end of file diff --git a/app/src/main/java/ch/pizzapp/android/api/BaseResponse.java b/app/src/main/java/ch/pizzamaxx/android/api/BaseResponse.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/api/BaseResponse.java rename to app/src/main/java/ch/pizzamaxx/android/api/BaseResponse.java index b95346e..b8a886b 100644 --- a/app/src/main/java/ch/pizzapp/android/api/BaseResponse.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/BaseResponse.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/api/ResponseArray.java b/app/src/main/java/ch/pizzamaxx/android/api/ResponseArray.java similarity index 86% rename from app/src/main/java/ch/pizzapp/android/api/ResponseArray.java rename to app/src/main/java/ch/pizzamaxx/android/api/ResponseArray.java index 5876872..7571714 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ResponseArray.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ResponseArray.java @@ -1,10 +1,9 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import java.util.List; /** * Created by cimenmus on 05/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/api/ResponseObject.java b/app/src/main/java/ch/pizzamaxx/android/api/ResponseObject.java similarity index 90% rename from app/src/main/java/ch/pizzapp/android/api/ResponseObject.java rename to app/src/main/java/ch/pizzamaxx/android/api/ResponseObject.java index f74d3d3..dfdc025 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ResponseObject.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ResponseObject.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.api; +package ch.pizzamaxx.android.api; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java b/app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java rename to app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java index e47a823..4a74460 100644 --- a/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java +++ b/app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.dialog; +package ch.pizzamaxx.android.dialog; import android.app.Dialog; import android.os.Bundle; @@ -20,26 +20,24 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.MainActivity; -import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; -import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; -import ch.pizzapp.android.api.ApiEndPoints; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseObject; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.ImageLoadHelper; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.helper.SharedPrefsHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.AddProductToBasketResponseModel; -import ch.pizzapp.android.model.cart.CartInfoModel; -import ch.pizzapp.android.model.menu.MenuProductModel; -import ch.pizzapp.android.model.menu.MenuProductOptionModel; -import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.MainActivity; +import ch.pizzamaxx.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; +import ch.pizzamaxx.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiEndPoints; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseObject; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.ImageLoadHelper; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.cart.CartInfoModel; +import ch.pizzamaxx.android.model.menu.MenuProductModel; +import ch.pizzamaxx.android.model.menu.MenuProductOptionModel; +import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/BaseFragment.java similarity index 75% rename from app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/BaseFragment.java index 8213ef4..5bdc71d 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/BaseFragment.java @@ -1,9 +1,9 @@ -package ch.pizzapp.android.fragment; +package ch.pizzamaxx.android.fragment; import android.support.v4.app.Fragment; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.MainActivity; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.MainActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java index 33210c7..aac44aa 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java @@ -1,13 +1,11 @@ -package ch.pizzapp.android.fragment; +package ch.pizzamaxx.android.fragment; -import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -32,33 +30,31 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.CampaignProductListActivity; -import ch.pizzapp.android.activity.CreateOrderActivity; -import ch.pizzapp.android.activity.MainActivity; -import ch.pizzapp.android.adapter.recycler.CartRecyclerAdapter; -import ch.pizzapp.android.api.ApiEndPoints; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseArray; -import ch.pizzapp.android.api.ResponseObject; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.helper.SharedPrefsHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.CampaignModel; -import ch.pizzapp.android.model.RemoveProductFromCartResponseModel; -import ch.pizzapp.android.model.cart.CartInfoModel; -import ch.pizzapp.android.model.cart.CartProductModel; -import ch.pizzapp.android.model.menu.MenuProductModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.CampaignProductListActivity; +import ch.pizzamaxx.android.activity.CreateOrderActivity; +import ch.pizzamaxx.android.activity.MainActivity; +import ch.pizzamaxx.android.adapter.recycler.CartRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiEndPoints; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseArray; +import ch.pizzamaxx.android.api.ResponseObject; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.CampaignModel; +import ch.pizzamaxx.android.model.RemoveProductFromCartResponseModel; +import ch.pizzamaxx.android.model.cart.CartInfoModel; +import ch.pizzamaxx.android.model.cart.CartProductModel; +import ch.pizzamaxx.android.model.menu.MenuProductModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; -import static android.app.Activity.RESULT_OK; - /** * Created by cimenmus on 18/09/2017. */ diff --git a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/MenuFragment.java similarity index 86% rename from app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/MenuFragment.java index 9c671ae..e8b2b42 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/MenuFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment; +package ch.pizzamaxx.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -14,22 +14,22 @@ import java.util.Comparator; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.MainActivity; -import ch.pizzapp.android.activity.ProductDetailsActivity; -import ch.pizzapp.android.adapter.recycler.MenuProductRecyclerAdapter; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseArray; -import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.DisplayHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.CategoryModel; -import ch.pizzapp.android.model.menu.MenuProductModel; -import ch.pizzapp.android.view.GridSpacesItemDecoration; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.MainActivity; +import ch.pizzamaxx.android.activity.ProductDetailsActivity; +import ch.pizzamaxx.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseArray; +import ch.pizzamaxx.android.dialog.ProductPropertiesBottomSheetDialog; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.DisplayHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.CategoryModel; +import ch.pizzamaxx.android.model.menu.MenuProductModel; +import ch.pizzamaxx.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java similarity index 91% rename from app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java index eed2af2..b445210 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment; +package ch.pizzamaxx.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -14,21 +14,20 @@ import java.util.HashMap; import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.MainActivity; -import ch.pizzapp.android.activity.OrderHistoryDetailsActivity; -import ch.pizzapp.android.adapter.recycler.OrderHistoryRecyclerAdapter; -import ch.pizzapp.android.api.ApiEndPoints; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseArray; -import ch.pizzapp.android.api.ResponseObject; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.helper.SharedPrefsHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.history.OrderHistoryModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.MainActivity; +import ch.pizzamaxx.android.activity.OrderHistoryDetailsActivity; +import ch.pizzamaxx.android.adapter.recycler.OrderHistoryRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiEndPoints; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseArray; +import ch.pizzamaxx.android.api.ResponseObject; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.history.OrderHistoryModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java similarity index 85% rename from app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java index 20f04d9..c63717f 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment; +package ch.pizzamaxx.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -12,23 +12,23 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.MainActivity; -import ch.pizzapp.android.activity.ProductDetailsActivity; -import ch.pizzapp.android.adapter.recycler.MenuProductRecyclerAdapter; -import ch.pizzapp.android.api.ApiConstants; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseArray; -import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.DisplayHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.CategoryModel; -import ch.pizzapp.android.model.menu.MenuProductModel; -import ch.pizzapp.android.view.GridSpacesItemDecoration; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.MainActivity; +import ch.pizzamaxx.android.activity.ProductDetailsActivity; +import ch.pizzamaxx.android.adapter.recycler.MenuProductRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiConstants; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseArray; +import ch.pizzamaxx.android.dialog.ProductPropertiesBottomSheetDialog; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.DisplayHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.CategoryModel; +import ch.pizzamaxx.android.model.menu.MenuProductModel; +import ch.pizzamaxx.android.view.GridSpacesItemDecoration; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java similarity index 92% rename from app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java index c9d974a..ff2e1e1 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment; +package ch.pizzamaxx.android.fragment; import android.content.Intent; import android.os.Bundle; @@ -8,7 +8,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; -import android.widget.RelativeLayout; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; @@ -21,23 +20,22 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.LoginActivity; -import ch.pizzapp.android.activity.MyAddressesActivity; -import ch.pizzapp.android.activity.SplashActivity; -import ch.pizzapp.android.activity.UpdatePasswordActivity; -import ch.pizzapp.android.activity.UpdateProfileActivity; -import ch.pizzapp.android.api.ApiConstants; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseObject; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.NetworkHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.helper.SharedPrefsHelper; -import ch.pizzapp.android.model.UserModel; -import ch.pizzapp.android.view.AppInfoView; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.MyAddressesActivity; +import ch.pizzamaxx.android.activity.SplashActivity; +import ch.pizzamaxx.android.activity.UpdatePasswordActivity; +import ch.pizzamaxx.android.activity.UpdateProfileActivity; +import ch.pizzamaxx.android.api.ApiConstants; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseObject; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.NetworkHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.model.UserModel; +import ch.pizzamaxx.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/StoreInfoFragment.java similarity index 91% rename from app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/StoreInfoFragment.java index ec0a0b8..1f77a38 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/StoreInfoFragment.java @@ -1,23 +1,21 @@ -package ch.pizzapp.android.fragment; +package ch.pizzamaxx.android.fragment; import android.os.Bundle; -import android.text.Html; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.webkit.WebView; -import android.webkit.WebViewClient; import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; -import ch.pizzapp.android.R; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseObject; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.model.StoreInfoModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseObject; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.model.StoreInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderBaseFragment.java similarity index 68% rename from app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderBaseFragment.java index 82ab714..8246a7e 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderBaseFragment.java @@ -1,10 +1,10 @@ -package ch.pizzapp.android.fragment.createOrder; +package ch.pizzamaxx.android.fragment.createOrder; import android.widget.TextView; import butterknife.BindView; -import ch.pizzapp.android.R; -import ch.pizzapp.android.fragment.BaseFragment; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.fragment.BaseFragment; /** * Created by cimenmus on 21.10.2017. diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderNoteFragment.java similarity index 92% rename from app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderNoteFragment.java index ca16e07..93bcc67 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderNoteFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment.createOrder; +package ch.pizzamaxx.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.AppCompatRadioButton; @@ -12,12 +12,12 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.CreateOrderActivity; -import ch.pizzapp.android.helper.SharedPrefsHelper; -import ch.pizzapp.android.model.cart.CartProductModel; -import ch.pizzapp.android.view.AppEditText; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.CreateOrderActivity; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.model.cart.CartProductModel; +import ch.pizzamaxx.android.view.AppEditText; /** * Created by cimenmus on 28.10.2017. @@ -69,6 +69,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { createOrderActivity.onPreviousClicked(FRAGMENT_NAME); break; case R.id.nextTextView: + /* if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ if(yesRadioButton.isChecked()){ createOrderActivity.setSlicePizza(true); @@ -77,6 +78,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { createOrderActivity.setSlicePizza(false); } } + */ createOrderActivity.setOrderNote(orderNoteAppEditText.getText()); createOrderActivity.onNextClicked(FRAGMENT_NAME); break; @@ -85,6 +87,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { private void initViews(){ createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; + /* if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ slicePizzaLayout.setVisibility(View.VISIBLE); if(createOrderActivity.getSlicePizza() != null){ @@ -98,6 +101,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { } } } + */ if(createOrderActivity.getOrderNote() != null){ orderNoteAppEditText.setText(createOrderActivity.getOrderNote()); } diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderResultFragment.java similarity index 84% rename from app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderResultFragment.java index cde04ff..ef0237d 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderResultFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment.createOrder; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.CreateOrderActivity; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.CreateOrderActivity; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java index ad201e4..b43f755 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment.createOrder; +package ch.pizzamaxx.android.fragment.createOrder; import android.app.Activity; import android.content.Intent; @@ -29,28 +29,28 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.CreateOrderActivity; -import ch.pizzapp.android.adapter.recycler.OrderPriceRecyclerAdapter; -import ch.pizzapp.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter; -import ch.pizzapp.android.api.ApiConstants; -import ch.pizzapp.android.api.ApiEndPoints; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseObject; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.helper.SharedPrefsHelper; -import ch.pizzapp.android.model.PaymentMethodModel; -import ch.pizzapp.android.model.PaymentTokenModel; -import ch.pizzapp.android.model.StoreShiftModel; -import ch.pizzapp.android.model.StoreWorkDayModel; -import ch.pizzapp.android.model.cart.CartInfoModel; -import ch.pizzapp.android.model.cart.CartProductModel; -import ch.pizzapp.android.model.cart.CartTotalModel; -import ch.pizzapp.android.view.AppInfoView; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.CreateOrderActivity; +import ch.pizzamaxx.android.adapter.recycler.OrderPriceRecyclerAdapter; +import ch.pizzamaxx.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiConstants; +import ch.pizzamaxx.android.api.ApiEndPoints; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseObject; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.model.PaymentMethodModel; +import ch.pizzamaxx.android.model.PaymentTokenModel; +import ch.pizzamaxx.android.model.StoreShiftModel; +import ch.pizzamaxx.android.model.StoreWorkDayModel; +import ch.pizzamaxx.android.model.cart.CartInfoModel; +import ch.pizzamaxx.android.model.cart.CartProductModel; +import ch.pizzamaxx.android.model.cart.CartTotalModel; +import ch.pizzamaxx.android.view.AppInfoView; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -123,7 +123,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { if (resultCode == Activity.RESULT_OK) { DropInResult result = data.getParcelableExtra(DropInResult.EXTRA_DROP_IN_RESULT); createOrderActivity.setSelectedPaymentMethod(result.getPaymentMethodType()); - //createBraintreePayment(result); + createBraintreePayment(result); // use the result to update your UI and send the payment method nonce to your server } else if (resultCode == Activity.RESULT_CANCELED) { // the user canceled @@ -576,6 +576,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; StringBuilder stringBuilder = new StringBuilder(); + /* if(isCartContainsAnyPizza()){ stringBuilder.append(slicePizzaForStoreText).append(" : "); if(createOrderActivity.getSlicePizza()){ @@ -586,6 +587,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { } stringBuilder.append("\n"); } + */ stringBuilder .append(createOrderActivity.getOrderNote()) @@ -764,8 +766,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { .requestThreeDSecureVerification(true) .amount(amountStringForBraintree) .disableAndroidPay() - //.amount("1.00") - .requestThreeDSecureVerification(true) + .disablePayPal() .disableVenmo(); diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java similarity index 93% rename from app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java index d1a60b3..d848363 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment.createOrder; +package ch.pizzamaxx.android.fragment.createOrder; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; @@ -8,8 +8,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.EditText; -import com.google.android.gms.common.api.Api; - import java.util.ArrayList; import java.util.HashMap; @@ -17,23 +15,21 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.CreateOrderActivity; -import ch.pizzapp.android.adapter.recycler.PaymentMethodsRecyclerAdapter; -import ch.pizzapp.android.api.ApiConstants; -import ch.pizzapp.android.api.ApiEndPoints; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseObject; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.CheckCouponModel; -import ch.pizzapp.android.model.PaymentMethodModel; -import ch.pizzapp.android.model.PaymentMethodsResponseModel; -import ch.pizzapp.android.model.cart.CartInfoModel; -import ch.pizzapp.android.view.AppEditText; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.CreateOrderActivity; +import ch.pizzamaxx.android.adapter.recycler.PaymentMethodsRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiEndPoints; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseObject; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.CheckCouponModel; +import ch.pizzamaxx.android.model.PaymentMethodModel; +import ch.pizzamaxx.android.model.PaymentMethodsResponseModel; +import ch.pizzamaxx.android.model.cart.CartInfoModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingAddressFragment.java similarity index 91% rename from app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingAddressFragment.java index 2838134..43513c7 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingAddressFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment.createOrder; +package ch.pizzamaxx.android.fragment.createOrder; import android.content.Intent; import android.os.Bundle; @@ -15,18 +15,18 @@ import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.AddAddressActivity; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.CreateOrderActivity; -import ch.pizzapp.android.adapter.recycler.ShippingAddressesRecyclerAdapter; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseArray; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.AddressModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.AddAddressActivity; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.CreateOrderActivity; +import ch.pizzamaxx.android.adapter.recycler.ShippingAddressesRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseArray; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.AddressModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingMethodFragment.java similarity index 89% rename from app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java rename to app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingMethodFragment.java index 520c064..bf08428 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingMethodFragment.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.fragment.createOrder; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.CreateOrderActivity; -import ch.pizzapp.android.adapter.recycler.ShippingMethodsRecyclerAdapter; -import ch.pizzapp.android.api.ApiErrorUtils; -import ch.pizzapp.android.api.ApiService; -import ch.pizzapp.android.api.ResponseArray; -import ch.pizzapp.android.helper.DialogHelper; -import ch.pizzapp.android.helper.PriceHelper; -import ch.pizzapp.android.helper.SessionHelper; -import ch.pizzapp.android.interfaces.RecyclerItemClickListener; -import ch.pizzapp.android.model.ShippingMethodModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.CreateOrderActivity; +import ch.pizzamaxx.android.adapter.recycler.ShippingMethodsRecyclerAdapter; +import ch.pizzamaxx.android.api.ApiErrorUtils; +import ch.pizzamaxx.android.api.ApiService; +import ch.pizzamaxx.android.api.ResponseArray; +import ch.pizzamaxx.android.helper.DialogHelper; +import ch.pizzamaxx.android.helper.PriceHelper; +import ch.pizzamaxx.android.helper.SessionHelper; +import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener; +import ch.pizzamaxx.android.model.ShippingMethodModel; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/DateTimeHelper.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/DateTimeHelper.java index 13b63d8..ad78dde 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/DateTimeHelper.java @@ -1,12 +1,11 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/DialogHelper.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/DialogHelper.java index 35670fa..3a62d64 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/DialogHelper.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import android.content.Context; import android.content.DialogInterface; @@ -11,12 +11,10 @@ import com.afollestad.materialdialogs.MaterialDialog; import java.util.ArrayList; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.activity.LoginActivity; -import ch.pizzapp.android.activity.MainActivity; -import ch.pizzapp.android.activity.RegisterActivity; -import ch.pizzapp.android.model.CampaignModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.LoginActivity; +import ch.pizzamaxx.android.activity.RegisterActivity; public class DialogHelper { @@ -238,7 +236,7 @@ public class DialogHelper { @Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse("market://details?id=ch.pizzapp.capri")); + intent.setData(Uri.parse("market://details?id=ch.pizzamaxx.capri")); BaseActivity.currentActivity.startActivity(intent); BaseActivity.currentActivity.finishAffinity(); } diff --git a/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/DisplayHelper.java similarity index 93% rename from app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/DisplayHelper.java index 935c261..6386fc2 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/DisplayHelper.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; public class DisplayHelper { diff --git a/app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/ImageLoadHelper.java similarity index 65% rename from app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/ImageLoadHelper.java index 43e9ae3..4ac47bb 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/ImageLoadHelper.java @@ -1,16 +1,9 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.drawable.Drawable; -import android.support.v4.app.Fragment; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; import android.widget.ImageView; import com.squareup.picasso.Picasso; -import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.BaseActivity; public class ImageLoadHelper { diff --git a/app/src/main/java/ch/pizzapp/android/helper/NetworkHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/NetworkHelper.java similarity index 88% rename from app/src/main/java/ch/pizzapp/android/helper/NetworkHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/NetworkHelper.java index b327f79..3961f36 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/NetworkHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/NetworkHelper.java @@ -1,9 +1,9 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.BaseActivity; public class NetworkHelper { diff --git a/app/src/main/java/ch/pizzapp/android/helper/PasswordHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/PasswordHelper.java similarity index 93% rename from app/src/main/java/ch/pizzapp/android/helper/PasswordHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/PasswordHelper.java index 0951bc2..c32856b 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/PasswordHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/PasswordHelper.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import java.util.regex.Pattern; diff --git a/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/PriceHelper.java similarity index 95% rename from app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/PriceHelper.java index cc8053d..3af3590 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/PriceHelper.java @@ -1,11 +1,11 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import java.util.ArrayList; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.model.menu.MenuProductModel; -import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.model.menu.MenuProductModel; +import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel; /** * Created by cimenmus on 12/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/SessionHelper.java similarity index 92% rename from app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/SessionHelper.java index 819a1bc..321fdd9 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/SessionHelper.java @@ -1,14 +1,14 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import ch.pizzapp.android.model.CheckCouponModel; -import ch.pizzapp.android.model.CustomerTokenModel; -import ch.pizzapp.android.model.StoreModel; -import ch.pizzapp.android.model.UserModel; +import ch.pizzamaxx.android.model.CheckCouponModel; +import ch.pizzamaxx.android.model.CustomerTokenModel; +import ch.pizzamaxx.android.model.StoreModel; +import ch.pizzamaxx.android.model.UserModel; /** * Created by cimenmus on 11/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/SharedPrefsHelper.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/SharedPrefsHelper.java index 79afa45..91d246f 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/SharedPrefsHelper.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import android.content.SharedPreferences; @@ -7,16 +7,14 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.model.CategoryModel; -import ch.pizzapp.android.model.CheckCouponModel; -import ch.pizzapp.android.model.CustomerTokenModel; -import ch.pizzapp.android.model.StoreModel; -import ch.pizzapp.android.model.UserModel; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.model.CategoryModel; +import ch.pizzamaxx.android.model.CheckCouponModel; +import ch.pizzamaxx.android.model.CustomerTokenModel; +import ch.pizzamaxx.android.model.StoreModel; +import ch.pizzamaxx.android.model.UserModel; import static android.content.Context.MODE_PRIVATE; diff --git a/app/src/main/java/ch/pizzapp/android/helper/TextHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/TextHelper.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/helper/TextHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/TextHelper.java index 75cbc19..e01d185 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/TextHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/TextHelper.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import android.text.Html; import android.widget.TextView; diff --git a/app/src/main/java/ch/pizzapp/android/helper/ViewHelper.java b/app/src/main/java/ch/pizzamaxx/android/helper/ViewHelper.java similarity index 93% rename from app/src/main/java/ch/pizzapp/android/helper/ViewHelper.java rename to app/src/main/java/ch/pizzamaxx/android/helper/ViewHelper.java index c336387..7880019 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/ViewHelper.java +++ b/app/src/main/java/ch/pizzamaxx/android/helper/ViewHelper.java @@ -1,11 +1,11 @@ -package ch.pizzapp.android.helper; +package ch.pizzamaxx.android.helper; import android.app.Activity; import android.content.Context; import android.view.View; import android.view.inputmethod.InputMethodManager; -import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzamaxx.android.activity.BaseActivity; /** * Created by cimenmus on 25/06/2017. diff --git a/app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java b/app/src/main/java/ch/pizzamaxx/android/interfaces/CheckBoxChangedListener.java similarity index 78% rename from app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java rename to app/src/main/java/ch/pizzamaxx/android/interfaces/CheckBoxChangedListener.java index 18db245..760516c 100644 --- a/app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java +++ b/app/src/main/java/ch/pizzamaxx/android/interfaces/CheckBoxChangedListener.java @@ -1,7 +1,6 @@ -package ch.pizzapp.android.interfaces; +package ch.pizzamaxx.android.interfaces; import android.support.v7.widget.AppCompatCheckBox; -import android.view.View; /** * Created by cimenmus on 25/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/interfaces/DialogButtonClickListener.java b/app/src/main/java/ch/pizzamaxx/android/interfaces/DialogButtonClickListener.java similarity index 80% rename from app/src/main/java/ch/pizzapp/android/interfaces/DialogButtonClickListener.java rename to app/src/main/java/ch/pizzamaxx/android/interfaces/DialogButtonClickListener.java index ac8c9f8..f90f763 100644 --- a/app/src/main/java/ch/pizzapp/android/interfaces/DialogButtonClickListener.java +++ b/app/src/main/java/ch/pizzamaxx/android/interfaces/DialogButtonClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.interfaces; +package ch.pizzamaxx.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzapp/android/interfaces/RecyclerItemClickListener.java b/app/src/main/java/ch/pizzamaxx/android/interfaces/RecyclerItemClickListener.java similarity index 81% rename from app/src/main/java/ch/pizzapp/android/interfaces/RecyclerItemClickListener.java rename to app/src/main/java/ch/pizzamaxx/android/interfaces/RecyclerItemClickListener.java index 900546d..e4d92ee 100644 --- a/app/src/main/java/ch/pizzapp/android/interfaces/RecyclerItemClickListener.java +++ b/app/src/main/java/ch/pizzamaxx/android/interfaces/RecyclerItemClickListener.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.interfaces; +package ch.pizzamaxx.android.interfaces; import android.view.View; diff --git a/app/src/main/java/ch/pizzapp/android/model/AddNewAddressResponseModel.java b/app/src/main/java/ch/pizzamaxx/android/model/AddNewAddressResponseModel.java similarity index 92% rename from app/src/main/java/ch/pizzapp/android/model/AddNewAddressResponseModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/AddNewAddressResponseModel.java index 0d59198..f679a0c 100644 --- a/app/src/main/java/ch/pizzapp/android/model/AddNewAddressResponseModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/AddNewAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java b/app/src/main/java/ch/pizzamaxx/android/model/AddProductToBasketResponseModel.java similarity index 95% rename from app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/AddProductToBasketResponseModel.java index 56780cc..6d53c22 100644 --- a/app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/AddProductToBasketResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java b/app/src/main/java/ch/pizzamaxx/android/model/AddToBasketOptionModel.java similarity index 95% rename from app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/AddToBasketOptionModel.java index 76b3a13..4928838 100644 --- a/app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/AddToBasketOptionModel.java @@ -1,9 +1,8 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import java.io.Serializable; import java.util.ArrayList; /** diff --git a/app/src/main/java/ch/pizzapp/android/model/AddressModel.java b/app/src/main/java/ch/pizzamaxx/android/model/AddressModel.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/model/AddressModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/AddressModel.java index ab5f667..8922847 100644 --- a/app/src/main/java/ch/pizzapp/android/model/AddressModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/AddressModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java b/app/src/main/java/ch/pizzamaxx/android/model/AppVersionModel.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/AppVersionModel.java index 300c917..11bec19 100644 --- a/app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/AppVersionModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/CampaignModel.java b/app/src/main/java/ch/pizzamaxx/android/model/CampaignModel.java similarity index 99% rename from app/src/main/java/ch/pizzapp/android/model/CampaignModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/CampaignModel.java index 31eee4f..c52443b 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CampaignModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/CampaignModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/CategoryModel.java b/app/src/main/java/ch/pizzamaxx/android/model/CategoryModel.java similarity index 93% rename from app/src/main/java/ch/pizzapp/android/model/CategoryModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/CategoryModel.java index 43461ad..fc94c28 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CategoryModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/CategoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -6,8 +6,8 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzapp.android.api.ApiConstants; -import ch.pizzapp.android.helper.SharedPrefsHelper; +import ch.pizzamaxx.android.api.ApiConstants; +import ch.pizzamaxx.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java b/app/src/main/java/ch/pizzamaxx/android/model/CheckCouponModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/CheckCouponModel.java index 031a86e..4ab819f 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/CheckCouponModel.java @@ -1,6 +1,4 @@ -package ch.pizzapp.android.model; - -import android.util.Log; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/CityModel.java b/app/src/main/java/ch/pizzamaxx/android/model/CityModel.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/model/CityModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/CityModel.java index e73f0bf..8bcaff1 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CityModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/CityModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/CountryModel.java b/app/src/main/java/ch/pizzamaxx/android/model/CountryModel.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/model/CountryModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/CountryModel.java index 232dcf1..a741759 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CountryModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/CountryModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java b/app/src/main/java/ch/pizzamaxx/android/model/CreateOrderModel.java similarity index 69% rename from app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/CreateOrderModel.java index 64ae92a..38b56a9 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/CreateOrderModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java b/app/src/main/java/ch/pizzamaxx/android/model/CustomerTokenModel.java similarity index 89% rename from app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/CustomerTokenModel.java index a86ec5f..f1de809 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/CustomerTokenModel.java @@ -1,15 +1,11 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import java.io.Serializable; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import ch.pizzapp.android.helper.DateTimeHelper; +import ch.pizzamaxx.android.helper.DateTimeHelper; /** * Created by cimenmus on 26/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/DeleteAddressResponseModel.java b/app/src/main/java/ch/pizzamaxx/android/model/DeleteAddressResponseModel.java similarity index 88% rename from app/src/main/java/ch/pizzapp/android/model/DeleteAddressResponseModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/DeleteAddressResponseModel.java index 18f0c1d..41599aa 100644 --- a/app/src/main/java/ch/pizzapp/android/model/DeleteAddressResponseModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/DeleteAddressResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java b/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodModel.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodModel.java index 8549e11..a5740e1 100644 --- a/app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.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.pizzapp.android.api.ApiConstants; +import ch.pizzamaxx.android.api.ApiConstants; /** * Created by cimenmus on 17/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java b/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodsResponseModel.java index fe63e53..f4ad792 100644 --- a/app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/PaymentTokenModel.java b/app/src/main/java/ch/pizzamaxx/android/model/PaymentTokenModel.java similarity index 85% rename from app/src/main/java/ch/pizzapp/android/model/PaymentTokenModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/PaymentTokenModel.java index ee62613..15ac06a 100644 --- a/app/src/main/java/ch/pizzapp/android/model/PaymentTokenModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/PaymentTokenModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; public class PaymentTokenModel { diff --git a/app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java b/app/src/main/java/ch/pizzamaxx/android/model/RemoveProductFromCartResponseModel.java similarity index 91% rename from app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/RemoveProductFromCartResponseModel.java index f90192e..6984c40 100644 --- a/app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/RemoveProductFromCartResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java b/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodModel.java index 7e1a7c1..30b2bfa 100644 --- a/app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java b/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodsResponseModel.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodsResponseModel.java index 3c813f2..88b0fc6 100644 --- a/app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodsResponseModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java b/app/src/main/java/ch/pizzamaxx/android/model/StoreInfoModel.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/StoreInfoModel.java index 27a518c..b05fe27 100644 --- a/app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/StoreInfoModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreModel.java b/app/src/main/java/ch/pizzamaxx/android/model/StoreModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/StoreModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/StoreModel.java index c36031b..8467cc1 100644 --- a/app/src/main/java/ch/pizzapp/android/model/StoreModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/StoreModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java b/app/src/main/java/ch/pizzamaxx/android/model/StoreShiftModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/StoreShiftModel.java index b8ea97f..38c1eb0 100644 --- a/app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/StoreShiftModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java b/app/src/main/java/ch/pizzamaxx/android/model/StoreWorkDayModel.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/StoreWorkDayModel.java index e2172b1..9d517f0 100644 --- a/app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/StoreWorkDayModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/UserModel.java b/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/UserModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/UserModel.java index 113ef31..aea56c5 100644 --- a/app/src/main/java/ch/pizzapp/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/ZoneModel.java b/app/src/main/java/ch/pizzamaxx/android/model/ZoneModel.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/model/ZoneModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/ZoneModel.java index 8484645..a3282dd 100644 --- a/app/src/main/java/ch/pizzapp/android/model/ZoneModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/ZoneModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model; +package ch.pizzamaxx.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java similarity index 95% rename from app/src/main/java/ch/pizzapp/android/model/cart/CartInfoModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java index d86040d..4701693 100644 --- a/app/src/main/java/ch/pizzapp/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java @@ -1,9 +1,9 @@ -package ch.pizzapp.android.model.cart; +package ch.pizzamaxx.android.model.cart; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzapp.android.api.ApiConstants; +import ch.pizzamaxx.android.api.ApiConstants; /** * Created by cimenmus on 05/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/cart/CartProductModel.java b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/cart/CartProductModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductModel.java index 2cadbe8..249a503 100644 --- a/app/src/main/java/ch/pizzapp/android/model/cart/CartProductModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.cart; +package ch.pizzamaxx.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/cart/CartProductOptionModel.java b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductOptionModel.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/model/cart/CartProductOptionModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductOptionModel.java index ce234fd..3f368ce 100644 --- a/app/src/main/java/ch/pizzapp/android/model/cart/CartProductOptionModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.cart; +package ch.pizzamaxx.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartTotalModel.java similarity index 93% rename from app/src/main/java/ch/pizzapp/android/model/cart/CartTotalModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/cart/CartTotalModel.java index 9cba763..6a49e4b 100644 --- a/app/src/main/java/ch/pizzapp/android/model/cart/CartTotalModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartTotalModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.cart; +package ch.pizzamaxx.android.model.cart; import java.io.Serializable; diff --git a/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryModel.java b/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryModel.java similarity index 99% rename from app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryModel.java index b15a7a7..a5bb219 100644 --- a/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.history; +package ch.pizzamaxx.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.pizzapp.android.helper.DateTimeHelper; +import ch.pizzamaxx.android.helper.DateTimeHelper; /** * Created by cimenmus on 04/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductModel.java b/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductModel.java index 1cb5685..6cfed0b 100644 --- a/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.history; +package ch.pizzamaxx.android.model.history; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductOptionModel.java b/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductOptionModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductOptionModel.java index b48b5fa..27753df 100644 --- a/app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductOptionModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/history/OrderHistoryProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.history; +package ch.pizzamaxx.android.model.history; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductModel.java b/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductModel.java similarity index 95% rename from app/src/main/java/ch/pizzapp/android/model/menu/MenuProductModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductModel.java index 47e10e5..0a2fc18 100644 --- a/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.menu; +package ch.pizzamaxx.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -6,9 +6,8 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.ArrayList; -import ch.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.model.cart.CartProductOptionModel; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; /** * Created by cimenmus on 08/10/2017. diff --git a/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionModel.java b/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionModel.java index afa4dd1..8489ff3 100644 --- a/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.menu; +package ch.pizzamaxx.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionValueModel.java b/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionValueModel.java similarity index 98% rename from app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionValueModel.java rename to app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionValueModel.java index f141d84..2c7a05c 100644 --- a/app/src/main/java/ch/pizzapp/android/model/menu/MenuProductOptionValueModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/menu/MenuProductOptionValueModel.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.model.menu; +package ch.pizzamaxx.android.model.menu; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/ch/pizzapp/android/view/AppButton.java b/app/src/main/java/ch/pizzamaxx/android/view/AppButton.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/view/AppButton.java rename to app/src/main/java/ch/pizzamaxx/android/view/AppButton.java index da4e494..06f0934 100644 --- a/app/src/main/java/ch/pizzapp/android/view/AppButton.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/AppButton.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.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.pizzapp.android.R; +import ch.pizzamaxx.android.R; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/view/AppDropdown.java b/app/src/main/java/ch/pizzamaxx/android/view/AppDropdown.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/view/AppDropdown.java rename to app/src/main/java/ch/pizzamaxx/android/view/AppDropdown.java index 1b93ef5..2fbc9db 100644 --- a/app/src/main/java/ch/pizzapp/android/view/AppDropdown.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/AppDropdown.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.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.pizzapp.android.R; +import ch.pizzamaxx.android.R; /** * Created by cimenmus on 23.10.2017. diff --git a/app/src/main/java/ch/pizzapp/android/view/AppDropdownView.java b/app/src/main/java/ch/pizzamaxx/android/view/AppDropdownView.java similarity index 94% rename from app/src/main/java/ch/pizzapp/android/view/AppDropdownView.java rename to app/src/main/java/ch/pizzamaxx/android/view/AppDropdownView.java index 27cd01f..ac95f7d 100644 --- a/app/src/main/java/ch/pizzapp/android/view/AppDropdownView.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/AppDropdownView.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; /** * Created by cimenmus on 26.10.2017. diff --git a/app/src/main/java/ch/pizzapp/android/view/AppEditText.java b/app/src/main/java/ch/pizzamaxx/android/view/AppEditText.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/view/AppEditText.java rename to app/src/main/java/ch/pizzamaxx/android/view/AppEditText.java index 6eacfec..abb71da 100644 --- a/app/src/main/java/ch/pizzapp/android/view/AppEditText.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/AppEditText.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; -import ch.pizzapp.android.helper.PasswordHelper; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; +import ch.pizzamaxx.android.helper.PasswordHelper; /** * Created by cimenmus on 28/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/view/AppInfoView.java b/app/src/main/java/ch/pizzamaxx/android/view/AppInfoView.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/view/AppInfoView.java rename to app/src/main/java/ch/pizzamaxx/android/view/AppInfoView.java index 82e17c6..491fe5c 100644 --- a/app/src/main/java/ch/pizzapp/android/view/AppInfoView.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/AppInfoView.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.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.pizzapp.android.R; +import ch.pizzamaxx.android.R; /** * Created by cimenmus on 24.10.2017. diff --git a/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java b/app/src/main/java/ch/pizzamaxx/android/view/AppToolbar.java similarity index 97% rename from app/src/main/java/ch/pizzapp/android/view/AppToolbar.java rename to app/src/main/java/ch/pizzamaxx/android/view/AppToolbar.java index 83cc387..ceaaee0 100644 --- a/app/src/main/java/ch/pizzapp/android/view/AppToolbar.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/AppToolbar.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.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.pizzapp.android.R; -import ch.pizzapp.android.activity.BaseActivity; +import ch.pizzamaxx.android.R; +import ch.pizzamaxx.android.activity.BaseActivity; /** * Created by cimenmus on 18/09/2017. diff --git a/app/src/main/java/ch/pizzapp/android/view/GridSpacesItemDecoration.java b/app/src/main/java/ch/pizzamaxx/android/view/GridSpacesItemDecoration.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/view/GridSpacesItemDecoration.java rename to app/src/main/java/ch/pizzamaxx/android/view/GridSpacesItemDecoration.java index e0b05f2..981ce83 100644 --- a/app/src/main/java/ch/pizzapp/android/view/GridSpacesItemDecoration.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/GridSpacesItemDecoration.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.android.view; import android.graphics.Rect; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/ch/pizzapp/android/view/NoSwipeViewPager.java b/app/src/main/java/ch/pizzamaxx/android/view/NoSwipeViewPager.java similarity index 96% rename from app/src/main/java/ch/pizzapp/android/view/NoSwipeViewPager.java rename to app/src/main/java/ch/pizzamaxx/android/view/NoSwipeViewPager.java index c2be22d..8255bae 100644 --- a/app/src/main/java/ch/pizzapp/android/view/NoSwipeViewPager.java +++ b/app/src/main/java/ch/pizzamaxx/android/view/NoSwipeViewPager.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android.view; +package ch.pizzamaxx.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 b819613..46a3148 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.pizzapp.android.activity.AddAddressActivity" + tools:context="ch.pizzamaxx.android.activity.AddAddressActivity" android:focusable="true" android:focusableInTouchMode="true"> - - - - - - + tools:context="ch.pizzamaxx.android.activity.CampaignProductDetailsActivity"> + tools:context="ch.pizzamaxx.android.activity.CampaignProductListActivity"> - + tools:context="ch.pizzamaxx.android.activity.CreateOrderActivity"> - + tools:context="ch.pizzamaxx.android.activity.CreateOrderActivity"> + tools:context="ch.pizzamaxx.android.activity.ForgotPasswordActivity"> - - - - - + tools:context="ch.pizzamaxx.android.activity.MainActivity"> - + tools:context="ch.pizzamaxx.android.activity.MyAddressesActivity"> - - - - - - - - - - - - - - - - - - - - - - - + tools:context="ch.pizzamaxx.android.activity.UpdatePasswordActivity"> - - - - + tools:context="ch.pizzamaxx.android.activity.UpdateProfileActivity"> - - - - - - - - - - + Pizzamaxx + Es ist ein Fehler aufgetreten. + Warnung + Es ist ein Fehler aufgetreten. + Bad Request + Connection failed + Ok + Beenden     + Bitte warten...     + Jan.     + Feb.     + März     + Apr.     + Mai     + Juni     + Juli   + Aug.     + Sept.     + Okt.   + Nov.  + Dez. + CHF  + .. + Wählen + Bitte einloggen um zu bestellen. + Sie müssen sich registrieren um diese Seite zu besuchen. + BEENDEN + + +    + Keine Internetverbindung. Bitte versuchen Sie es später noch einmal. + Sie müssen die PizzApp-Applikation aktualisieren, um sie zu verwenden. + AKTUALISIEREN + Wählen Sie Postleitzahl + Code Postal + GO! + + + + Einloggen + EINLOGGEN + Sie haben kein Konto? + REGISTRIEREN     + Haben Sie Ihr Passwort vergessen?   + \nPASSWORT ZURÜCKSETZEN + Als Gast einloggen + + + + Passwort vergessen     + Geben sie beim registrieren ihre E-Mail-Adresse ein und folgen Sie den Anweisungen. +      + SENDEN     + Erforderliche Informationen wurden an Ihre E-Mail-Adresse geschickt. Folgen Sie den Anweisungen um Ihr Passwort zurückzusetzen. + + + + Registrieren     + Vorname     + Nachname     + Natel     + E-Mail-Adresse     + Passwort     + Passwort (erneut eingeben)     + Adresse     + Adresse 2     + Stadt     + Postleitzahl     + Gebiet     + Land  + Bitte füllen Sie alle Felder aus.     + Bitte geben sie eine gültige E-Mail-Adresse ein.   + Passwörter stimmen nicht überein.     + Bitte geben sie eine gültige Postleitzahl ein.  +    + Bitte wählen Sie zuerst ein Land.     + REGISTRIEREN + + +      + Menu     + Warenkorb     + Bestellungshistorie     + Mein Konto     + Info + ZWISHENSUMME + + +      + IN DEN WARENKORB     + Stückzahl     + wurde nicht ausgewählt. + Kampagne kann nicht in den Warenkorb gelegt werden, da sie schon benutzt wurde. + Bestellung ausserhalb der Öffnungszeiten. Bitte den gewünschten Liefertermin auswählen. + Restaurant am gewählten Datum und Uhrzeit ausser Betrieb. Möchten Sie eine Bestellung für ein anderes Datum und eine andere Uhrzeit geben? + + +      + WEITER     + ALLE LÖSCHEN     + Es befindet sich kein Produkt im Warenkorb.     + Möchten Sie das Produkt aus dem Warenkorb entfernen? +      + Produkt wurde aus dem Warenkorb entfernt.     + Möchten Sie alle Produkte aus dem Warenkorb entfernen? + Die Summe Ihres Warenkorbes muss mindestens + betragen, um die Bestellung auszuführen. + + + + Gesamtbetrag :     + Datum     + Status + Bestellung Wiederholen + + + + Bestellungsdetail     + BESTELLUNGSDATUM     + STATUS     + VERSANDZEIT     + ZWISHENSUMME     + ZAHLUNGSART     + PRODUKTE     + VOLLNAME     + LIEFERUNGSART     + LIEFERUNGSADRESSE      + BEMERKUNGEN  + BESTELLUNG WIEDERHOLEN + + +   + Bestellen     + NÄCHSTE     + VORHERIGE     + JETZT BESTELLEN     + FERTIG     + + Lieferung + Adresse         + Zahlung + Bemerkung         + Übersicht     + + + +      + Bitte wählen Sie eine Lieferungsmethode + Der Mindestbestellwert für die kostenlose Lieferung beträgt + +      + + ABWEICHENDE LIEFERADRESSE + Bitte wählen Sie eine Lieferungsadresse aus oder fügen Sie eine neue Lieferungsadresse hinzu. + + + + Bitte wählen Sie ein Bezahlverfahren aus. + Gutscheincode (Wahlweise) + Zahlungsart + Gutscheincode + Sie haben erfolgreich Ihre + eingelöst. + Der Coupon ist nicht aktiv. + + + + Was sollen wir beachten? + Aus Gründen der Qualität empfehlen wir nicht, die Pizza zu schneiden + Bitte Pizza Schneiden + Nein, bitte Pizza nicht schneiden + + +      + AN     + LIEFERUNGSART     + LIEFERUNGSADRESSE     + ZAHLUNGSART     + WARENKORB     + KASSE + BEMERKUNGEN + Die Pizza zu schneiden + Lieferungsdatum: + Lieferungszeit: + HEUTE + Unbekannte Zahlungsmethode. + Die Zahlung wurde storniert. + Android Pay konnte nicht finden. + + + + Die Bestellung wurde erfolgreich entgegengenommen und wird schnellstmöglich bearbeitet.\n\nSie werden eine Bestätigungs-Email erhalten. Sollte die E-mail nach 1 Minute nicht eingetroffen sein, schauen Sie bitte in Ihrem Spam-, Bulk- oder Junk Mail Ordner nach.\n\nVielen Dank für den Einkauf bei uns. + JA + NEIN + + +      + PIZZA PASS     + VORNAME     + NACHNAME     + NATEL     + E-MAIL-ADRESSE     + Meine Adressen     + Profil Aktualisieren     + Passwort Aktualisieren     + Benachrichtigungen Aktivieren     + Postleitzahl Ändern     + Möchten Sie sich abmelden? + Abmelden  + + + + Profil Aktualisieren + Ihr Profil wurde erfolgreich aktualisiert.. + + +      + Passwort Aktualisieren     + Altes Passwort     + Neues Passwort     + Neues Passwort (erneut eingeben)     + Ihr Passwort wurde erfolgreich aktualisiert. + + +      + Meine Adressen     + NEUE ADRESSE HINZUFÜGEN     + Möchten Sie diese Adresse löschen?     + Ihre Adresse wurde erfolgreich gelöscht. + + + + Neue Adresse hinzufügen  + HINZUFÜGEN     + Adresse wurde erfolgreich hinzugefügt. + + + + diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..66b69c5 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #D03F3F + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f75ad5..acfb66b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - PizzApp + Pizzamaxx Es ist ein Fehler aufgetreten. Warnung Es ist ein Fehler aufgetreten. @@ -35,7 +35,7 @@ Sie müssen die PizzApp-Applikation aktualisieren, um sie zu verwenden. AKTUALISIEREN Wählen Sie Postleitzahl - Ihre PLZ + Postleitzahl GO! @@ -61,7 +61,7 @@ Registrieren     Vorname     Nachname     - Natal     + Natel     E-Mail-Adresse     Passwort     Passwort (erneut eingeben)     @@ -201,7 +201,7 @@ PIZZA PASS     VORNAME     NACHNAME     - NATAL     + NATEL     E-MAIL-ADRESSE     Meine Adressen     Profil Aktualisieren     diff --git a/app/src/test/java/ch/pizzapp/android/ExampleUnitTest.java b/app/src/test/java/ch/pizzamaxx/android/ExampleUnitTest.java similarity index 92% rename from app/src/test/java/ch/pizzapp/android/ExampleUnitTest.java rename to app/src/test/java/ch/pizzamaxx/android/ExampleUnitTest.java index a373c0d..6e0ea3b 100644 --- a/app/src/test/java/ch/pizzapp/android/ExampleUnitTest.java +++ b/app/src/test/java/ch/pizzamaxx/android/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package ch.pizzapp.android; +package ch.pizzamaxx.android; import org.junit.Test;