Fix some more reaction colors on dark theme

Follow-up to 6048e1266984: Fix reaction color for non-emojis on dark theme

Hardcoding it to black is bad for dark themes. It was probably done
because the default color would make emojis look pale due to
transparency. If we use a primary text color which hopefully does not
feature transparency (it does not for SC themes, at least), everything
looks fine.

Change-Id: Icbc3b37f5535b98684c2225c0973a152e88d6b31
This commit is contained in:
SpiritCroc 2021-12-13 09:15:37 +01:00
parent 064a363bc1
commit 004a51646b
6 changed files with 9 additions and 6 deletions

View File

@ -26,8 +26,11 @@
<color name="vctr_notice_secondary_alpha12">#1E61708B</color>
<!-- Other useful color -->
<!-- Emoji text has to use a black text color -->
<!-- Upstream says: Emoji text has to use a black text color -->
<!-- SchildiChat says: no, it doesn't, it just needs to use some theme-specific color without transparency. We have non-emoji reactions... -->
<!--
<color name="emoji_color">@android:color/black</color>
-->
<color name="join_conference_animated_color">#0BAC7E</color>
<color name="half_transparent_status_bar">#80000000</color>

View File

@ -26,7 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textColor="@color/emoji_color"
android:textColor="?vctr_content_primary"
tools:text="🔧" />
<LinearLayout

View File

@ -14,7 +14,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="@color/emoji_color"
android:textColor="?vctr_content_primary"
tools:ignore="SpUsage"
tools:text="@sample/reactions.json/data/reaction" />

View File

@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:textColor="@color/emoji_color"
android:textColor="?vctr_content_primary"
tools:ignore="SpUsage"
tools:text="@sample/reactions.json/data/reaction" />

View File

@ -14,7 +14,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@color/emoji_color"
android:textColor="?vctr_content_primary"
android:textSize="40dp"
tools:ignore="SpUsage"
tools:text="🌵"

View File

@ -18,7 +18,7 @@
android:layout_marginEnd="8dp"
android:gravity="center"
android:lines="1"
android:textColor="@color/emoji_color"
android:textColor="?vctr_content_primary"
tools:text="@sample/reactions.json/data/reaction" />
<TextView