From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/res/layout/item_image_footer.xml | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/item_image_footer.xml b/app/src/main/res/layout/item_image_footer.xml
index 07e1f3b..e3e1ebf 100644
--- a/app/src/main/res/layout/item_image_footer.xml
+++ b/app/src/main/res/layout/item_image_footer.xml
@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="@dimen/dp_85"
+ android:layout_height="@dimen/dp_85"
android:orientation="vertical"
- android:layout_gravity="center"
+ android:gravity="center"
+ android:background="@drawable/shape_73fab4cd_solid"
+ android:layout_marginTop="8dp"
+ android:layout_marginStart="2dp"
>
- <TextView
- android:id="@+id/button_add"
- android:layout_width="@dimen/dp_85"
- android:layout_height="@dimen/dp_85"
- android:text="+"
- android:textColor="@color/black"
- android:textSize="60sp"
- android:gravity="center"
- android:background="@drawable/shape_73fab4cd_solid"
- android:layout_marginTop="8dp"
- android:layout_marginStart="2dp"
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_import_add"
/>
--
Gitblit v1.9.1