Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -15,13 +15,13 @@

    <color name="text_245EC3">#38C494</color>
    <color name="text_25000000">#25000000</color>
    <color name="text_40000000">#40000000</color>
    <color name="text_66000000">#66000000</color>
    <color name="text_65000000">#65000000</color>
    <color name="text_60000000">#60000000</color>
    <color name="text_90000000">#90000000</color>
    <color name="text_E6000000">#E6000000</color>
    <color name="text_00000000">#00000000</color>
    <color name="text_FF000000">#FF000000</color>
    <color name="text_E1E1E1">#E1E1E1</color>
    <color name="text_E1E1E1">#FFE1E1E1</color>
    <color name="text_94B6E7">#94B6E7</color>
    <color name="text_FFFFFFFF">#FFFFFFFF</color>
    <color name="text80_FFFFFF">#80FFFFFF</color>
@@ -48,6 +48,9 @@
    <color name="text_B2B2B2">#B2B2B2</color>
    <color name="text_38C494">#38C494</color>
    <color name="text_C2EDDE">#C2EDDE</color>
    <color name="text_C1C1C1">#C1C1C1</color>
    <color name="text_1238C494">#1238C494</color>
    <color name="text_161718">#FF161718</color>


</resources>