Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

 app/src/main/res/values/colors.xml

@@ -54,9 +54,9 @@
    <color name="text_FFECECEC">#FFECECEC</color>
    <color name="text_FF161616">#FF161616</color>
    <color name="text_FF333738">#FF333738</color>
    <color name="text_66FFFFFF">#66FFFFFF</color>
    <color name="text_FF5B5B5B">#FF5B5B5B</color>
    <color name="text_1AFFFFFF">#1AFFFFFF</color>
    <color name="text_E6FFFFFF">#FFACACAC</color>
    <color name="text_FFACACAC">#FFACACAC</color>
    <color name="text_FF36FFBA">#FF36FFBA</color>
    <color name="text_33FFFFFF">#33FFFFFF</color>
    <color name="text_FF555859">#FF555859</color>
@@ -67,5 +67,7 @@
    <color name="text_FF8E8E8E">#FF8E8E8E</color>
    <color name="text_FF222222">#FF222222</color>
    <color name="text_FF484848">#FF484848</color>
    <color name="text_66FFFFFF">#66FFFFFF</color>
    <color name="text_E6FFFFFF">#FFACACAC</color>

</resources>