Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -1,54 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/ll_Pop"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_height="wrap_content"
    android:background="@color/text_FF222222"
    android:orientation="vertical">

    <LinearLayout
        android:id="@+id/ll_Pop"
    <TextView
        android:id="@+id/tv_Camera"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical">
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/me_personal_data_photograph"
        android:textColor="@color/text_FFACACAC"
        android:textSize="14sp" />

        <TextView
    <View
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_0_5"
        android:background="@color/text_1AFFFFFF" />

            android:id="@+id/tv_Camera"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/me_personal_data_photograph"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />
    <TextView
        android:id="@+id/tv_Album"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/me_personal_data_select_album"
        android:textColor="@color/text_FFACACAC"
        android:textSize="14sp" />

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_0_5"
            android:background="@color/text_1AFFFFFF" />
    <View
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_20"
        android:background="@color/text_FF000000" />

        <TextView
            android:id="@+id/tv_Album"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/me_personal_data_select_album"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />
    <TextView
        android:id="@+id/tv_Cancel"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/loading_cancel"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="14sp" />

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_8" />

        <TextView
            android:id="@+id/tv_Cancel"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="16sp" />

    </LinearLayout>
</LinearLayout>