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

Highlighted course is now highlighted with the primary colour, 50% translucent

Browse Source
This commit is contained in:
denizk0461
2023-04-20 14:30:48 +02:00
parent b5f5e06b7f
commit 07a2902367
9 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/color/card_background_default.xml
+4
View File
@@ -0,0 +1,4 @@
<?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
@@ -0,0 +1,4 @@
<?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
+1 -1
View File
@@ -1,5 +1,5 @@
<?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="true" android:color="?attr/colorPrimaryTranslucent" />
<item android:color="?attr/colorBackground" />
</selector>
app/src/main/res/layout/item_event.xml
+1 -1
View File
@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.Material3.CardView.Outlined"
android:backgroundTint="?attr/colorCardBackground">
android:backgroundTint="@color/card_background_default">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
app/src/main/res/values-night/themes.xml
+4 -3
View File
@@ -3,6 +3,7 @@
<style name="Base.Theme.StudIPTimetable" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorPrimary">@color/primaryNight</item>
<item name="colorPrimaryTranslucent">@color/primaryNightTranslucent</item>
<item name="rippleColor">@color/primaryNight</item>
<item name="colorOnPrimary">@color/colorTextNight</item>
@@ -21,9 +22,9 @@
<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="NavigationViewItemIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">-->
<!-- <item name="android:color">@color/primaryNight</item>-->
<!-- </style>-->
<style name="SelectableItemTheme">
<item name="colorControlHighlight">@color/primaryNight</item>
app/src/main/res/values/attrs.xml
+1
View File
@@ -3,6 +3,7 @@
<attr name="colorNavHighlight" format="color" />
<attr name="colorPrimaryOnContrast" format="color" />
<attr name="colorPrimary" format="color" />
<attr name="colorPrimaryTranslucent" format="color" />
<attr name="colorOnPrimary" format="color" />
<attr name="colorText" format="color" />
<attr name="colorTextHint" format="color" />
app/src/main/res/values/colors.xml
+2
View File
@@ -6,7 +6,9 @@
<!-- colours i defined -->
<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>
app/src/main/res/values/themes.xml
+2 -1
View File
@@ -4,6 +4,7 @@
<!-- <item name="fontFamily">@font/lato_regular</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>
@@ -31,7 +32,7 @@
</style>
<style name="NavigationViewItemIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
<item name="android:color">@color/primaryDay</item>
<item name="android:color">@color/primaryDayTranslucent</item>
</style>
<style name="SelectableItemTheme">