Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

@@ -2,42 +2,31 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="54dp"
    android:layout_marginStart="@dimen/dp_32"
    android:layout_marginEnd="@dimen/dp_32">
    android:layout_height="54dp">

    <androidx.constraintlayout.widget.ConstraintLayout
    <TextView
        android:id="@+id/type_title_tv"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_16"
        android:layout_height="@dimen/dp_20"
        android:gravity="center"
        android:textColor="@color/text_FF8E8E8E"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="parent">
        app:layout_constraintTop_toTopOf="parent"

        <TextView
            android:id="@+id/type_title_tv"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_20"
            android:gravity="center"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
        />

            />
    <View
        android:id="@+id/type_line_v"
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:layout_marginBottom="0.5dp"
        android:background="@color/text_1AFFFFFF"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintEnd_toStartOf="parent" />

        <View
            android:id="@+id/type_line_v"
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:layout_marginBottom="0.5dp"
            android:background="@color/text_EDEFF2"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintEnd_toStartOf="parent" />
    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>