Merge remote-tracking branch 'origin/master'

cloudroam

2025-04-02 86700525bb6d8f881be97fc8bb38a333a0edf2ad

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

@@ -84,7 +84,7 @@
                android:layout_marginTop="300dp"
                android:layout_marginLeft="15dp"
                android:layout_marginRight="15dp"
                android:padding="5dp"
                android:padding="0dp"
                android:background="@android:color/transparent"
                app:cardBackgroundColor="@android:color/transparent"
                android:foreground="@drawable/gray_border_shape"
@@ -245,8 +245,8 @@
                    >

                    <ImageView
                        android:layout_width="30dp"
                        android:layout_height="30dp"
                        android:layout_width="25dp"
                        android:layout_height="25dp"
                        android:src="@mipmap/vip_more"
                        android:layout_marginEnd="8dp"/>

@@ -316,7 +316,7 @@
                android:layout_width="250dp"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:gravity="start"
                android:gravity="center"
                android:baselineAligned="false"
                >

@@ -372,7 +372,7 @@
                android:layout_width="250dp"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:gravity="start"
                android:gravity="center"
                android:baselineAligned="false"
                >