From 672509b17822a1f0a4038a11d8ead827eb06da01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Mon, 2 Dec 2019 22:22:00 +0300 Subject: [PATCH] wunschpizza alert text added --- .idea/caches/build_file_checksums.ser | Bin 542 -> 542 bytes .idea/caches/gradle_models.ser | Bin 314763 -> 314763 bytes .../activity/ProductDetailsActivity.java | 8 ++++++++ .../res/layout/activity_product_details.xml | 15 +++++++++++++++ 4 files changed, 23 insertions(+) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index b717fe4a3a74fd65003688d10ead3cb7de29d7aa..5226a25ba1146ab8d68fcacee327cb84f4d02127 100644 GIT binary patch delta 33 pcmbQoGLL1#43-o86V7g&qro`&6QeeB34`EdM@H$%4;Td)D*)5(3qb$? delta 37 tcmbQoGLL1#43@*}4(1!@XfRIx$f(0!!XS`XP@q3KpHXb`eMSMs3IOjO3+Vs= diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 1889e4201ab28f8e8d5e0fb7d0ea526e829b32fb..324f7494fb45d5b1f0595efc721bea9b69e0c0a7 100644 GIT binary patch delta 146 zcmeC4E!;g@c*8diHg%P?D;O9iPjJ!Stj&4fh9z_V>sifwZtZ+-j6lq^ozIP#@fusY z)ay{jg6R_-nT5A&$gpf;V~NUS(%ODciG{0~t$O19FqkCcG8SDXnF*81@)#HxGzuB& r80>)rY|FMDPJl@=E@RPUk|{W0zl4E-L9URY sj=>&CFupAYk^*-NG!AJ@_gcZSgi&t#`xPuwEXw@HLbmg+WT{gD0M`F9IRF3v diff --git a/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java b/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java index d6db63c..90e0714 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java @@ -20,6 +20,7 @@ import butterknife.OnClick; import ch.pizzaleu.android.R; import ch.pizzaleu.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; import ch.pizzaleu.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; +import ch.pizzaleu.android.api.ApiConstants; import ch.pizzaleu.android.api.ApiEndPoints; import ch.pizzaleu.android.api.ApiErrorUtils; import ch.pizzaleu.android.api.ApiService; @@ -51,6 +52,7 @@ public class ProductDetailsActivity extends BaseActivity { @BindView(R.id.productNameTextView) TextView productNameTextView; @BindView(R.id.productPriceTextView) TextView productPriceTextView; @BindView(R.id.productDescriptionTextView) TextView productDescriptionTextView; + @BindView(R.id.wunschpizzaAlertTextView) TextView wunschpizzaAlertTextView; @BindView(R.id.addToCartButton) Button addToCartButton; @BindView(R.id.recycler1HeaderTextView) TextView recycler1HeaderTextView; @BindView(R.id.recyclerView1) RecyclerView recyclerView1; @@ -248,6 +250,12 @@ public class ProductDetailsActivity extends BaseActivity { productNameTextView.setText(menuProductModel.getName()); productPriceTextView.setText(PriceHelper.getPriceWithCurreny(menuProductModel.getPrice())); productPriceTextView.setText(PriceHelper.getPriceWithCurreny(menuProductModel.getPrice())); + if(menuProductModel.getId().equals(String.valueOf(ApiConstants.PRODUCT_ID_WUNSCHPIZZA))){ + wunschpizzaAlertTextView.setVisibility(View.VISIBLE); + } + else { + wunschpizzaAlertTextView.setVisibility(View.GONE); + } } private void fixRadioAndCheckbox(){ diff --git a/app/src/main/res/layout/activity_product_details.xml b/app/src/main/res/layout/activity_product_details.xml index 98cce56..c6efc30 100644 --- a/app/src/main/res/layout/activity_product_details.xml +++ b/app/src/main/res/layout/activity_product_details.xml @@ -111,6 +111,21 @@ android:textColor="@color/black" android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/> + +