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/values/colors.xml
+86 -21
View File
@@ -1,35 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<!-- auto-generated using https://m3.material.io/theme-builder#/custom -->
<color name="seed">#c85848</color>
<color name="md_theme_light_primary">#A33D2F</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#FFDAD4</color>
<color name="md_theme_light_onPrimaryContainer">#410000</color>
<color name="md_theme_light_secondary">#775651</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#FFDAD4</color>
<color name="md_theme_light_onSecondaryContainer">#2C1511</color>
<color name="md_theme_light_tertiary">#705C2E</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#FBDFA6</color>
<color name="md_theme_light_onTertiaryContainer">#251A00</color>
<color name="md_theme_light_error">#BA1A1A</color>
<color name="md_theme_light_errorContainer">#FFDAD6</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_onErrorContainer">#410002</color>
<color name="md_theme_light_background">#FFFBFF</color>
<color name="md_theme_light_onBackground">#201A19</color>
<color name="md_theme_light_surface">#FFFBFF</color>
<color name="md_theme_light_onSurface">#201A19</color>
<color name="md_theme_light_surfaceVariant">#F5DDDA</color>
<color name="md_theme_light_onSurfaceVariant">#534341</color>
<color name="md_theme_light_outline">#857370</color>
<color name="md_theme_light_inverseOnSurface">#FBEEEC</color>
<color name="md_theme_light_inverseSurface">#362F2E</color>
<color name="md_theme_light_inversePrimary">#FFB4A8</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#A33D2F</color>
<color name="md_theme_light_outlineVariant">#D8C2BE</color>
<color name="md_theme_light_scrim">#000000</color>
<color name="md_theme_dark_primary">#FFB4A8</color>
<color name="md_theme_dark_onPrimary">#630E07</color>
<color name="md_theme_dark_primaryContainer">#83251A</color>
<color name="md_theme_dark_onPrimaryContainer">#FFDAD4</color>
<color name="md_theme_dark_secondary">#E7BDB6</color>
<color name="md_theme_dark_onSecondary">#442925</color>
<color name="md_theme_dark_secondaryContainer">#5D3F3A</color>
<color name="md_theme_dark_onSecondaryContainer">#FFDAD4</color>
<color name="md_theme_dark_tertiary">#DEC48C</color>
<color name="md_theme_dark_onTertiary">#3E2E04</color>
<color name="md_theme_dark_tertiaryContainer">#564419</color>
<color name="md_theme_dark_onTertiaryContainer">#FBDFA6</color>
<color name="md_theme_dark_error">#FFB4AB</color>
<color name="md_theme_dark_errorContainer">#93000A</color>
<color name="md_theme_dark_onError">#690005</color>
<color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
<color name="md_theme_dark_background">#201A19</color>
<color name="md_theme_dark_onBackground">#EDE0DD</color>
<color name="md_theme_dark_surface">#201A19</color>
<color name="md_theme_dark_onSurface">#EDE0DD</color>
<color name="md_theme_dark_surfaceVariant">#534341</color>
<color name="md_theme_dark_onSurfaceVariant">#D8C2BE</color>
<color name="md_theme_dark_outline">#A08C89</color>
<color name="md_theme_dark_inverseOnSurface">#201A19</color>
<color name="md_theme_dark_inverseSurface">#EDE0DD</color>
<color name="md_theme_dark_inversePrimary">#A33D2F</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_surfaceTint">#FFB4A8</color>
<color name="md_theme_dark_outlineVariant">#534341</color>
<color name="md_theme_dark_scrim">#000000</color>
<!-- OBSOLETE: custom defined colours -->
<!-- <color name="black">#FF000000</color>-->
<!-- <color name="white">#FFFFFFFF</color>-->
<color name="brightfuckingpink">#FF46BB</color> <!-- for debug purposes -->
<!-- colours i defined -->
<color name="primaryDay">#B2665A</color>
<color name="primaryDayTranslucent">#80B2665A</color>
<color name="primaryNight">#995348</color>
<color name="primaryNightTranslucent">#80995348</color>
<!-- &lt;!&ndash; colours i defined &ndash;&gt;-->
<!-- <color name="primaryDay">#B2665A</color>-->
<!-- <color name="primaryDayTranslucent">#80B2665A</color>-->
<!-- <color name="primaryNight">#995348</color>-->
<!-- <color name="primaryNightTranslucent">#80995348</color>-->
<color name="highlightDay">#871D1E</color>
<color name="highlightNight">#CB9890</color>
<!-- <color name="highlightDay">#871D1E</color>-->
<!-- <color name="highlightNight">#CB9890</color>-->
<color name="colorTextDay">#141414</color>
<color name="colorTextNight">#CDCBCB</color>
<!-- <color name="colorTextDay">#141414</color>-->
<!-- <color name="colorTextNight">#CDCBCB</color>-->
<color name="colorTextHintDay">#2A2828</color>
<color name="colorTextHintNight">#B9B6B6</color>
<!-- <color name="colorTextHintDay">#2A2828</color>-->
<!-- <color name="colorTextHintNight">#B9B6B6</color>-->
<color name="colorTextHintLighterDay">#AFACAC</color>
<color name="colorTextHintLighterNight">#5E5A5A</color>
<!-- <color name="colorTextHintLighterDay">#AFACAC</color>-->
<!-- <color name="colorTextHintLighterNight">#5E5A5A</color>-->
<color name="colorBackgroundDay">#EBEBEB</color>
<color name="colorBackgroundNight">#151414</color>
<!-- <color name="colorBackgroundDay">#EBEBEB</color>-->
<!-- <color name="colorBackgroundNight">#151414</color>-->
<color name="colorCardBackgroundDay">#E0E0E0</color>
<color name="colorCardBackgroundNight">#1F1E1E</color>
<!-- <color name="colorCardBackgroundDay">#E0E0E0</color>-->
<!-- <color name="colorCardBackgroundNight">#1F1E1E</color>-->
<color name="colorSwitchTrackDay">#D6D6D6</color>
<color name="colorSwitchTrackNight">#2A2828</color>
<!-- <color name="colorSwitchTrackDay">#D6D6D6</color>-->
<!-- <color name="colorSwitchTrackNight">#2A2828</color>-->
<!-- <color name="colorPrimaryOnContrastLight">#E6898B</color>-->
<!-- <color name="colorPrimaryOnContrastDark">#B77166</color>-->
app/src/main/res/values/themes.xml
+30 -44
View File
@@ -1,53 +1,39 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- Base application theme. -->
<style name="Base.Theme.StudIPTimetable" parent="Theme.Material3.DayNight.NoActionBar">
<!-- <item name="fontFamily">@font/lato_regular</item>-->
<style name="Base.Theme.StudIPTimetable" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="colorPrimary">@color/primaryDay</item>
<item name="colorPrimaryTranslucent">@color/primaryDayTranslucent</item>
<item name="rippleColor">@color/primaryDay</item>
<item name="colorOnPrimary">@color/colorBackgroundDay</item>
<item name="colorText">@color/colorTextDay</item>
<item name="colorTextHint">@color/colorTextHintDay</item>
<item name="colorTextHintLighter">@color/colorTextHintLighterDay</item>
<item name="colorBackground">@color/colorBackgroundDay</item>
<item name="colorCardBackground">@color/colorCardBackgroundDay</item>
<item name="colorSwitchTrack">@color/colorSwitchTrackDay</item>
<item name="android:textColor">?attr/colorText</item>
<item name="android:windowBackground">@color/colorBackgroundDay</item>
<item name="colorNavHighlight">@color/highlightDay</item>
<item name="android:textColor">@color/md_theme_light_onSurfaceVariant</item>
</style>
<style name="Theme.StudIPTimetable" parent="Base.Theme.StudIPTimetable" />
<style name="SwitchTheme" parent="Widget.Material3.CompoundButton.MaterialSwitch">
<item name="thumbTint">@color/list_switch_thumb</item>
<item name="trackTint">@color/list_switch_track</item>
<item name="trackDecorationTint">@color/list_switch_decoration</item>
</style>
<style name="NavigationViewItemIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
<item name="android:color">@color/primaryDayTranslucent</item>
</style>
<style name="SelectableItemTheme">
<item name="colorControlHighlight">@color/primaryDay</item>
</style>
<style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
<item name="dividerColor">@color/colorTextHintLighterDay</item>
</style>
<style name="ChipStyle" parent="Widget.Material3.Chip.Filter">
<item name="chipStrokeColor">@color/item_chip_outline</item>
<item name="android:textColor">?attr/colorText</item>
<item name="rippleColor">?attr/colorPrimary</item>
<item name="chipBackgroundColor">@color/item_chip_background</item>
<item name="chipIconTint">?attr/colorText</item>
<item name="dividerColor">@color/md_theme_light_outlineVariant</item>
</style>
</resources>