Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -19,7 +19,8 @@
            android:id="@+id/type_title_tv"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_20"
            android:textColor="@color/text_90000000"
            android:gravity="center"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"