Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/res/layout/activity_change_password.xml

@@ -24,7 +24,7 @@
        android:layout_marginTop="@dimen/dp_42"
        android:text="@string/home_login_change_password"
        android:textAlignment="center"
        android:textColor="@color/text_90000000"
        android:textColor="@color/text_E6000000"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="parent"