From 66a4a5c3aa78869a3c51e79f2a6a610c99016c24 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 16 四月 2025 08:45:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- app/src/main/res/layout/fragment_notifications.xml | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml index e176684..6af008d 100644 --- a/app/src/main/res/layout/fragment_notifications.xml +++ b/app/src/main/res/layout/fragment_notifications.xml @@ -19,6 +19,27 @@ android:layout_height="32dp" android:scaleType="centerCrop" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="25dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + + <View + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + + <ImageView + android:id="@+id/iv_setting" + android:layout_width="28dp" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:contentDescription="设置" + android:src="@mipmap/setting" /> + </LinearLayout> + + <!-- 用户信息区域 - 减小padding --> <RelativeLayout android:id="@+id/layout_user_info" @@ -99,19 +120,28 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="VIP会员 " + android:text="VIP会员" android:textColor="#B8741A" - android:textSize="18sp" + android:textSize="16sp" android:textStyle="bold"/> <!-- 添加间隔 --> + <View + android:layout_width="6dp" + android:layout_height="0dp"/> <TextView android:id="@+id/tv_vip_expire" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_weight="1" + android:singleLine="true" + android:ellipsize="end" android:textColor="#F2F2F2" - android:textSize="14sp"/> + android:textSize="12sp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"/> </LinearLayout> <!-- 第二行:续费提示(上移调整) --> -- Gitblit v1.9.3