From 953185425bae125eea83a55a8c63564797adf953 Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Sun, 17 Mar 2019 20:52:34 +0100
Subject: [PATCH] fixed menu formatting

---
 .../seil0/projectlaogai/fragments/HomeFragment.kt      | 10 ++++++----
 .../seil0/projectlaogai/fragments/MensaFragment.kt     |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
index 8042c52..329152e 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
@@ -41,6 +41,7 @@ import org.mosad.seil0.projectlaogai.hsoparser.NotRetardedCalendar
 import org.mosad.seil0.projectlaogai.uicomponents.LessonCardView
 import org.mosad.seil0.projectlaogai.uicomponents.LessonTextView
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * The "home" controller class
@@ -90,15 +91,16 @@ class HomeFragment : Fragment() {
                     // get the index of the first meal, not a "Schneller Teller"
                     loop@ for ((i, meal) in dayMeals.withIndex()) {
                         if (meal.heading.contains("Essen")) {
-                            for ((j, part) in dayMeals[i].parts.withIndex()) {
+
+                            dayMeals[i].parts.forEachIndexed { index, part ->
                                 txtViewMenu1.append(part)
-                                if (j < (dayMeals[i].parts.size - 2))
+                                if (index < (dayMeals[i].parts.size - 1))
                                     txtViewMenu1.append("\n")
                             }
 
-                            for ((j, part) in dayMeals[i + 1].parts.withIndex()) {
+                            dayMeals[i + 1].parts.forEachIndexed { index, part ->
                                 txtViewMenu2.append(part)
-                                if (j < (dayMeals[i + 1].parts.size - 2))
+                                if (index < (dayMeals[i + 1].parts.size - 1))
                                     txtViewMenu2.append("\n")
                             }
 
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
index d09bfc4..c56088f 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
@@ -82,7 +82,7 @@ class MensaFragment : Fragment() {
 
                         meal.parts.forEachIndexed { partIndex, part ->
                             menuViewMenu.getTxtViewMenu().append(part)
-                            if(partIndex < (meal.parts.size - 2))
+                            if(partIndex < (meal.parts.size - 1))
                                 menuViewMenu.getTxtViewMenu().append("\n")
                         }
 
@@ -92,8 +92,6 @@ class MensaFragment : Fragment() {
                             cardViewMensaDay.getLinLayoutMensaDay().addView(menuViewMenu)
                     }
 
-                    println("$dayIndex:" + cardViewMensaDay.getLinLayoutMensaDay().childCount) // remove
-
                     if(cardViewMensaDay.getLinLayoutMensaDay().childCount > 1)
                         linLayoutMensaFragment.addView(cardViewMensaDay)