新建添加家大事记立项

Guo_shaoshan

2023-03-28 3186c75f5e36ca8ac814fe478385e90aa24ed2fc

新建添加家大事记立项

 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:android="http://schemas.android.com/apk/res/android"
>

    <data>
        <variable
@@ -24,17 +23,11 @@
            android:id="@+id/titleBar"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_55"
<<<<<<< Updated upstream
            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 +75,6 @@

        </com.hjq.bar.TitleBar>

<<<<<<< Updated upstream

        <ImageView
            android:id="@+id/iv_group_photo"
@@ -576,24 +568,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>

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

@@ -11,6 +11,7 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        >

        <androidx.cardview.widget.CardView
@@ -284,10 +285,12 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        >
<LinearLayout
    android:layout_width="@dimen/dp_56"
    android:layout_height="@dimen/dp_56"
            android:orientation="vertical"

    >