mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-27 03:49:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5263 from vector-im/feature/mna/5225-remove-color-resource

Browse source 
#5225 Replace color "vctr_unread_room_badge" by "vctr_content_secondary"
This commit is contained in:
Benoit Marty 2022-02-21 16:49:45 +01:00 committed by GitHub
commit 5bd8247835
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5225.misc Normal file
View file

@ -0,0 +1 @@
Replacing color "vctr_unread_room_badge" by "vctr_content_secondary"

5
library/ui-styles/src/main/res/values/colors.xml
View file

@ -57,11 +57,6 @@
<attr name="vctr_list_separator_on_surface" format="color" /> <attr name="vctr_list_separator_on_surface" format="color" />
<!-- Other colors, which are not in the palette --> <!-- Other colors, which are not in the palette -->
<attr name="vctr_unread_room_badge" format="color" />
<color name="vctr_unread_room_badge_light">@color/palette_gray_200</color>
<color name="vctr_unread_room_badge_dark">@color/palette_gray_250</color>
<color name="vctr_unread_room_badge_black">@color/palette_gray_250</color>
<attr name="vctr_fab_label_bg" format="color" /> <attr name="vctr_fab_label_bg" format="color" />
<color name="vctr_fab_label_bg_light">@android:color/white</color> <color name="vctr_fab_label_bg_light">@android:color/white</color>
<color name="vctr_fab_label_bg_dark">#FF181B21</color> <color name="vctr_fab_label_bg_dark">#FF181B21</color>

1
library/ui-styles/src/main/res/values/theme_black.xml
View file

@ -7,7 +7,6 @@
<!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting --> <!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
<!-- other colors --> <!-- other colors -->
<item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_black</item>
<item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_black</item> <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_black</item>
<item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item> <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item>
<item name="vctr_fab_label_color">@color/vctr_fab_label_color_black</item> <item name="vctr_fab_label_color">@color/vctr_fab_label_color_black</item>

1
library/ui-styles/src/main/res/values/theme_dark.xml
View file

@ -16,7 +16,6 @@
<item name="vctr_system">@color/element_system_dark</item> <item name="vctr_system">@color/element_system_dark</item>
<!-- other colors --> <!-- other colors -->
<item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_dark</item>
<item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_dark</item> <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_dark</item>
<item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_dark</item> <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_dark</item>
<item name="vctr_fab_label_color">@color/vctr_fab_label_color_dark</item> <item name="vctr_fab_label_color">@color/vctr_fab_label_color_dark</item>

1
library/ui-styles/src/main/res/values/theme_light.xml
View file

@ -16,7 +16,6 @@
<item name="vctr_system">@color/element_system_light</item> <item name="vctr_system">@color/element_system_light</item>
<!-- other colors --> <!-- other colors -->
<item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_light</item>
<item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_light</item> <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_light</item>
<item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_light</item> <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_light</item>
<item name="vctr_fab_label_color">@color/vctr_fab_label_color_light</item> <item name="vctr_fab_label_color">@color/vctr_fab_label_color_light</item>

2
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
View file

@ -457,7 +457,7 @@ class HomeDetailFragment @Inject constructor(
backgroundColor = if (highlight) { backgroundColor = if (highlight) {
ThemeUtils.getColor(requireContext(), R.attr.colorError) ThemeUtils.getColor(requireContext(), R.attr.colorError)
} else { } else {
ThemeUtils.getColor(requireContext(), R.attr.vctr_unread_room_badge) ThemeUtils.getColor(requireContext(), R.attr.vctr_content_secondary)
} }
} }

4
vector/src/main/res/drawable/bg_unread_notification.xml
View file

@ -4,5 +4,5 @@
<corners android:radius="40dp" /> <corners android:radius="40dp" />
<solid android:color="?vctr_unread_room_badge" /> <solid android:color="?vctr_content_secondary" />
</shape> </shape>