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/color/bottom_nav_color.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorPrimary" />
<!-- <item android:state_checked="false" android:color="@color/your_color"/>-->
</selector>
app/src/main/res/color/card_background_default.xml
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorCardBackground"/>
</selector>
app/src/main/res/color/card_background_highlight.xml
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorPrimaryTranslucent"/>
</selector>
app/src/main/res/color/item_chip_background.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorPrimaryTranslucent" />
<item android:color="?attr/colorBackground" />
</selector>
app/src/main/res/color/item_chip_outline.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@android:color/transparent" />
<item android:color="?attr/colorTextHintLighter" />
</selector>
app/src/main/res/color/list_nav_bar_icon.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorOnPrimary" />
<item android:color="?attr/colorTextHint" />
</selector>
app/src/main/res/color/list_nav_bar_text.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorText" />
<item android:color="?attr/colorTextHint" />
</selector>
app/src/main/res/color/list_switch_decoration.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorPrimary" />
<item android:color="?attr/colorTextHint" />
</selector>
app/src/main/res/color/list_switch_thumb.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorText" />
<item android:color="?attr/colorTextHint" />
</selector>
app/src/main/res/color/list_switch_track.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorPrimary" />
<item android:color="?attr/colorSwitchTrack" />
</selector>
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>
app/src/main/res/values-night/themes.xml
+30 -29
View File
@@ -1,36 +1,37 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- Base application theme. -->
<style name="Base.Theme.StudIPTimetable" parent="Theme.Material3.DayNight.NoActionBar">
<style name="Base.Theme.StudIPTimetable" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_dark_background</item>
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
<item name="colorPrimary">@color/primaryNight</item>
<item name="colorPrimaryTranslucent">@color/primaryNightTranslucent</item>
<item name="rippleColor">@color/primaryNight</item>
<item name="colorOnPrimary">@color/colorTextNight</item>
<item name="colorText">@color/colorTextNight</item>
<item name="colorTextHint">@color/colorTextHintNight</item>
<item name="colorTextHintLighter">@color/colorTextHintLighterNight</item>
<item name="colorBackground">@color/colorBackgroundNight</item>
<item name="colorCardBackground">@color/colorCardBackgroundNight</item>
<item name="colorSwitchTrack">@color/colorSwitchTrackNight</item>
<item name="android:textColor">?attr/colorText</item>
<item name="android:windowBackground">@color/colorBackgroundNight</item>
<item name="colorNavHighlight">@color/highlightNight</item>
</style>
<!-- <style name="NavigationViewItemIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">-->
<!-- <item name="android:color">@color/primaryNight</item>-->
<!-- </style>-->
<style name="SelectableItemTheme">
<item name="colorControlHighlight">@color/primaryNight</item>
<item name="android:textColor">@color/md_theme_dark_onSurfaceVariant</item>
</style>
<style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
<item name="dividerColor">@color/colorTextHintLighterNight</item>
<item name="dividerColor">@color/md_theme_dark_outlineVariant</item>
</style>
</resources>
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>