From 3d7f6f961a8937c99443307faf474d8834c2fe2a Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Mon, 26 Nov 2018 12:56:06 +0100
Subject: [PATCH] the menus text is now selectable

* fixed some formating errors at the mensa screen
---
 .../mosad/seil0/projectlaogai/fragments/MensaFragment.kt   | 4 +++-
 .../org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt | 2 +-
 app/src/main/res/layout/fragment_home.xml                  | 7 +++++--
 app/src/main/res/layout/menu_cardview.xml                  | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

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 420f65d..652a893 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
@@ -84,8 +84,10 @@ class MensaFragment : Fragment() {
                             val menuViewMenu = MenuCardView(context!!, null)
                             menuViewMenu.setMenuHeading(meal.heading)
 
-                            for(part in meal.parts) {
+                            for ((i, part) in meal.parts.withIndex()) {
                                 menuViewMenu.getTxtViewMenu().append(part)
+                                if(i < (meal.parts.size - 2))
+                                    menuViewMenu.getTxtViewMenu().append("\n")
                             }
 
                             cardViewMensaDay.setDayHeading(meal.day) //TODO move this out of the first for loop, performance!!
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt
index b45ac4d..d4016d5 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt
@@ -43,7 +43,7 @@ class MensaParser {
             for (i in 0 .. (element.select("div.row  h4").size - 1)) {
                 try {
                     val heading = element.select("div.row  h4")[i].text()
-                    val parts = ArrayList<String>(element.select("div.row").select("div.menu-info")[i].html().substringBefore("<span").replace("<br>", "").split("\n"))
+                    val parts = ArrayList<String>(element.select("div.row").select("div.menu-info")[i].html().substringBefore("<span").replace("<br>", " ").split("\n"))
                     val additives = element.select("div.row").select("div.menu-info")[i].select("span.show-with-allergenes").text()
 
                     mealList.add(Meal(day, heading, parts, additives))
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 5849fb4..dc11fb0 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -36,13 +36,15 @@
                         android:textStyle="bold" android:textAlignment="center" android:textSize="16sp"
                         android:typeface="sans" android:fontFamily="sans-serif" android:paddingBottom="5dp"/>
                 <TextView
+                        android:id="@+id/txtViewMenu1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:fontFamily="sans-serif"
                         android:textAlignment="center"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                        android:typeface="sans" android:id="@+id/txtViewMenu1"/>
+                        android:typeface="sans"
+                        android:textIsSelectable="true"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
 
@@ -75,7 +77,8 @@
                         android:textAlignment="center"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                        android:typeface="sans"/>
+                        android:typeface="sans"
+                        android:textIsSelectable="true"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
         <ScrollView
diff --git a/app/src/main/res/layout/menu_cardview.xml b/app/src/main/res/layout/menu_cardview.xml
index 7d6b1c7..a8ee9b4 100644
--- a/app/src/main/res/layout/menu_cardview.xml
+++ b/app/src/main/res/layout/menu_cardview.xml
@@ -35,7 +35,8 @@
                 android:textAlignment="center"
                 android:textSize="16sp"
                 android:textStyle="bold"
-                android:typeface="sans"/>
+                android:typeface="sans"
+                android:textIsSelectable="true"/>
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file