From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/toolbar_top_view_52.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/toolbar_top_view_52.xml b/app/src/main/res/layout/toolbar_top_view_52.xml
index a198bc4..4f49473 100644
--- a/app/src/main/res/layout/toolbar_top_view_52.xml
+++ b/app/src/main/res/layout/toolbar_top_view_52.xml
@@ -3,12 +3,12 @@
android:id="@+id/top_bar_view"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
- android:background="@color/text_245EC3"
+ android:background="@color/text_FF161616"
android:orientation="horizontal">
<!--1.杩斿洖鎸夐挳 澧炲ぇ鐐瑰嚮鍖哄煙-->
<LinearLayout
- android:id="@+id/top_back_btn"
+ android:id="@+id/top_back_ll"
android:layout_width="@dimen/dp_56"
android:layout_height="match_parent"
android:gravity="center_vertical"
@@ -16,8 +16,8 @@
android:visibility="gone">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="@dimen/dp_30"
+ android:layout_height="@dimen/dp_30"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_16"
android:scaleType="centerInside"
@@ -35,7 +35,7 @@
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:maxLines="1"
- android:textColor="@color/text_FFFFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<!--3.鏇村鎸夐挳 榛樿闅愯棌-->
@@ -48,6 +48,14 @@
android:orientation="horizontal">
<ImageView
+ android:id="@+id/top_edit_iv"
+ android:layout_width="@dimen/dp_28"
+ android:layout_height="@dimen/dp_28"
+ android:adjustViewBounds="true"
+ android:scaleType="centerInside"
+ android:visibility="gone" />
+
+ <ImageView
android:id="@+id/top_more_iv"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_28"
--
Gitblit v1.8.0