Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -1,19 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<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="@dimen/dp_64"
    android:background="@color/text_F9FAFB">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/fragment_me_line_cl"
        android:layout_width="0dp"
        android:layout_height="match_parent"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@color/text_FFFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_64">

        <ImageView
            android:id="@+id/fragment_me_line_left_icon_iv"
@@ -31,7 +21,7 @@
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="@dimen/dp_7"
            android:text="@string/me_set"
            android:textColor="@color/text_90000000"
        android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
            app:layout_constraintStart_toEndOf="@+id/fragment_me_line_left_icon_iv"
@@ -64,8 +54,6 @@
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent" />

    </androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>