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_44.xml | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/toolbar_top_view_44.xml b/app/src/main/res/layout/toolbar_top_view_44.xml index 72c0247..bd47b7a 100644 --- a/app/src/main/res/layout/toolbar_top_view_44.xml +++ b/app/src/main/res/layout/toolbar_top_view_44.xml @@ -3,22 +3,24 @@ android:id="@+id/top_bar_view" android:layout_width="match_parent" android:layout_height="@dimen/dp_44" + android:background="@color/text_FF000000" 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" android:orientation="horizontal"> <ImageView - android:layout_width="@dimen/dp_24" - android:layout_height="@dimen/dp_24" + android:id="@+id/top_left_iv" + android:layout_width="@dimen/dp_30" + android:layout_height="@dimen/dp_30" android:layout_gravity="center" - android:layout_marginLeft="@dimen/dp_16" - android:scaleType="centerInside" /> + android:layout_marginStart="@dimen/dp_10" + android:scaleType="centerInside" + android:src="@drawable/back" /> </LinearLayout> <!--2.鏍囬鏂囨湰--> @@ -29,11 +31,10 @@ android:layout_centerInParent="true" android:layout_marginLeft="@dimen/dp_60" android:layout_marginRight="@dimen/dp_60" - android:fontFamily="sans-serif-medium" android:gravity="center" android:maxLines="1" android:text="" - android:textColor="@color/text_FF000000" + android:textColor="@color/text_FFACACAC" android:textSize="@dimen/text_18" /> <!--3.鏇村鎸夐挳 榛樿闅愯棌--> @@ -58,4 +59,5 @@ </LinearLayout> + </RelativeLayout> \ No newline at end of file -- Gitblit v1.8.0