yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 礼物墙

Browse Source
This commit is contained in:
zlzw
2024-07-16 16:39:30 +08:00
parent 96c45820b0
commit 7a6dfe5a3d
18 changed files with 209 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/res/layout/dialog_gift_wall_gift_info.xml
View File

@@ -18,6 +18,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
android:id="@+id/nestedScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:fillViewport="true"
@@ -64,14 +65,15 @@
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginTop="17dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:maxLength="3"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#FFFFFF"
@@ -92,7 +94,8 @@
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/gift_name"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/gift_name" />
app:layout_constraintTop_toTopOf="@+id/gift_name"
tools:visibility="visible" />
<ImageView
android:id="@+id/gift"
@@ -217,23 +220,23 @@
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginEnd="50dp"
android:background="@drawable/gift_wall_gift_info_list_btn_up"
android:background="@drawable/gift_wall_gift_info_list_btn_down"
android:gravity="center"
android:minWidth="70dp"
android:text="@string/dialog_gift_wall_gfit_info_list_title_assistance"
android:textAllCaps="false"
android:textColor="#31326D"
android:textColor="#FFF"
android:textSize="12sp" />
<Button
android:id="@+id/tab2"
android:layout_width="70dp"
android:layout_height="30dp"
android:background="@drawable/gift_wall_gift_info_list_btn_down"
android:background="@drawable/gift_wall_gift_info_list_btn_up"
android:gravity="center"
android:text="@string/dialog_gift_wall_gfit_info_list_title_champion"
android:textAllCaps="false"
android:textColor="#FFFFFF"
android:textColor="#31326D"
android:textSize="12sp" />
</LinearLayout>

7
common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
View File

@@ -32,6 +32,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:fillViewport="true"
@@ -309,6 +310,10 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
@@ -453,7 +458,7 @@
<include
android:id="@+id/list_title"
layout="@layout/item_dialog_gift_wall_gift_info"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"

5
common/src/main/res/layout/dialog_gift_wall_tab2_list2.xml
View File

@@ -77,9 +77,12 @@
<TextView
android:id="@+id/user1_name"
android:layout_width="wrap_content"
android:layout_width="100dp"
android:gravity="center"
android:layout_height="wrap_content"
android:textSize="14sp"
android:ellipsize="end"
android:singleLine="true"
android:textColor="#FFD3A4"
android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/user1_avatar"

1
common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
View File

@@ -75,6 +75,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:translationY="1dp"
android:background="@mipmap/gift_wall_main_list_bg"
android:scaleType="fitXY"
app:layout_constraintBottom_toBottomOf="parent"

13
common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
View File

@@ -123,9 +123,9 @@
android:id="@+id/recyclerView1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_marginStart="10dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="20dp"
android:layout_marginEnd="10dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
@@ -148,18 +148,17 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/classic_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_height="0dp"
android:layout_marginStart="10dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:layout_marginEnd="10dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"

31
common/src/main/res/layout/item_dialog_gift_wall_gift_info.xml
View File

@@ -46,41 +46,40 @@
tools:visibility="visible" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="70dp"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_rename"
app:layout_constraintStart_toEndOf="@+id/avatar2"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginEnd="70dp"
android:layout_marginBottom="10dp"
android:orientation="vertical"
>
app:layout_constraintVertical_bias="0.0">
<TextView
android:id="@+id/anchor_name"
android:id="@+id/item_anchor_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="@string/dialog_gift_wall_list_info_list_header_rename"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:ellipsize="end"
android:visibility="gone"
android:singleLine="true"
/>
android:visibility="gone" />
<TextView
android:id="@+id/user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="@string/dialog_gift_wall_list_info_list_header_rename"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:ellipsize="end"
android:singleLine="true"
/>
tools:text="aaaaa" />
</LinearLayout>

9
common/src/main/res/layout/item_gift_wall_man_tab1_list_2.xml
View File

@@ -59,13 +59,16 @@
<TextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
tools:text="扬帆出海"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textColor="#FFFFFF"
android:gravity="center"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gift_soles" />
app:layout_constraintTop_toBottomOf="@+id/gift_soles"
tools:text="aaaaaaaaaaaaaa" />
</androidx.constraintlayout.widget.ConstraintLayout>

15
common/src/main/res/layout/item_gift_wall_man_tab2_list_1.xml
View File

@@ -27,8 +27,13 @@
<TextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="TextView"
android:textColor="#C4FFDBAC"
android:textSize="12sp"
@@ -108,8 +113,11 @@
<TextView
android:id="@+id/tv_wait"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:gravity="center"
android:layout_marginEnd="20dp"
android:text="@string/dialog_gift_wall_tab2_list_wait"
android:textColor="#A2A2A2"
android:textSize="14sp"
@@ -117,5 +125,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gift_number" />
app:layout_constraintTop_toBottomOf="@+id/gift_number"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

15
common/src/main/res/layout/item_gift_wall_man_tab2_list_2.xml
View File

@@ -27,8 +27,13 @@
<TextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:gravity="center"
android:singleLine="true"
android:text="TextView"
android:textColor="#C4FFDBAC"
android:textSize="12sp"
@@ -108,8 +113,11 @@
<TextView
android:id="@+id/tv_wait"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:text="@string/dialog_gift_wall_tab2_list_wait"
android:textColor="#A2A2A2"
android:textSize="14sp"
@@ -117,5 +125,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gift_number" />
app:layout_constraintTop_toBottomOf="@+id/gift_number"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>