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 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/layout/item_image_footer.xml b/app/src/main/res/layout/item_image_footer.xml new file mode 100644 index 0000000..e3e1ebf --- /dev/null +++ b/app/src/main/res/layout/item_image_footer.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/dp_85" + android:layout_height="@dimen/dp_85" + android:orientation="vertical" + 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" + /> + + +</LinearLayout> \ No newline at end of file -- Gitblit v1.9.1