Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.message.MessageInfoActivity">

    <include
@@ -22,7 +22,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_10"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
@@ -54,14 +54,14 @@
                android:paddingStart="@dimen/dp_6"
                android:paddingEnd="@dimen/dp_20"
                android:singleLine="true"
                android:textColor="@color/text_E6FFFFFF"
                android:textSize="@dimen/text_14" />
                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"
@@ -140,7 +140,6 @@
        android:id="@+id/message_info_work_out"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/text_FF333738"
        android:gravity="center"
        android:orientation="horizontal"
        android:paddingStart="@dimen/dp_20"
@@ -157,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
@@ -168,10 +167,10 @@
            android:id="@+id/message_info_solve_tv"
            android:layout_width="157.5dp"
            android:layout_height="@dimen/dp_52"
            android:background="@drawable/bj_ff555859"
            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>