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

Added further information to be shown in AllergenSheet.kt

Browse Source
This commit is contained in:
denizk0461
2023-04-24 11:21:52 +02:00
parent 6f5df7dd55
commit b938352c53
8 changed files with 164 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/item_sheet_preference.xml
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal">
<ImageView
android:id="@+id/preference_image"
android:layout_width="20dp"
android:layout_height="20dp"
android:scaleType="centerInside"
app:tint="?attr/colorOnSurfaceVariant"
android:layout_marginEnd="8dp"/>
<TextView
android:id="@+id/preference_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.appcompat.widget.LinearLayoutCompat>
app/src/main/res/layout/sheet_allergen.xml
+36 -13
View File
@@ -5,30 +5,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingHorizontal="24dp"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<TextView
android:id="@+id/title"
android:id="@+id/text_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_blackitalic"
android:layout_marginBottom="2dp"/>
<TextView
android:id="@+id/text_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic"
android:layout_marginBottom="8dp"
android:layout_marginHorizontal="24dp"/>
android:layout_marginBottom="8dp"/>
<androidx.core.widget.NestedScrollView
<!-- <androidx.core.widget.NestedScrollView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:scrollbars="vertical">-->
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/container_preferences"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical">
android:orientation="vertical"
android:layout_marginBottom="8dp"/>
<TextView
android:id="@+id/text_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginHorizontal="24dp"
android:paddingBottom="16dp"/>
<TextView
android:id="@+id/text_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"/>
<!-- android:textSize="16sp"-->
</androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/text_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:fontFamily="@font/lato_bolditalic"
android:layout_marginTop="4dp"/>
<!-- </androidx.core.widget.NestedScrollView>-->
</LinearLayout>
app/src/main/res/values-de/strings.xml
-2
View File
@@ -104,6 +104,4 @@
<string name="settings_app_version">App-Verison</string>
<string name="with_love">mit ♡️ aus Bremen-Osterholz\von denizk0461 \\__*</string>
<string name="de4thSpirit">In our hearts, she lives forevermore</string>
</resources>
app/src/main/res/values/strings.xml
+3 -1
View File
@@ -22,6 +22,8 @@
<string name="cafeteria_bhv">Cafeteria Bremerhaven</string>
<string name="mensa_hfk">Interimsmensa HfK</string>
<string name="sheet_category" translatable="false">[ %s ]</string>
<!-- dietary preferences -->
<string name="pref_fair">Fair</string> <!-- is this really the best name? what about 'animal welfare'? -->
<string name="pref_fish">Fish</string>
@@ -105,5 +107,5 @@
<string name="with_love">with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__*</string>
<string name="de4thSpirit">In our hearts, she lives forevermore</string>
<string name="de4thSpirit" translatable="false">In our hearts, she lives forevermore</string>
</resources>