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

Transitioned from a fairly custom solution to using a colour palette generated by the Material Theme Builder to simplify colour management. Also began work on a bottom sheet for displaying allergens and additives in canteen offers.

Browse Source
This commit is contained in:
denizk0461
2023-04-23 17:13:48 +02:00
parent fbad84aa09
commit b957172721
42 changed files with 456 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/fragment_settings.xml
+8 -12
View File
@@ -4,8 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".fragment.SettingsFragment"
android:background="?attr/colorBackground">
tools:context=".fragment.SettingsFragment">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
@@ -17,8 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="4dp"
style="@style/Widget.Material3.CardView.Outlined"
android:backgroundTint="?attr/colorCardBackground">
style="@style/Widget.Material3.CardView.Outlined">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
@@ -45,14 +43,14 @@
<!-- App version -->
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/button_refresh_schedule"
android:background="@drawable/layout_ripple"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:clickable="true"
android:focusable="true"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
android:paddingVertical="8dp"
android:background="?android:attr/selectableItemBackground">
<TextView
android:layout_width="wrap_content"
@@ -103,7 +101,6 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.materialswitch.MaterialSwitch
style="@style/SwitchTheme"
android:id="@+id/switch_quarter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -147,7 +144,6 @@
</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"
@@ -163,11 +159,11 @@
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"
android:paddingVertical="8dp">
android:paddingVertical="8dp"
android:background="?android:attr/selectableItemBackground">
<TextView
android:layout_width="wrap_content"
@@ -190,11 +186,11 @@
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"
android:paddingVertical="8dp">
android:paddingVertical="8dp"
android:background="?android:attr/selectableItemBackground">
<TextView
android:layout_width="wrap_content"