Merge branch 'v2.2.0/float_gift' into v2.2.0/test
This commit is contained in:
@@ -16,10 +16,10 @@
|
|||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_marginTop="80dp"
|
|
||||||
android:id="@+id/layout_root"
|
android:id="@+id/layout_root"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
|
android:layout_marginTop="80dp"
|
||||||
android:background="@drawable/all_service_gift_bg_1"
|
android:background="@drawable/all_service_gift_bg_1"
|
||||||
app:layout_constraintDimensionRatio="h,375:69"
|
app:layout_constraintDimensionRatio="h,375:69"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
@@ -84,6 +84,7 @@
|
|||||||
android:layout_marginEnd="4.5dp"
|
android:layout_marginEnd="4.5dp"
|
||||||
android:includeFontPadding="false"
|
android:includeFontPadding="false"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
|
android:text="@{giftBean.roomTitle}"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="12dp"
|
android:textSize="12dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
Reference in New Issue
Block a user