功能模块大部分

Linjiajia

2023-04-24 fcdddf8b9b34f9930bec454b5fffe41c0e33ba3c

 app/src/main/res/layout/fragment_function.xml

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< Updated upstream


<layout
=======
<layout xmlns:tools="http://schemas.android.com/tools"
>>>>>>> Stashed changes
    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
@@ -20,21 +19,16 @@
        android:orientation="vertical"
        >


        <com.hjq.bar.TitleBar
            android:id="@+id/titleBar"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_55"
<<<<<<< Updated upstream
            android:layout_height="wrap_content"
            android:background="@color/color_title_bar_background"
=======
            android:id="@+id/title_t_bar"
            app:layout_constraintTop_toTopOf="parent"
            android:background="@color/color_title_background"
>>>>>>> Stashed changes
            android:paddingHorizontal="@dimen/dp_16"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            app:leftIcon="@null"
            app:rightIcon="@null">

@@ -82,7 +76,6 @@

        </com.hjq.bar.TitleBar>

<<<<<<< Updated upstream

        <ImageView
            android:id="@+id/iv_group_photo"
@@ -159,8 +152,8 @@
                        app:layout_constraintTop_toBottomOf="@id/tv_core_module">

                        <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_family_root_net" />

                        <TextView
@@ -182,8 +175,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
@@ -360,6 +353,30 @@
                            android:layout_height="wrap_content"
                            android:layout_marginTop="@dimen/dp_4"
                            android:text="收支台账"
                            android:textColor="@color/black"
                            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>
@@ -576,24 +593,5 @@



=======
        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            >
        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            >
            <ImageView
                android:id="@+id/imageView_m/argin_pic"
                android:layout_width="@dimen/dp_360"
                android:layout_height="@dimen/dp_202"
                app:srcCompat="@drawable/margin_pic"
</LinearLayout>
    </LinearLayout>
>>>>>>> Stashed changes
    </androidx.constraintlayout.widget.ConstraintLayout>
</layout>