From 2aca6fb5233433f218f353f9a313300a1de9c5ff Mon Sep 17 00:00:00 2001
From: cimenmus <cimenmus@macbook-MacBook-Pro.local>
Date: Thu, 25 Jan 2018 00:40:38 +0300
Subject: [PATCH] bug fixes

---
 .../android/activity/ProductPropertiesActivity.java |  3 +++
 .../android/model/menu/MenuProductModel.java        |  1 +
 .../main/res/layout/activity_product_properties.xml | 13 +++++++++++++
 app/src/main/res/layout/row_menu_product.xml        |  2 +-
 app/src/main/res/values/strings.xml                 |  2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

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 @@
 
         </RelativeLayout>
 
+        <TextView
+            android:id="@+id/productDescriptionTextView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            android:paddingLeft="24dp"
+            android:paddingStart="24dp"
+            android:paddingRight="24dp"
+            android:paddingEnd="24dp"
+            android:textColor="@color/navy"
+            android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
+
         <Button
             android:id="@+id/addToCartButton"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/row_menu_product.xml b/app/src/main/res/layout/row_menu_product.xml
index 2dc4958..2f1d3aa 100644
--- a/app/src/main/res/layout/row_menu_product.xml
+++ b/app/src/main/res/layout/row_menu_product.xml
@@ -51,7 +51,7 @@
             android:layout_height="match_parent"
             android:background="@color/row_product_ingredients_background"
             android:padding="8dp"
-            android:textColor="@android:color/black"
+            android:textColor="@color/navy"
             android:gravity="center"
             android:layout_centerInParent="true"
             android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
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 @@
     <string name="done_order">FERTIG</string>    
     <string-array name="stepperLabels">
         <item>Lieferungsart</item>
-        <item>Lieferungadresseadresse</item>        
+        <item>Lieferungadresse</item>        
         <item>Bezahlverfahren</item>
         <item>Nachricht</item>        
         <item>Betrag</item>