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 11:15:12 +08:00
parent 22b208bcd9
commit ac18150503
16 changed files with 315 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/res/drawable/gift_wall_gift_info_btn_un.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="8dp"/>
<gradient
android:startColor="#A6A6B3"
android:endColor="#A6A6B3"
android:angle="0"
/>
</shape>
</item>
</selector>

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

@@ -24,6 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="10dp"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

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

@@ -19,9 +19,9 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:fillViewport="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/bottom_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -61,11 +61,18 @@
app:layout_constraintTop_toTopOf="parent"
tools:src="@mipmap/gift_wall_gift_info_light" />
<TextView
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="17dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:maxLength="3"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#FFFFFF"
android:textSize="20sp"
@@ -130,6 +137,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/gift_schedule"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
@@ -268,9 +276,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="-25dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
@@ -337,12 +343,12 @@
tools:text="00" />
<TextView
android:gravity="center"
android:id="@+id/btn_one"
android:layout_width="0dp"
android:layout_height="26dp"
android:layout_marginEnd="17dp"
android:background="@drawable/gift_wall_gift_info_btn"
android:gravity="center"
android:minWidth="65dp"
android:textAllCaps="false"
android:textColor="#02215D"
@@ -355,14 +361,14 @@
<Button
android:id="@+id/btn_one_tips"
android:layout_width="wrap_content"
android:elevation="10dp"
android:translationZ="2dp"
android:layout_height="11dp"
android:layout_marginBottom="-5dp"
android:background="@drawable/gift_wall_gift_info_bottom_btn_tips"
android:elevation="10dp"
android:minWidth="32dp"
android:text="需10个"
android:textSize="8dp"
android:translationZ="2dp"
app:layout_constraintBottom_toTopOf="@+id/btn_one"
app:layout_constraintEnd_toEndOf="@+id/btn_one" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -263,4 +263,33 @@
app:srcCompat="@mipmap/gift_wall_main_tab1_down_ic" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/hideLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<ImageView
android:id="@+id/imageView15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/gift_wall_hide" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dialog_gift_wall_hide"
android:textColor="#FFFFFF"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@+id/imageView15"
app:layout_constraintStart_toStartOf="@+id/imageView15"
app:layout_constraintTop_toBottomOf="@+id/imageView15" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -9,14 +9,27 @@
android:id="@+id/tv_rank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="start"
android:text="@string/dialog_gift_wall_list_info_list_header_rank"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar2"
android:layout_width="37dp"
android:layout_height="37dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
android:layout_marginStart="32dp"
android:src="@mipmap/icon_avatar_placeholder"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
app:layout_constraintStart_toEndOf="@+id/tv_rank"
app:layout_constraintTop_toTopOf="@+id/tv_rank"
app:riv_oval="true"
tools:visibility="visible" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="37dp"
@@ -32,27 +45,54 @@
app:riv_oval="true"
tools:visibility="visible" />
<TextView
android:id="@+id/user_name"
android:layout_width="wrap_content"
<LinearLayout
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:textColor="#FFFFFF"
android:textSize="12sp"
android:text="@string/dialog_gift_wall_list_info_list_header_rename"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_marginEnd="70dp"
android:layout_marginBottom="10dp"
android:orientation="vertical"
>
<TextView
android:id="@+id/anchor_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
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"
/>
<TextView
android:id="@+id/user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/dialog_gift_wall_list_info_list_header_rename"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:ellipsize="end"
android:singleLine="true"
/>
</LinearLayout>
<TextView
android:id="@+id/tv_rename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_value"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:gravity="end"
android:layout_marginTop="10dp"
android:text="@string/dialog_gift_wall_list_info_list_header_rename_value"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

BIN
common/src/main/res/mipmap-xxhdpi/gift_wall_hide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

4
common/src/main/res/values-zh/strings.xml
View File

@@ -1528,5 +1528,7 @@
<string name="dialog_gift_wall_tab2_list_wait">等待點亮</string>
<string name="dialog_gift_wall_tab2_dsl_tab1">本期角逐</string>
<string name="dialog_gift_wall_tab2_dsl_tab2">上期冠名</string>
<string name="dialog_gift_wall_hide">已隐藏</string>
<string name="dialog_gift_wall_classic_wait">等待冠名</string>
<string name="dialog_gift_wall_assistance_wait">等待助力</string>
</resources>

5
common/src/main/res/values/strings.xml
View File

@@ -1533,7 +1533,10 @@
<string name="dialog_gift_wall_list_info_list_header_rename_value1">Star value</string>
<string name="dialog_gift_wall_list1_title">Star Gifts</string>
<string name="dialog_gift_wall_list2_title">Classic Gifts</string>
<string name="dialog_gift_wall_tab2_list_wait">Waiting for titling</string>
<string name="dialog_gift_wall_tab2_list_wait">Waiting for lighting</string>
<string name="dialog_gift_wall_tab2_dsl_tab1">This competition</string>
<string name="dialog_gift_wall_tab2_dsl_tab2">Previous Title</string>
<string name="dialog_gift_wall_hide">Hidden</string>
<string name="dialog_gift_wall_classic_wait">Waiting for titling</string>
<string name="dialog_gift_wall_assistance_wait">Waiting for assistance</string>
</resources>