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/fragment_function.xml | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index a73a4df..18139a0 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -2,9 +2,9 @@
<layout
-xmlns:app="http://schemas.android.com/apk/res-auto"
-xmlns:android="http://schemas.android.com/apk/res/android"
->
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ >
<data>
<variable
@@ -19,11 +19,10 @@
android:orientation="vertical"
>
-
<com.hjq.bar.TitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/dp_55"
android:background="@color/color_title_bar_background"
app:layout_constraintTop_toTopOf="parent"
android:paddingHorizontal="@dimen/dp_16"
@@ -152,8 +151,8 @@
app:layout_constraintTop_toBottomOf="@id/tv_core_module">
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
android:background="@drawable/function_family_root_net" />
<TextView
@@ -175,8 +174,8 @@
app:layout_constraintTop_toTopOf="@id/layout_home_root_net">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:background="@drawable/function_notes" />
<TextView
@@ -357,6 +356,30 @@
android:textSize="@dimen/sp_14" />
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_home_devices"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="@id/layout_family_memorabilia"
+ app:layout_constraintStart_toStartOf="@id/layout_family_memorabilia"
+ app:layout_constraintTop_toTopOf="@+id/layout_income_and_expenses">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/function_home_devices" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_4"
+ android:text="瀹跺涵璁惧"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_14" />
+ </LinearLayout>
+
<TextView
android:id="@+id/tv_personal_module"
android:layout_width="wrap_content"
--
Gitblit v1.9.1