From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/home_bottom_line.xml | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/home_bottom_line.xml b/app/src/main/res/layout/home_bottom_line.xml
index b1ba497..6cfd557 100644
--- a/app/src/main/res/layout/home_bottom_line.xml
+++ b/app/src/main/res/layout/home_bottom_line.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="187dp"
- android:layout_height="@dimen/dp_49">
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dp_49"
+ android:layout_weight="1">
<ImageView
android:id="@+id/icon_iv"
@@ -14,12 +16,25 @@
<TextView
android:id="@+id/title_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/text_14"
+ android:layout_height="@dimen/text_16"
android:layout_below="@+id/icon_iv"
android:layout_centerInParent="true"
- android:layout_marginTop="@dimen/dp_2"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_10" />
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_12" />
+
+ <TextView
+ android:id="@+id/red_count_tv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:layout_alignStart="@+id/icon_iv"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="4.5dp"
+ android:background="@drawable/red_font"
+ android:gravity="center"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="9sp"
+ android:visibility="gone"
+ tools:ignore="SmallSp" />
<!--鍔犲ぇ鐐瑰嚮鐑尯-->
<TextView
android:id="@+id/click_tv"
@@ -28,7 +43,9 @@
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/dp_30"
- android:layout_marginEnd="@dimen/dp_30" />
+ android:layout_marginEnd="@dimen/dp_30"
+
+ />
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0