From c85076548a39c4f9ba953c7ccee3482ec68004f8 Mon Sep 17 00:00:00 2001
From: cimenmus <cimenmus@macbook-MacBook-Pro.local>
Date: Wed, 8 Nov 2017 22:33:57 +0300
Subject: [PATCH] bug fixes

---
 .../android/adapter/recycler/MenuProductRecyclerAdapter.java | 4 ++--
 .../java/ch/pizzalink/android/fragment/CartFragment.java     | 3 ++-
 .../main/java/ch/pizzalink/android/helper/DisplayHelper.java | 5 +++++
 app/src/main/res/layout/fragment_cart.xml                    | 1 -
 app/src/main/res/layout/layout_bottomsheet.xml               | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java b/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
index 64e534d..51a0690 100644
--- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
+++ b/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
@@ -110,14 +110,14 @@ public class MenuProductRecyclerAdapter extends RecyclerView.Adapter<RecyclerVie
             case HOLDER_MENU_PRODUCT :
                 MenuProductViewHolder menuProductViewHolder = (MenuProductViewHolder) holder;
                 ImageLoadHelper.loadImage(menuProductViewHolder.productImageView, menuProductList.get(position).getImageURL());
-                menuProductViewHolder.productNameTextView.setText(menuProductList.get(position).getName());
+                TextHelper.setTextFromHTML(menuProductViewHolder.productNameTextView, menuProductList.get(position).getName());
                 menuProductViewHolder.productPriceTextView.setText(
                         PriceHelper.getPriceWithCurreny(menuProductList.get(position).getPrice()));
                 TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
 
                 if(isDescriptionVisible){
                     menuProductViewHolder.productIngredientsLayout.setVisibility(View.VISIBLE);
-                    menuProductViewHolder.productIngredientsTextView.setText(menuProductList.get(position).getDescription());
+                    TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
                 }
                 else {
                     menuProductViewHolder.productIngredientsLayout.setVisibility(View.GONE);
diff --git a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
index 33ab72d..efb3471 100644
--- a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
@@ -18,6 +18,7 @@ import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Locale;
 
 import butterknife.BindColor;
 import butterknife.BindString;
@@ -189,7 +190,7 @@ public class CartFragment extends BaseFragment {
     }
 
     private void setCartTotalFields(){
-        cartTotalLabelTextView.setText(cartInfoModel.getTotals().get(0).getTitle());
+        cartTotalLabelTextView.setText(cartInfoModel.getTotals().get(0).getTitle().toUpperCase(Locale.GERMAN));
         cartProductTotalTextView.setText(cartInfoModel.getTotals().get(0).getText());
     }
 
diff --git a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java
index 479eb1f..95c5917 100644
--- a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java
+++ b/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java
@@ -17,6 +17,11 @@ public class DisplayHelper {
         return displayMetrics.widthPixels;
     }
 
+    public static int getScreenHeightInPixel(){
+        DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics();
+        return displayMetrics.heightPixels;
+    }
+
     public static int dpToPx(int dp) {
         DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics();
         return Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml
index be3b76d..57c18cd 100644
--- a/app/src/main/res/layout/fragment_cart.xml
+++ b/app/src/main/res/layout/fragment_cart.xml
@@ -65,7 +65,6 @@
                 android:id="@+id/cartTotalLabelTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAllCaps="true"
                 android:textColor="@color/navy"
                 fontPath="fonts/Quicksand-Bold.ttf"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/layout_bottomsheet.xml b/app/src/main/res/layout/layout_bottomsheet.xml
index ffaa722..d5be8e9 100644
--- a/app/src/main/res/layout/layout_bottomsheet.xml
+++ b/app/src/main/res/layout/layout_bottomsheet.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingPrefix"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white">