From 3e3904224ff6b37c654f54cee56e9ca466f289de Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 19:31:55 +0800
Subject: [PATCH] Merge branch 'wjc_new' into lwj_new
---
app/src/main/res/layout/item_station.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/item_station.xml b/app/src/main/res/layout/item_station.xml
index 845f2c1..48dca6c 100644
--- a/app/src/main/res/layout/item_station.xml
+++ b/app/src/main/res/layout/item_station.xml
@@ -2,8 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/station_status_cl"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
+ android:layout_width="74dp"
+ android:layout_height="56dp"
android:background="@drawable/station_status_no_ffffff">
<TextView
@@ -12,8 +12,8 @@
android:layout_height="@dimen/dp_25"
android:layout_marginTop="7dp"
android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_14"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_21"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -25,7 +25,7 @@
android:layout_height="@dimen/dp_17"
android:layout_marginTop="1dp"
android:text="state"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/station_status_tv"
app:layout_constraintStart_toStartOf="@+id/station_status_tv"
--
Gitblit v1.8.0