Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -54,14 +54,14 @@
                android:paddingStart="@dimen/dp_6"
                android:paddingEnd="@dimen/dp_20"
                android:singleLine="true"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_16" />
        </LinearLayout>

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/dp_32"
            android:layout_marginTop="@dimen/dp_20"
            android:orientation="vertical"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -156,7 +156,7 @@
            android:background="@drawable/bj_ff555859_no"
            android:gravity="center"
            android:text="@string/message_alarm_details_back"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <View
@@ -170,7 +170,7 @@
            android:background="@drawable/bj_ff39383d"
            android:gravity="center"
            android:text="@string/message_alarm_details_resolved"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />
    </LinearLayout>