karolina/weserplaner
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted layout of AllergenSheet.kt to display allergens and additives separately

Browse Source
This commit is contained in:
denizk0461
2023-05-14 21:44:05 +02:00
parent 559ec22734
commit 8f69b5f381
4 changed files with 101 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/sheet_allergen.xml
+45 -4
View File
@@ -70,12 +70,53 @@
android:orientation="vertical"
android:layout_marginBottom="8dp"/>
<TextView
android:id="@+id/text_content"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"/>
<!-- android:textSize="16sp"-->
android:layout_marginBottom="8dp"
android:orientation="vertical">
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:rowCount="2"
android:columnCount="2">
<TextView
android:id="@+id/text_allergens_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"/>
<TextView
android:id="@+id/text_allergens_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="fill_horizontal"/>
<TextView
android:id="@+id/text_additives_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:layout_gravity="top"/>
<TextView
android:id="@+id/text_additives_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:layout_gravity="fill_horizontal"/>
</GridLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<!-- <TextView-->
<!-- android:id="@+id/text_content"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="8dp"/>-->
<TextView
android:id="@+id/text_price"
app/src/main/res/values-de/strings.xml
+5 -2
View File
@@ -156,13 +156,16 @@
<string name="allergen_macadamia">Macadamianüsse</string>
<string name="allergen_celery">Sellerie</string>
<string name="allergen_mustard">Senf</string>
<string name="allergen_sulphides">Schwefeldioxide &amp; Sulfide von mehr als 10mg/kg or 10mg/l</string>
<string name="allergen_sulphides">Schwefeldioxide &amp; Sulfide von mehr als 10mg/kg bzw. 10mg/l</string>
<string name="allergen_lupins">Lupinen</string>
<string name="allergen_sesame">Sesam</string>
<string name="allergen_molluscs">Weichtiere</string>
<string name="allergens_none">Enthält weder Allergene noch Zusatzstoffe.</string>
<string name="allergens_contains">Enthält: %s.</string>
<string name="allergens_single_none">keine</string>
<string name="allergens_allergens_title">"Allergene: "</string>
<string name="allergens_additives_title">"Zusatzstoffe: "</string>
<string name="allergens_content_template">%s.</string>
<string name="canteen_page_allergen_sheet_error">Beim Laden dieses Angebots ist ein Fehler aufgetreten.</string>
<string name="nav_schedule">Stundenplan</string>
app/src/main/res/values/strings.xml
+4 -1
View File
@@ -166,7 +166,10 @@
<string name="allergen_molluscs">molluscs</string>
<string name="allergens_none">Contains no allergens or additives.</string>
<string name="allergens_contains">Contains: %s.</string>
<string name="allergens_single_none">none</string>
<string name="allergens_allergens_title">"Allergens: "</string>
<string name="allergens_additives_title">"Additives: "</string>
<string name="allergens_content_template" translatable="false">%s.</string>
<string name="canteen_page_allergen_sheet_error">An error occurred while trying to retrieve this offer.</string>
<string name="nav_schedule">Schedule</string>