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/toolbar_top_view_52.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 2ce085a..4269706 100644
--- a/app/src/main/res/layout/toolbar_top_view_52.xml
+++ b/app/src/main/res/layout/toolbar_top_view_52.xml
@@ -8,7 +8,7 @@
<!--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"
@@ -19,8 +19,9 @@
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_gravity="center"
- android:layout_marginLeft="@dimen/dp_16"
- android:scaleType="centerInside" />
+ android:layout_marginStart="@dimen/dp_16"
+ android:scaleType="centerInside"
+ android:src="@drawable/back" />
</LinearLayout>
<!--2.鏍囬鏂囨湰-->
@@ -34,7 +35,6 @@
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:maxLines="1"
- android:text="@string/my_power_station_鎴戠殑鐢电珯"
android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_18" />
@@ -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