volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

creating part 2

Browse Source
This commit is contained in:
mustafa içmen
2020-11-13 20:12:17 +03:00
parent b96a56a7e3
commit 1fac25037e
45 changed files with 263 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
.idea/assetWizardSettings.xml generated
View File

@@ -19,6 +19,29 @@
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="/private/var/folders/s1/wz9sqb0s35x0ws_2b5zz96_40000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="text">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="textAsset">
<value>
<PersistentState>
<option name="values">
@@ -56,14 +79,47 @@
</PersistentState>
</value>
</entry>
<entry key="foregroundClipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="imagePath" value="/private/var/folders/s1/wz9sqb0s35x0ws_2b5zz96_40000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundImage">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="scalingPercent" value="110" />
<entry key="trimmed" value="true" />
<entry key="imagePath" value="$USER_HOME$/Desktop/ic_launcher-web.png" />
<entry key="scalingPercent" value="85" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundText">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundTextAsset">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
@@ -74,8 +130,7 @@
<option name="values">
<map>
<entry key="backgroundAssetType" value="COLOR" />
<entry key="backgroundColor" value="2b2b2b" />
<entry key="foregroundImage" value="$USER_HOME$/Downloads/CUCINA Mobil Logolar/cucina-1024.png" />
<entry key="backgroundColor" value="faeb1c" />
</map>
</option>
</PersistentState>
@@ -87,6 +142,29 @@
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="/private/var/folders/s1/wz9sqb0s35x0ws_2b5zz96_40000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="text">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="textAsset">
<value>
<PersistentState>
<option name="values">
@@ -108,6 +186,104 @@
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="/private/var/folders/s1/wz9sqb0s35x0ws_2b5zz96_40000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="text">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="textAsset">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="tvBanner">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="foregroundText">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="tvChannel">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="foregroundClipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="imagePath" value="/private/var/folders/s1/wz9sqb0s35x0ws_2b5zz96_40000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundImage">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundText">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundTextAsset">
<value>
<PersistentState>
<option name="values">

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

2
app/build.gradle
View File

@@ -27,7 +27,7 @@ android {
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
multiDexEnabled true
manifestPlaceholders = [
onesignal_app_id: 'f347ab57-b10f-485d-aa8b-812c8d0f9f6c',
onesignal_app_id: 'd4dd9cad-7d6e-4872-b93f-0c47ab1a55ec',
// Project number pulled from dashboard, local value is ignored.
onesignal_google_project_number: 'REMOTE'
]

BIN
app/src/main/ic_launcher-playstore.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 51 KiB

2
app/src/main/java/ch/pizzalemon/android/activity/CampaignProductDetailsActivity.java
View File

@@ -97,7 +97,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
if(SessionHelper.isCustomerLoggedIn()){
addProductToCart();
/*
if((campaignModel.getCode().equals(ApiConstants.CAMPAIGN_CODE_PIZZAPASS) && SessionHelper.isUserUsedPizzapassCampaign()){
if((campaignModel.getCode().equals(ApiConstants.PIZZAPROMOTION) && SessionHelper.isUserUsedPizzaPromotionCampaign()){
DialogHelper.showAlertDialog(BaseActivity.currentActivity, cannotUseCampaignText);
}
else {

2
app/src/main/java/ch/pizzalemon/android/activity/CampaignProductListActivity.java
View File

@@ -79,7 +79,7 @@ public class CampaignProductListActivity extends BaseActivity {
Intent productPropertiesIntent = new Intent(BaseActivity.currentActivity, CampaignProductDetailsActivity.class);
productPropertiesIntent.putExtra("menuProductModel", menuProductList.get(position));
productPropertiesIntent.putExtra("campaignModel", campaignModel);
//productPropertiesIntent.putExtra("isFromPizzapassCampaign", categoryModel.isPizzapassCampaign());
//productPropertiesIntent.putExtra("isFromPizzaPromotionCampaign", categoryModel.isPizzaPromotionCampaign());
startActivityForResult(productPropertiesIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_PROPERTIES);
}
});

6
app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java
View File

@@ -171,14 +171,14 @@ public class CreateOrderActivity extends BaseActivity {
*/
/**
* eğer kampanya kullanıldıysa cartInfoModel de isPizzapassCampaignUsed
* eğer kampanya kullanıldıysa cartInfoModel de isPizzaPromotionCampaignUsed
* alanalrını true olarak set ediyoruz. create order ekranlarında herhangi bir yerde sepet sorgusu yapınca
* buradaki cartInfoModel i de güncelliyoruz. fakat isPizzapassCampaignUsed alanları
* buradaki cartInfoModel i de güncelliyoruz. fakat isPizzaPromotionCampaignUsed alanları
* servisten gelmeyen değerler, bizim loaklde tuttuğumuz değişkenler. bu sebeple bu alanlar servisten hep false geliyor,
* buradakinde true olsa bile değişkeni guncellediğimiz için bu alanlar kayboluyor. bunu engellemek için bu metodu yazdım.
*/
public void setCartInfoSafeForCampaigns(CartInfoModel cartInfoModel) {
cartInfoModel.setPizzapassCampaignUsed(this.cartInfoModel.isPizzapassCampaignUsed());
cartInfoModel.setPizzaPromotionCampaignUsed(this.cartInfoModel.isPizzaPromotionCampaignUsed());
this.cartInfoModel = cartInfoModel;
}

12
app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java
View File

@@ -64,10 +64,10 @@ public class MainActivity extends BaseActivity {
@BindView(R.id.shoppingCartImageView) ImageView shoppingCartImageView;
@BindView(R.id.shoppingCartTextView) TextView shoppingCartTextView;
@BindDrawable(R.drawable.ic_bottom_nav_item_cart_gray) Drawable grayCartDrawable;
@BindDrawable(R.drawable.ic_bottom_nav_item_cart_white) Drawable whiteCartDrawable;
@BindDrawable(R.drawable.ic_bottom_nav_item_cart_yellow) Drawable yellowCartDrawable;
@BindColor(R.color.yellow) int yellowColor;
@BindColor(R.color.pizzalemon_yellow) int yellowColor;
@BindColor(R.color.white) int whiteColor;
private FragmentManager fragmentManager;
@@ -195,7 +195,7 @@ public class MainActivity extends BaseActivity {
openProductsScreen(getDefaultCategory());
shoppingCartImageView.setImageDrawable(grayCartDrawable);
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
if(!SessionHelper.isCustomerLoggedIn()) {
@@ -247,7 +247,7 @@ public class MainActivity extends BaseActivity {
currentCategoryId = -1;
cartTotalRelativeLayout.setVisibility(View.GONE);
shoppingCartImageView.setImageDrawable(grayCartDrawable);
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
return true;
@@ -265,7 +265,7 @@ public class MainActivity extends BaseActivity {
currentCategoryId = -1;
cartTotalRelativeLayout.setVisibility(View.GONE);
shoppingCartImageView.setImageDrawable(grayCartDrawable);
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
return true;
@@ -279,7 +279,7 @@ public class MainActivity extends BaseActivity {
currentCategoryId = -1;
cartTotalRelativeLayout.setVisibility(View.GONE);
shoppingCartImageView.setImageDrawable(grayCartDrawable);
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);
return true;

3
app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java
View File

@@ -4,6 +4,7 @@ public class ApiConstants {
public static final int API_READ_TIMEOUT = 30;
public static final int API_CONNECT_TIMEOUT = 10;
public static final String API_PATH = "https://pizzalemon.ch/";
//public static final String API_PATH = "https://cucinaexpress.ch/";
public static final String APP_TYPE_ID_ANDROID = "2";
public static final int APP_ERROR_CODE_AUTHORIZATION = 1;
@@ -12,7 +13,7 @@ public class ApiConstants {
public static final int PRODUCT_ID_MITTAGS_MENU = 732;
public static final int PRODUCT_ID_VERSION_MENU = -111;
public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS";
public static final String CAMPAIGN_CODE_PIZZA_PROMOTION = "PIZZAPROMOTION";
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

2
app/src/main/java/ch/pizzalemon/android/api/ApiEndPoints.java
View File

@@ -30,7 +30,7 @@ public class ApiEndPoints {
public static final String API_GET_ZONE_LIST = PREFIX + "getZones" + SUFFIX;
public static final String API_GET_CUSTOMER_PROFILE = PREFIX + "getCustomerInfo" + SUFFIX;
public static final String API_GET_STORE_INFO = PREFIX + "getStoreInfo" + SUFFIX;
public static final String API_CHECK_CAMPAIGN_PIZZAPASS = PREFIX + "detectPizzaPassCampaign" + SUFFIX + "&token=";
public static final String API_CHECK_CAMPAIGN_PIZZA_PROMOTION = PREFIX + "detectPizzaPromotionCampaign" + SUFFIX + "&token=";
public static final String API_CHECK_DELIVERY_TIME = PREFIX + "checkDeliveryTimeService" + SUFFIX;
public static final String API_GET_DELIVERY_TIME_OF_STORE = PREFIX + "getDeliveryTimeForStore" + SUFFIX;

6
app/src/main/java/ch/pizzalemon/android/api/ApiInterface.java
View File

@@ -204,9 +204,9 @@ public interface ApiInterface {
Call<ResponseObject<PersonalCouponModel>> checkPersonalCoupon(@Url String url,
@Field("voucher") String couponCode);
@GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_PIZZAPASS)
Call<ResponseObject<CampaignModel>> checkPizzapassCampaign(@Path("storeName") String storeName,
@Query("token") String token);
@GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_PIZZA_PROMOTION)
Call<ResponseObject<CampaignModel>> checkPizzaPromotionCampaign(@Path("storeName") String storeName,
@Query("token") String token);
@GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME)
Call<ResponseObject<Boolean>> checkDeliveryTime(@Path("storeName") String storeName,

40
app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java
View File

@@ -83,12 +83,12 @@ public class CartFragment extends BaseFragment {
public static final java.lang.String FRAGMENT_NAME = "cartFragment";
private int REQUEST_CODE_CAMPAIGN_PRODUCT_LIST = 7847;
private String pizzapassCampaignCategoryId = "";
private String pizzaPromotionCampaignCategoryId = "";
private CartInfoModel cartInfoModel;
private ArrayList<CartProductModel> cartProductList = new ArrayList<>();
private CartRecyclerAdapter cartRecyclerAdapter;
private ArrayList<MenuProductModel> pizzapassCampaignProductList = new ArrayList<>();
private ArrayList<MenuProductModel> pizzaPromotionCampaignProductList = new ArrayList<>();
public CartFragment() {}
@@ -146,8 +146,8 @@ public class CartFragment extends BaseFragment {
case R.id.continueCartButton:
// without minimum price control for store. minimum price is contorlled by addOrder2() service.
if(!pizzapassCampaignCategoryId.isEmpty()){
getCampaignProductsForPizzapassOnContinueButtonClicked();
if(!pizzaPromotionCampaignCategoryId.isEmpty()){
getCampaignProductsForPizzaPromotionOnContinueButtonClicked();
}
else {
openCreateOrderActivity();
@@ -161,8 +161,8 @@ public class CartFragment extends BaseFragment {
if(cartCurrentPrice >= storeMinimumPrice){
if(!pizzapassCampaignCategoryId.isEmpty()){
getCampaignProductsForPizzapassOnContinueButtonClicked();
if(!pizzaPromotionCampaignCategoryId.isEmpty()){
getCampaignProductsForPizzaPromotionOnContinueButtonClicked();
}
else {
openCreateOrderActivity();
@@ -228,7 +228,7 @@ public class CartFragment extends BaseFragment {
DialogHelper.hideLoadingDialog();
}
else {
checkPizzapassCampaign();
checkPizzaPromotionCampaign();
}
}
else {
@@ -410,10 +410,10 @@ public class CartFragment extends BaseFragment {
}
);
if(!pizzapassCampaignProductList.isEmpty()){
cartInfoModel.setPizzapassCampaignUsed(
if(!pizzaPromotionCampaignProductList.isEmpty()){
cartInfoModel.setPizzaPromotionCampaignUsed(
isBasketContainsCampaignProduct(
pizzapassCampaignProductList));
pizzaPromotionCampaignProductList));
}
}
@@ -467,10 +467,10 @@ public class CartFragment extends BaseFragment {
}
private void checkPizzapassCampaign(){
private void checkPizzaPromotionCampaign(){
ApiService
.apiInterface
.checkPizzapassCampaign(
.checkPizzaPromotionCampaign(
SessionHelper.getSelectedStore().getStoreName(),
SessionHelper.getCustomerToken().getToken())
.enqueue(new Callback<ResponseObject<CampaignModel>>() {
@@ -486,7 +486,7 @@ public class CartFragment extends BaseFragment {
DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
}
else {
pizzapassCampaignCategoryId = response.body().getData().getCategoryId();
pizzaPromotionCampaignCategoryId = response.body().getData().getCategoryId();
getCampaignProducts(response.body().getData());
}
}
@@ -505,7 +505,7 @@ public class CartFragment extends BaseFragment {
});
}
private void showPizzapassCampaignDialog(final CampaignModel campaignModel){
private void showPizzaPromotionCampaignDialog(final CampaignModel campaignModel){
DialogHelper.showTwoButtonsDialog(
campaignModel.getName(),
campaignModel.getDescription(),
@@ -540,7 +540,7 @@ public class CartFragment extends BaseFragment {
response.body().getData() != null &&
response.body().isSuccess()) {
if(!isBasketContainsCampaignProduct(response.body().getData())){
showPizzapassCampaignDialog(campaignModel);
showPizzaPromotionCampaignDialog(campaignModel);
}
}
else {
@@ -555,13 +555,13 @@ public class CartFragment extends BaseFragment {
});
}
private void getCampaignProductsForPizzapassOnContinueButtonClicked(){
private void getCampaignProductsForPizzaPromotionOnContinueButtonClicked(){
DialogHelper.showLoadingDialog();
Call<ResponseArray<MenuProductModel>> call = ApiService.apiInterface.getProductsByCategory(
SessionHelper.getSelectedStore().getStoreName(),
pizzapassCampaignCategoryId);
pizzaPromotionCampaignCategoryId);
call.enqueue(new Callback<ResponseArray<MenuProductModel>>() {
@Override
public void onResponse(Call<ResponseArray<MenuProductModel>> call, Response<ResponseArray<MenuProductModel>> response) {
@@ -570,9 +570,9 @@ public class CartFragment extends BaseFragment {
response.body().getData() != null &&
response.body().isSuccess()) {
pizzapassCampaignProductList.clear();
pizzapassCampaignProductList.addAll(response.body().getData());
cartInfoModel.setPizzapassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData()));
pizzaPromotionCampaignProductList.clear();
pizzaPromotionCampaignProductList.addAll(response.body().getData());
cartInfoModel.setPizzaPromotionCampaignUsed(isBasketContainsCampaignProduct(response.body().getData()));
DialogHelper.hideLoadingDialog();
openCreateOrderActivity();

4
app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -216,7 +216,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
params.put("payment_method_title", createOrderActivity.getSelectedPaymentMethod().getTitle());
params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode());
params.put("comment", createOrderNote());
params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed());
params.put("is_pizza_promotion_campaign", createOrderActivity.getCartInfo().isPizzaPromotionCampaignUsed());
params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID);
SessionHelper.addCouponCodeToRequestParamsIfNeeded(params);
if(dateOfOrderString != null && !dateOfOrderString.isEmpty() &&
@@ -708,7 +708,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
params.put("payment_method_title", createOrderActivity.getSelectedPaymentMethod().getTitle());
params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode());
params.put("comment", createOrderNote());
params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed());
params.put("is_pizza_promotion_campaign", createOrderActivity.getCartInfo().isPizzaPromotionCampaignUsed());
params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID);
if(paymentMethodNonce != null){
params.put("payment_method_nonce", paymentMethodNonce);

2
app/src/main/java/ch/pizzalemon/android/helper/DisplayHelper.java
View File

@@ -39,6 +39,6 @@ public class DisplayHelper {
Window window = BaseActivity.currentActivity.getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.main_black));
window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.pizzalemon_dark_green));
}
}

10
app/src/main/java/ch/pizzalemon/android/model/cart/CartInfoModel.java
View File

@@ -13,7 +13,7 @@ public class CartInfoModel implements Serializable {
private ArrayList<CartProductModel> products;
private ArrayList<CartTotalModel> totals;
private boolean isPizzapassCampaignUsed;
private boolean isPizzaPromotionCampaignUsed;
public ArrayList<CartProductModel> getProducts() {
return products;
@@ -62,11 +62,11 @@ public class CartInfoModel implements Serializable {
}
public boolean isPizzapassCampaignUsed() {
return isPizzapassCampaignUsed;
public boolean isPizzaPromotionCampaignUsed() {
return isPizzaPromotionCampaignUsed;
}
public void setPizzapassCampaignUsed(boolean pizzapassCampaignUsed) {
isPizzapassCampaignUsed = pizzapassCampaignUsed;
public void setPizzaPromotionCampaignUsed(boolean pizzaPromotionCampaignUsed) {
isPizzaPromotionCampaignUsed = pizzaPromotionCampaignUsed;
}
}

4
app/src/main/res/drawable/background_button_cart.xml
View File

@@ -4,12 +4,12 @@
android:shape="oval">
<!-- fill color -->
<solid android:color="@color/main_black" />
<solid android:color="@color/pizzalemon_dark_green" />
<!-- radius -->
<stroke
android:width="1dp"
android:color="@color/main_black" />
android:color="@color/pizzalemon_green" />
<!-- corners -->
<corners

2
app/src/main/res/drawable/background_button_pizzapp_gray.xml → app/src/main/res/drawable/background_button_pizzalemon_green.xml
View File

@@ -2,7 +2,7 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/main_black"/>
<solid android:color="@color/pizzalemon_green"/>
<corners android:radius="8dp"/>
</shape>

8
app/src/main/res/drawable/background_choose_post_code.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<corners android:radius="4dp"/>
</shape>

2
app/src/main/res/drawable/background_product_cart_price.xml
View File

@@ -2,7 +2,7 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/yellow"/>
<solid android:color="@color/pizzalemon_yellow"/>
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp" />

2
app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml → app/src/main/res/drawable/ic_bottom_nav_item_cart_white.xml
View File

@@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="196.095"
android:viewportWidth="196.095" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
<path android:fillColor="#ffffff" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
</vector>

2
app/src/main/res/drawable/ic_bottom_nav_item_cart_yellow.xml
View File

@@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="196.095"
android:viewportWidth="196.095" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FAC30A" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
<path android:fillColor="#FFC244" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
</vector>

2
app/src/main/res/drawable/selector_bottom_navigation_item.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:color="@color/yellow"
android:color="@color/pizzalemon_yellow"
android:state_checked="true" />
<item android:color="@color/white" />

8
app/src/main/res/layout/activity_main.xml
View File

@@ -121,9 +121,9 @@
android:layout_height="?android:attr/actionBarSize"
app:itemIconTint="@drawable/selector_bottom_navigation_item"
app:itemTextColor="@drawable/selector_bottom_navigation_item"
android:background="@color/main_black"
android:background="@color/pizzalemon_dark_green"
app:menu="@menu/menu_bottom_navigation"
app:itemBackground="@color/main_black"
app:itemBackground="@color/pizzalemon_dark_green"
android:layout_alignParentBottom="true"/>
<LinearLayout
@@ -173,7 +173,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_bottom_nav_item_cart_gray"/>
android:src="@drawable/ic_bottom_nav_item_cart_white"/>
<TextView
android:id="@+id/shoppingCartTextView"
@@ -196,7 +196,7 @@
android:layout_height="64dp"
android:background="@drawable/background_button_cart"
android:gravity="center"
android:src="@drawable/ic_bottom_nav_item_cart_gray"
android:src="@drawable/ic_bottom_nav_item_cart_white"
android:layout_alignParentBottom="true"
android:layout_centerInParent="true"
android:elevation="9dp"

6
app/src/main/res/layout/activity_splash.xml
View File

@@ -39,7 +39,7 @@
android:layout_marginStart="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/background_button_add_cart"
android:background="@drawable/background_choose_post_code"
app:layout_constraintTop_toBottomOf="@id/pizzappSplashLogoImageView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
@@ -59,7 +59,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_down_black"
android:tint="@color/main_black"
android:tint="@color/black"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_centerVertical="true"/>
@@ -68,7 +68,7 @@
<Button
android:id="@+id/choosePostCodeButton"
android:background="@drawable/background_button_pizzapp_gray"
android:background="@drawable/background_button_pizzalemon_green"
android:textColor="@color/white"
android:textSize="12sp"
android:textAllCaps="false"

4
app/src/main/res/layout/row_menu_product.xml
View File

@@ -73,7 +73,7 @@
android:id="@+id/productPriceTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/main_black"
android:textColor="@color/white"
android:padding="17dp"
android:gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"
@@ -89,7 +89,7 @@
android:layout_alignParentEnd="true"
android:padding="6dp"
android:layout_margin="8dp"
android:tint="@color/main_black"/>
android:tint="@color/white"/>
</RelativeLayout>

2
app/src/main/res/layout/row_order_history.xml
View File

@@ -93,7 +93,7 @@
android:textColor="@color/white"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/background_button_pizzapp_gray"
android:background="@drawable/background_button_pizzalemon_green"
android:layout_marginTop="8dp"
android:layout_marginBottom="12dp"
android:layout_marginLeft="12dp"

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

6
app/src/main/res/values/colors.xml
View File

@@ -2,9 +2,9 @@
<resources>
<!-- EC1649 -->
<color name="colorPrimary">#f15d51</color>
<color name="colorPrimaryDark">#f15d51</color>
<color name="colorAccent">#f15d51</color>
<color name="colorPrimary">#E31E38</color>
<color name="colorPrimaryDark">#E31E38</color>
<color name="colorAccent">#0B705B</color>
<!--
<color name="black">#303030</color>

2
app/src/main/res/values/ic_launcher_background.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#2B2B2B</color>
<color name="ic_launcher_background">#FAEB1C</color>
</resources>

2
app/src/main/res/values/strings.xml
View File

@@ -61,7 +61,7 @@
<!-- RegisterActivity-->
<string name="activity_title_register">Registrieren</string>    
<string name="register_coupon_code_description">Willkommensgeschenk\nAls Dankeschön erhalten Sie 10 % Rabatt mit dem Code: <b>RISTORANTELEMON</b></string>    
<string name="register_coupon_code_description">Willkommensgeschenk\nAls Dankeschön erhalten Sie 10 % Rabatt mit dem Code: <b>PIZZALEMON</b></string>    
<string name="firstname">Vorname</string>    
<string name="lastname">Nachname</string>    
<string name="telephone">Natel</string>    

14
app/src/main/res/values/styles.xml
View File

@@ -3,9 +3,9 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/main_black</item>
<item name="colorPrimaryDark">@color/main_black</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorPrimary">@color/pizzalemon_dark_green</item>
<item name="colorPrimaryDark">@color/pizzalemon_dark_green</item>
<item name="colorAccent">@color/red</item>
</style>
<style name="AppTheme.NoActionBar">
@@ -14,7 +14,7 @@
</style>
<style name="ContinueCartButton">
<item name="android:background">@drawable/background_button_add_cart</item>
<item name="android:background">@drawable/background_choose_post_code</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textStyle">bold</item>
@@ -61,14 +61,14 @@
-->
<style name="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:background">@drawable/background_button_pizzalemon_green</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzappGrayButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:background">@drawable/background_button_pizzalemon_green</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
@@ -76,7 +76,7 @@
<style name="PizzappGrayButton" parent="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:background">@drawable/background_button_pizzalemon_green</item>
<item name="android:textColor">@color/white</item>
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginStart">24dp</item>