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

Fixed filtering behaviour, since it wouldn't recognise items with two preferences if only one had been selected; added icons for preferences

Browse Source
This commit is contained in:
denizk0461
2023-04-18 21:33:24 +02:00
parent c4d482f78f
commit 70a89ac681
24 changed files with 283 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/fragment_settings.xml
+42 -4
View File
@@ -77,10 +77,6 @@
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<!-- android:clickable="true"-->
<!-- android:focusable="true"-->
<!-- android:background="@drawable/layout_ripple"-->
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -115,6 +111,48 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- Highlight course -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_highlight"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_highlight_title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:text="@string/settings_highlight_subtitle"/>
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.materialswitch.MaterialSwitch
style="@style/SwitchTheme"
android:id="@+id/switch_highlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- App version -->
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/button_app_version"
app/src/main/res/layout/item_canteen.xml
+8 -7
View File
@@ -26,22 +26,23 @@
android:fontFamily="@font/lato_bolditalic"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="8dp"/>
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/line_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/text_category"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginTop="8dp">
<TextView
android:id="@+id/temp_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!-- <TextView-->
<!-- android:id="@+id/temp_content"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"/>-->
</androidx.appcompat.widget.LinearLayoutCompat>
app/src/main/res/layout/item_canteen_line.xml
+27
View File
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/image_view_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView
android:id="@+id/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"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_icon.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="20dp"
android:layout_height="20dp">
<ImageView
android:id="@+id/image_view"
android:layout_width="20dp"
android:layout_height="20dp"
android:scaleType="centerInside"
app:tint="?attr/colorText"/>
</androidx.appcompat.widget.LinearLayoutCompat>
app/src/main/res/layout/item_scrollable_page.xml
+2 -1
View File
@@ -8,7 +8,8 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/page_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_animation_fall_down">
</androidx.recyclerview.widget.RecyclerView>