update 粉丝团

live/src/main/res/layout/dialog_fans_group_buy.xml

@@ -31,7 +31,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="主播昵稱的" />
+            tools:text="主播昵稱" />
 
         <TextView
             android:id="@+id/giftName"
@@ -44,7 +44,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/anchorName"
-            tools:text="臻愛禮包" />
+            android:text="@string/live_fans_group_buy_title" />
 
         <TextView
             android:id="@+id/giftInfo"
@@ -56,7 +56,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/giftName"
-            tools:text="購買可獲得5200鑽特定禮物，同時可獲得限定資源" />
+            android:text="@string/live_fans_group_buy_info" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/giftList"
@@ -89,6 +89,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/giftList"
-            tools:text="5200鑽購買" />
+            android:text="@string/live_fans_group_buy_buy" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

live/src/main/res/layout/dialog_fans_group_info.xml

@@ -73,4 +73,14 @@
                 android:text="@string/live_fans_group_info2_text2" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
+
+    <ImageView
+        android:id="@+id/colse"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:src="@mipmap/ic_live_fans_group_info_colse"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

live/src/main/res/layout/dialog_fans_group_send.xml

@@ -29,7 +29,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="當前可送出" />
+            android:text="@string/live_fans_group_send_title" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/giftList"

live/src/main/res/layout/item_fans_group_package_list.xml

@@ -56,7 +56,23 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
-        android:id="@+id/textView12"
+        android:id="@+id/day"
+        android:layout_width="27dp"
+        android:layout_height="12dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="4dp"
+        android:background="@mipmap/icon_fans_group_buy_dialog_day"
+        android:gravity="center"
+        android:textColor="#7059BB"
+        android:textSize="8sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="1天"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/send"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="7dp"
@@ -65,12 +81,12 @@
         android:paddingTop="4dp"
         android:paddingEnd="13dp"
         android:paddingBottom="4dp"
-        tools:text="贈送"
         android:textColor="#E6FFFFFF"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/constraintLayout4" />
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout4"
+        android:text="@string/live_fans_group_send_sub" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

live/src/main/res/values-en/strings.xml

@@ -108,4 +108,9 @@
     <string name="live_fans_group_info_title">Introduction</string>
     <string name="live_fans_group_info2_title">Rules</string>
     <string name="live_fans_follow_toast">Join the fan group and unlock exclusive gifts</string>
+    <string name="live_fans_group_send_sub">Gift</string>
+    <string name="live_fans_group_send_title">Currently Available To Send</string>
+    <string name="live_fans_group_buy_title">The Perfect GiftPack</string>
+    <string name="live_fans_group_buy_info">Purchase a %s Diamond Specific Gift And Receive ALimited Resource</string>
+    <string name="live_fans_group_buy_buy">Diamond Purchase</string>
 </resources>

live/src/main/res/values/strings.xml

@@ -106,4 +106,9 @@
     <string name="live_fans_group_info_title">禮包介紹</string>
     <string name="live_fans_group_info2_title">購買規則</string>
     <string name="live_fans_follow_toast">加入粉絲團,解鎖專屬禮物</string>
+    <string name="live_fans_group_send_sub">赠送</string>
+    <string name="live_fans_group_send_title">當前可送出</string>
+    <string name="live_fans_group_buy_title">的臻愛禮包</string>
+    <string name="live_fans_group_buy_info">購買可獲得%s鑽特定禮物，同時可獲得限定資源</string>
+    <string name="live_fans_group_buy_buy">%s鑽購買</string>
 </resources>