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

心愿单添加部分功能实现

Browse Source
This commit is contained in:
18401019693
2023-03-30 14:16:50 +08:00
parent 6d83c6f8ae
commit 70a91fedf3
55 changed files with 1848 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/res/drawable/background_wilsh_gitf.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 android:state_selected="false">
<shape android:shape="rectangle">
<corners android:radius="6dp" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#FFBE41" />
</shape>
</item>
</selector>

17
common/src/main/res/drawable/background_wilsh_tab.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="6dp" />
<gradient android:endColor="#FFC657" android:startColor="#FA57FF" />
<stroke android:width="1dp" android:color="@color/white" />
</shape>
</item>
<item android:state_selected="false">
<shape android:shape="rectangle">
<corners android:radius="6dp" />
<solid android:color="#AC73F5" />
<stroke android:width="1dp" android:color="#F4B1FF" />
</shape>
</item>
</selector>

15
common/src/main/res/drawable/background_wilsh_tab_gift.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="6dp" />
<solid android:color="#FFFFFF" />
</shape>
</item>
<item android:state_selected="false">
<shape android:shape="rectangle">
<corners android:radius="6dp" />
<solid android:color="#92919F" />
</shape>
</item>
</selector>

8
common/src/main/res/drawable/background_wish_item.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp" />
<solid android:color="#5B3EDF" />
<stroke
android:width="2dp"
android:color="#FFFFFF" />
</shape>

6
common/src/main/res/drawable/bg_wish_gitf_button.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="11dp" />
<solid android:color="#ED6B41" />
</shape>

BIN
common/src/main/res/drawable/bg_xyd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 187 KiB

BIN
common/src/main/res/drawable/bg_xyd_add_item.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
common/src/main/res/drawable/bg_xyd_button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
common/src/main/res/drawable/bg_xyd_number.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 B

44
common/src/main/res/drawable/progress_wishlist2.xml Normal file
View File

@@ -0,0 +1,44 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--背景色从左到右色值，渐变-->
<item android:id="@android:id/background">
<shape>
<corners android:radius="5.5dip" />
<gradient
android:angle="0"
android:centerColor="#B68BFC"
android:centerY="0.75"
android:endColor="#B68BFC"
android:startColor="#B68BFC" />
</shape>
</item>
<!--缓冲区的进度-->
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<corners android:radius="5.5dip" />
<gradient
android:angle="0"
android:centerColor="#FFE062"
android:centerY="0.75"
android:endColor="#FFE062"
android:startColor="#FFE062" />
</shape>
</clip>
</item>
<!--进度条从左到右色值，渐变-->
<item android:id="@android:id/progress">
<clip>
<shape>
<corners android:radius="5dip" />
<gradient
android:angle="0"
android:endColor="#ffcb00"
android:startColor="#fcff00" />
</shape>
</clip>
</item>
</layer-list>

44
common/src/main/res/layout/dialog_live_new_wish_gitf.xml Normal file
View File

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="304dp"
android:background="@mipmap/img_lu_bg"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.tabs.TabLayout
android:id="@+id/wish_tab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="2dp"
android:background="@null"
app:tabIndicatorHeight="0dp"
app:tabMode="scrollable"
app:tabRippleColor="@color/transparent" />
<Button
android:id="@+id/wish_gitf_button"
android:layout_width="42dp"
android:layout_height="22dp"
android:layout_gravity="end"
android:layout_marginTop="15dp"
android:layout_marginEnd="18dp"
android:background="@drawable/bg_wish_gitf_button"
android:text="@string/aristocrat_determine"
android:textColor="@color/white"
android:textSize="12sp" />
</FrameLayout>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/context_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="15dp" />
</LinearLayout>

29
common/src/main/res/layout/dialog_live_new_wish_list.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="580dp"
android:background="@drawable/bg_xyd"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
android:id="@+id/wish_tab"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="160dp"
android:layout_marginEnd="2dp"
android:background="@null"
android:minWidth="83dp"
app:tabBackground="@drawable/background_wilsh_tab"
app:tabIndicatorHeight="0dp"
app:tabMaxWidth="100dp"
app:tabMode="scrollable"
app:tabRippleColor="@color/transparent" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/context_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

134
common/src/main/res/layout/item_day_wish.xml Normal file
View File

@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tab_bg"
android:layout_width="match_parent"
android:layout_height="119dp"
android:layout_marginStart="11dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="11dp"
android:layout_marginBottom="4dp"
android:background="@drawable/bg_wish_gitf_button">
<FrameLayout
android:id="@+id/icon_cancel"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="19dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end"
android:background="@mipmap/icon_cancel" />
</FrameLayout>
<TextView
android:id="@+id/wish_tab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="13dp"
android:layout_marginTop="4dp"
android:textColor="@color/white"
android:textSize="14sp" />
<FrameLayout
android:id="@+id/wish_icon_bg"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="11dp"
android:layout_marginTop="40dp">
<ImageView
android:id="@+id/wish_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="3dp" />
</FrameLayout>
<TextView
android:id="@+id/wishlist_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="85dp"
android:layout_marginTop="49dp"
android:textColor="@color/white"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="85dp"
android:layout_marginTop="78dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="100dp"
android:layout_height="11dp"
android:max="100"
android:progress="30"
android:progressDrawable="@drawable/progress_wishlist2" />
<TextView
android:id="@+id/wishlist_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:text="2"
android:textColor="#FFE062"
android:textSize="12sp" />
<TextView
android:id="@+id/wishlist_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="/20"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/hind_layout"
android:layout_width="70dp"
android:layout_height="20dp"
android:layout_gravity="end"
android:layout_marginTop="77dp"
android:layout_marginEnd="19dp"
android:background="@drawable/bg_xyd_number"
android:orientation="horizontal">
<TextView
android:id="@+id/subtraction"
android:layout_width="20dp"
android:layout_height="match_parent"
android:gravity="center"
android:text="-"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/wishlist_num2"
android:layout_width="30dp"
android:layout_height="match_parent"
android:gravity="center"
android:text="x23"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/addition"
android:layout_width="20dp"
android:layout_height="match_parent"
android:gravity="center"
android:text="+"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
</FrameLayout>

24
common/src/main/res/layout/item_gitf_wish.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/wish_gift"
android:gravity="center"
android:background="@drawable/background_wilsh_gitf"
android:orientation="vertical">
<ImageView
android:id="@+id/gift_img"
android:layout_width="44dp"
android:layout_height="44dp" />
<TextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="香水玫瑰"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>

38
common/src/main/res/layout/item_lunar_wish.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="125dp"
android:layout_margin="4dp"
android:background="@mipmap/bg_lunar_wish">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="19dp"
android:background="@mipmap/icon_cancel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:layout_marginTop="4dp"
android:text="心願二"
android:textColor="@color/white"
android:textSize="14sp" />
<FrameLayout
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="11dp"
android:layout_marginTop="40dp"
android:background="@drawable/background_wish_item">
<ImageView
android:id="@+id/wish_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="3dp" />
</FrameLayout>
</FrameLayout>

38
common/src/main/res/layout/item_seasonal_wish.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="142dp"
android:layout_margin="4dp"
android:background="@mipmap/bg_seasonal_wish">
<ImageView
android:id="@+id/icon_cancel"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end"
android:layout_marginTop="17dp"
android:layout_marginEnd="19dp"
android:background="@mipmap/icon_cancel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:layout_marginTop="17dp"
android:text="心願二"
android:textColor="@color/white"
android:textSize="14sp" />
<FrameLayout
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="11dp"
android:layout_marginTop="53dp">
<ImageView
android:id="@+id/wish_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="3dp" />
</FrameLayout>
</FrameLayout>

38
common/src/main/res/layout/item_week_wish.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="119dp"
android:layout_margin="4dp"
android:background="@mipmap/bg_day_wish">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="19dp"
android:background="@mipmap/icon_cancel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:layout_marginTop="4dp"
android:text="心願二"
android:textColor="@color/white"
android:textSize="14sp" />
<FrameLayout
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="11dp"
android:layout_marginTop="40dp"
android:background="@drawable/background_wish_item">
<ImageView
android:id="@+id/wish_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="3dp" />
</FrameLayout>
</FrameLayout>

35
common/src/main/res/layout/view_live_new_wish.xml Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/imageView2"
android:layout_width="match_parent"
android:layout_height="117dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_xyd_add_item"
android:layout_marginBottom="4dp"
android:scaleType="centerInside" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/wish_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/tvDone"
android:layout_width="275dp"
android:layout_height="52dp"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="22dp"
android:background="@drawable/bg_xyd_button" />
</FrameLayout>
</LinearLayout>

29
common/src/main/res/layout/view_live_new_wish_gitf.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/gift_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="35dp" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/wish_tab"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_gravity="bottom"
android:layout_marginTop="5dp"
android:layout_marginEnd="2dp"
android:layout_marginBottom="10dp"
android:background="@null"
app:tabBackground="@drawable/background_wilsh_tab_gift"
app:tabGravity="center"
app:tabIndicatorHeight="0dp"
app:tabMode="scrollable"
app:tabRippleColor="@color/transparent" />
</FrameLayout>

9
common/src/main/res/layout/view_tablaout_wish_item.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#FFFFFF"
android:textSize="16sp">
</TextView>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 184 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 549 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 636 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 729 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

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

@@ -748,7 +748,6 @@
<string name="theguardianof">成爲%s的守護</string>
<string name="wallet_gold_name">我的%1$s:</string>
<string name="charge_explain">充值説明</string>
<string name="register_tip_1">注冊即代表同意</string>
@@ -1089,7 +1088,13 @@
<string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
<string name="say_something3">說點什麽吧...</string>
<string name="come_hint">%s 来了</string>
<string name="day_wish">日心願</string>
<string name="zhou_xin">周心願</string>
<string name="lunar_wish">月心願</string>
<string name="seasonal_wish">季心願</string>
<string name="wish_number">心願%s</string>
<string name="aristocrat">貴族</string>
<string name="aristocrat_determine">確定</string>
<string name="layout_live_anchor_say_ready_title">女神說</string>