From 36ead37021ef756fb2311a685ffef76935779290 Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Mon, 30 Jul 2018 01:11:47 +0200 Subject: [PATCH] Prices more beautiful --- .../de/sebse/fuplanner/fragments/canteen/MealAdapter.java | 8 +++++++- .../sebse/fuplanner/fragments/canteen/MealFragment.java | 2 +- app/src/main/res/values/strings.xml | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java index 975c614..bde18b2 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java @@ -1,5 +1,6 @@ package de.sebse.fuplanner.fragments.canteen; +import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,6 +18,11 @@ import de.sebse.fuplanner.tools.ui.StringViewHolder; public class MealAdapter extends BaseExpandableListAdapter { private Day mDay = null; + private Context mContext; + + public MealAdapter(Context context) { + mContext = context; + } @Override public String getChild(int groupPosition, int childPosititon) { @@ -90,7 +96,7 @@ public class MealAdapter extends BaseExpandableListAdapter { ItemViewHolder itemHolder = new ItemViewHolder(convertView); itemHolder.mTitle.setText(meal.getName()); itemHolder.mSubLeft.setText(meal.getCategory()); - itemHolder.mSubRight.setText(meal.getPriceStdnt()+"/"+meal.getPriceEmply()+"/"+meal.getPriceOther()); + itemHolder.mSubRight.setText(mContext.getResources().getString(R.string.prices, meal.getPriceStdnt(), meal.getPriceEmply(), meal.getPriceOther())); return convertView; } diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java index e53daa3..4bd3971 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java @@ -72,7 +72,7 @@ public class MealFragment extends Fragment { View view = inflater.inflate(R.layout.fragment_expandable_list_view, container, false); // Set the adapter ExpandableListView expandableListView = view.findViewById(R.id.list); - adapter = new MealAdapter(); + adapter = new MealAdapter(getContext()); expandableListView.setAdapter(adapter); // Getting SwipeContainerLayout diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0c701c..d5be6f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,4 +45,5 @@ Refresh Go to today Canteens + %1$.2f / %2$.2f / %3$.2f