diff --git a/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java b/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java
index bc6bd71..a4a001d 100644
--- a/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java
@@ -39,6 +39,7 @@ import ch.pizzalink.android.helper.ImageLoadHelper;
import ch.pizzalink.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper;
+import ch.pizzalink.android.helper.TextHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddProductToBasketResponseModel;
import ch.pizzalink.android.model.AddToBasketOptionModel;
@@ -61,6 +62,7 @@ public class ProductPropertiesActivity extends BaseActivity {
@BindView(R.id.productImageView) ImageView productImageView;
@BindView(R.id.productNameTextView) TextView productNameTextView;
@BindView(R.id.productPriceTextView) TextView productPriceTextView;
+ @BindView(R.id.productDescriptionTextView) TextView productDescriptionTextView;
@BindView(R.id.addToCartButton) Button addToCartButton;
@BindView(R.id.radioRecyclerHeaderTextView) TextView radioRecyclerHeaderTextView;
@BindView(R.id.radioRecyclerView) RecyclerView radioRecyclerView;
@@ -230,6 +232,7 @@ public class ProductPropertiesActivity extends BaseActivity {
}
private void setFields(){
+ TextHelper.setTextFromHTML(productDescriptionTextView, menuProductModel.getDescription());
ImageLoadHelper.loadImage(productImageView, menuProductModel.getImageURL());
productNameTextView.setText(menuProductModel.getName());
productPriceTextView.setText(PriceHelper.getPriceWithCurreny(menuProductModel.getPrice()));
diff --git a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java b/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java
index b65cc71..292c4dc 100644
--- a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java
+++ b/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java
@@ -78,6 +78,7 @@ public class MenuProductModel implements Serializable {
return ProductOptionType.RADIO_AND_CHECKBOX;
default:
return ProductOptionType.NO_TYPE;
+ //return ProductOptionType.RADIO_AND_CHECKBOX;
}
}
diff --git a/app/src/main/res/layout/activity_product_properties.xml b/app/src/main/res/layout/activity_product_properties.xml
index deb2ded..8f41e8c 100644
--- a/app/src/main/res/layout/activity_product_properties.xml
+++ b/app/src/main/res/layout/activity_product_properties.xml
@@ -96,6 +96,19 @@
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b2fa8c6..0dacfce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -123,7 +123,7 @@
FERTIG
- Lieferungsart
- - Lieferungadresseadresse
+ - Lieferungadresse
- Bezahlverfahren
- Nachricht
- Betrag