Commit c9b720eb authored by Toni Beier's avatar Toni Beier

Merge branch '26-mensa-absturz-beim-oeffnen-der-mensa' into 'develop'

Beheben eines Absturzes beim öffnen der Mensa

Closes #26

See merge request OpenASiST/openasist4android_core!18
parents 45c79b39 ee4f2a7d
......@@ -102,10 +102,6 @@ public class ExpandableMensaListAdapter extends BaseExpandableListAdapter {
List<MenuPriceDescription> menuPriceDescriptions = new ArrayList<>(canteenMenu.getPrices());
if(menuPriceDescriptions.isEmpty()){
return convertView;
}
int PriceSetting = 0;
if(price != null){
......@@ -153,15 +149,15 @@ public class ExpandableMensaListAdapter extends BaseExpandableListAdapter {
viewHolder = (ViewHolder) convertView.getTag();
}
/* textView = (TextView)convertView.findViewById(R.id.listItemTitle);
ImageView imageView = (ImageView)convertView.findViewById(R.id.listItemMainLogo);
TextView textView1 = (TextView)convertView.findViewById(R.id.listItemDescription);
TextView prices = (TextView)convertView.findViewById(R.id.canteen_prices);
*/
viewHolder.titel.setText(childText);
viewHolder.descText.setText(descript);
viewHolder.prices.setText(sb.toString());
if(sb.toString() == null || sb.toString().isEmpty())
{
viewHolder.prices.setText(R.string.module_canteen_noPriceAvailable);
}
else{
viewHolder.prices.setText(sb.toString());
}
if(image != null && !image.isEmpty()){
//new DownloadImageTask(viewHolder.imageView).execute(canteenMenu.getImgUrlBig());
......@@ -173,7 +169,6 @@ public class ExpandableMensaListAdapter extends BaseExpandableListAdapter {
viewHolder.linearLayout.setVisibility(View.GONE);
}
return convertView;
}
......
......@@ -42,6 +42,7 @@
<string name="module_canteen_default_canteen">Mensa Straße der Nationen</string>
<string name="module_canteen_noCanteen_found_toast">Couldna\t detect a canteen. Maybe there is no network available.</string>
<string name="module_canteen_settings_favorit">Favorit Canteen</string>
<string name="module_canteen_noPriceAvailable">No Price available</string>
<string name="module_course_add_wait_title">Please wait</string>
<string name="module_course_add_wait_desc">Your schedule is being imported</string>
......
......@@ -46,6 +46,7 @@
<string name="module_canteen_default_canteen">Mensa Straße der Nationen</string>
<string name="module_canteen_noCanteen_found_toast">Es konnte keine Mensa gefunden werden. Möglicherweise besteht keine Internetverbindung</string>
<string name="module_canteen_settings_favorit">Favoriten Mensa</string>
<string name="module_canteen_noPriceAvailable">Kein Preis verfügbar</string>
<string name="module_course_add_wait_title">Bitte warten Sie</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment