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

bug fixes

Browse Source
This commit is contained in:
cimenmus
2017-11-08 22:33:57 +03:00
parent e7c09d73d6
commit c85076548a
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
View File

@@ -110,14 +110,14 @@ public class MenuProductRecyclerAdapter extends RecyclerView.Adapter<RecyclerVie
case HOLDER_MENU_PRODUCT : case HOLDER_MENU_PRODUCT :
MenuProductViewHolder menuProductViewHolder = (MenuProductViewHolder) holder; MenuProductViewHolder menuProductViewHolder = (MenuProductViewHolder) holder;
ImageLoadHelper.loadImage(menuProductViewHolder.productImageView, menuProductList.get(position).getImageURL()); 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( menuProductViewHolder.productPriceTextView.setText(
PriceHelper.getPriceWithCurreny(menuProductList.get(position).getPrice())); PriceHelper.getPriceWithCurreny(menuProductList.get(position).getPrice()));
TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription()); TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
if(isDescriptionVisible){ if(isDescriptionVisible){
menuProductViewHolder.productIngredientsLayout.setVisibility(View.VISIBLE); menuProductViewHolder.productIngredientsLayout.setVisibility(View.VISIBLE);
menuProductViewHolder.productIngredientsTextView.setText(menuProductList.get(position).getDescription()); TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
} }
else { else {
menuProductViewHolder.productIngredientsLayout.setVisibility(View.GONE); menuProductViewHolder.productIngredientsLayout.setVisibility(View.GONE);

3
app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
View File

@@ -18,6 +18,7 @@ import com.afollestad.materialdialogs.MaterialDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import butterknife.BindColor; import butterknife.BindColor;
import butterknife.BindString; import butterknife.BindString;
@@ -189,7 +190,7 @@ public class CartFragment extends BaseFragment {
} }
private void setCartTotalFields(){ 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()); cartProductTotalTextView.setText(cartInfoModel.getTotals().get(0).getText());
} }

5
app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java
View File

@@ -17,6 +17,11 @@ public class DisplayHelper {
return displayMetrics.widthPixels; return displayMetrics.widthPixels;
} }
public static int getScreenHeightInPixel(){
DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics();
return displayMetrics.heightPixels;
}
public static int dpToPx(int dp) { public static int dpToPx(int dp) {
DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics(); DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics();
return Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); return Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));

1
app/src/main/res/layout/fragment_cart.xml
View File

@@ -65,7 +65,6 @@
android:id="@+id/cartTotalLabelTextView" android:id="@+id/cartTotalLabelTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@color/navy" android:textColor="@color/navy"
fontPath="fonts/Quicksand-Bold.ttf" fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"

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

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix" tools:ignore="MissingPrefix"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/white"> android:background="@color/white">