Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

@@ -4,15 +4,22 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_F5F7FA"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.languageSelectionActivity">
    <include
        android:id="@+id/toolbar_top_fragment_house_list_rl"
        layout="@layout/toolbar_top_view_44" />

<!--    <include-->
<!--        android:id="@+id/toolbar_top_fragment_house_list_rl"-->
<!--        layout="@layout/toolbar_top_view_52" />-->
    <include
        android:id="@+id/toolbar_top_rl"
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <!--    <include-->
    <!--        android:id="@+id/toolbar_top_fragment_house_list_rl"-->
    <!--        layout="@layout/toolbar_top_view_52" />-->

    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/language_rc"
@@ -22,7 +29,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">

    </androidx.recyclerview.widget.RecyclerView>