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

Canteen items are now individually clickable to signal that they are separate items; BUG: filtering does not work anymore

Browse Source
This commit is contained in:
denizk0461
2023-04-20 10:05:24 +02:00
parent 5d58d25386
commit b9378901f4
5 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/fragment_settings.xml
+1 -1
View File
@@ -156,10 +156,10 @@
<!-- App version -->
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/button_app_version"
android:background="@drawable/layout_ripple"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/layout_ripple"
android:clickable="true"
android:focusable="true"
android:paddingHorizontal="16dp"
app/src/main/res/layout/item_canteen.xml
+7 -4
View File
@@ -15,8 +15,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp">
android:layout_height="wrap_content">
<!-- android:padding="16dp"-->
<TextView
android:id="@+id/text_category"
@@ -26,7 +26,9 @@
android:fontFamily="@font/lato_bolditalic"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="16dp"
android:layout_marginHorizontal="16dp"/>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/line_container"
@@ -37,7 +39,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:orientation="vertical"
android:layout_marginTop="8dp">
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp">
<!-- <TextView-->
<!-- android:id="@+id/temp_content"-->
app/src/main/res/layout/item_canteen_line.xml
+17 -3
View File
@@ -3,7 +3,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal">
android:orientation="horizontal"
android:background="@drawable/layout_ripple"
android:clickable="true"
android:focusable="true"
android:paddingHorizontal="16dp"
android:paddingVertical="2dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/image_view_container"
@@ -15,13 +20,22 @@
app:layout_constraintStart_toStartOf="parent"/>
<TextView
android:id="@+id/content"
android:id="@+id/text_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/image_view_container"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toStartOf="@+id/text_price"/>
<TextView
android:id="@+id/text_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:fontFamily="@font/lato_bolditalic"/>
</androidx.constraintlayout.widget.ConstraintLayout>