Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -39,7 +39,6 @@
    <color name="text_F5F7FA">#F5F7FA</color>
    <color name="text_FF5757">#FF5757</color>
    <color name="text_565758">#565758</color>
    <color name="text_222222">#222222</color>
    <color name="text_FF6B6B">#E6FF0000</color>
    <color name="text_10FFFFFF">#10FFFFFF</color>
    <color name="text_50FFFFFF">#50FFFFFF</color>
@@ -55,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>
@@ -65,5 +64,10 @@
    <color name="text_FF5A5A5A">#FF5A5A5A</color>
    <color name="text_FF1C1C1E">#FF1C1C1E</color>
    <color name="text_FF39383D">#FF39383D</color>
    <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>