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/activity_fetcher.xml
+1 -2
View File
@@ -2,8 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorBackground">
android:layout_height="match_parent">
<WebView
android:id="@+id/webview"
app/src/main/res/layout/activity_main.xml
-1
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app/src/main/res/layout/content_main.xml
+3 -18
View File
@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="?attr/colorBackground">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar"
@@ -13,8 +12,7 @@
android:fitsSystemWindows="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="?attr/colorBackground">
app:layout_constraintEnd_toEndOf="parent">
<TextView
android:id="@+id/app_title_bar"
@@ -45,21 +43,8 @@
android:layout_height="wrap_content"
app:menu="@menu/nav_view_items"
app:labelVisibilityMode="selected"
app:itemActiveIndicatorStyle="@style/NavigationViewItemIndicator"
app:itemTextColor="@color/list_nav_bar_text"
app:itemIconTint="@color/list_nav_bar_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="?attr/colorBackground"/>
<com.google.android.material.divider.MaterialDivider
style="@style/DividerTheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/nav_view"/>
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_canteen.xml
+11 -15
View File
@@ -2,16 +2,13 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorBackground"
android:orientation="vertical">
android:layout_height="match_parent">
<com.google.android.material.tabs.TabLayout
android:id="@+id/day_tab_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:tabMode="scrollable"
android:background="@android:color/transparent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@@ -52,74 +49,73 @@
android:id="@+id/chips_preference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:animateLayoutChanges="true">
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_fair"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_fair"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_fish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_fish"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_poultry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_poultry"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_lamb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_lamb"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_vital"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_vital"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_beef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_beef"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_pork"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_pork"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_vegetarian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_vegetarian"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_vegan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pref_vegan"/>
<com.google.android.material.chip.Chip
style="@style/ChipStyle"
style="@style/Widget.Material3.Chip.Filter"
android:id="@+id/chip_pref_game"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app/src/main/res/layout/fragment_event.xml
+1 -3
View File
@@ -4,15 +4,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.EventFragment"
android:background="?attr/colorBackground">
tools:context=".fragment.EventFragment">
<com.google.android.material.tabs.TabLayout
android:id="@+id/day_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabMode="scrollable"
android:background="@android:color/transparent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
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"
app/src/main/res/layout/item_canteen.xml
+1 -9
View File
@@ -9,14 +9,11 @@
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.Material3.CardView.Outlined"
android:backgroundTint="?attr/colorCardBackground"
app:strokeColor="?attr/colorTextHintLighter">
style="@style/Widget.Material3.CardView.Outlined">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- android:padding="16dp"-->
<TextView
android:id="@+id/text_category"
@@ -42,11 +39,6 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp">
<!-- <TextView-->
<!-- android:id="@+id/temp_content"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"/>-->
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_canteen_line.xml
+2 -2
View File
@@ -4,11 +4,11 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:background="@drawable/layout_ripple"
android:clickable="true"
android:focusable="true"
android:paddingHorizontal="16dp"
android:paddingVertical="2dp">
android:paddingVertical="2dp"
android:background="?android:attr/selectableItemBackground">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/image_view_container"
app/src/main/res/layout/item_event.xml
+1 -2
View File
@@ -10,8 +10,7 @@
android:id="@+id/card_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.Material3.CardView.Outlined"
android:backgroundTint="@color/card_background_default">
style="@style/Widget.Material3.CardView.Outlined">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
app/src/main/res/layout/item_icon.xml
+1 -1
View File
@@ -9,6 +9,6 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:scaleType="centerInside"
app:tint="?attr/colorText"/>
app:tint="?attr/colorOnSurfaceVariant" />
</androidx.appcompat.widget.LinearLayoutCompat>
app/src/main/res/layout/sheet_allergen.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<TextView
android:id="@+id/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"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical">
<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"/>
</androidx.core.widget.NestedScrollView>
</LinearLayout>