弹窗整合

common/src/main/res/layout/activate_elite_battle_order_popup.xml

@@ -1,18 +1,38 @@
 <?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="300dp"
+    android:layout_height="291dp"
     android:layout_marginStart="17dp"
     android:layout_marginEnd="17dp"
     android:background="@drawable/background_order_dialog"
     android:orientation="vertical">
 
     <ImageView
+        android:id="@+id/war_order_close"
+        android:layout_width="19dp"
+        android:layout_height="19dp"
+        android:layout_gravity="end"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="14dp"
+        android:src="@mipmap/icon_sud_rule_close" />
+
+    <ImageView
+        android:id="@+id/elites_image"
         android:layout_width="211dp"
         android:layout_height="27dp"
         android:layout_gravity="center"
-        android:layout_marginTop="39dp"
-        android:src="@mipmap/icon_activate_the_elite_battle_order" />
+        android:layout_marginTop="3dp"
+        android:src="@mipmap/icon_activate_the_elite_battle_order"
+        android:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/enjoy_image"
+        android:layout_width="211dp"
+        android:layout_height="27dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="3dp"
+        android:src="@mipmap/icon_enjoy_image"
+        android:visibility="visible" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -34,12 +54,24 @@
                 android:src="@mipmap/icon_war_order_diamond" />
 
             <TextView
+                android:id="@+id/gift_overvalue"
                 android:layout_width="71dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:gravity="center"
                 android:text="@string/gift_overvalue"
                 android:textColor="#CE2BFF"
+                android:textSize="14sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/gift_overvalue3"
+                android:layout_width="71dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:gravity="center"
+                android:text="@string/gift_overvalue3"
+                android:textColor="#CE2BFF"
                 android:textSize="14sp" />
         </LinearLayout>
 
@@ -97,8 +129,13 @@
         android:textSize="13sp" />
 
     <Button
-        android:layout_width="152dp"
-        android:layout_height="72dp"
+        android:id="@+id/button_war_order"
+        android:layout_width="150dp"
+        android:layout_height="48dp"
+        android:textSize="15sp"
+        android:textColor="@color/white"
+        android:textStyle="bold"
+        android:gravity="center"
         android:layout_gravity="center"
         android:layout_marginTop="10dp"
         android:background="@mipmap/button_war_order" />

common/src/main/res/layout/liberal_battle_pass_popup.xml

@@ -0,0 +1,50 @@
+<?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="218dp"
+    android:layout_marginStart="22dp"
+    android:layout_marginEnd="22dp"
+    android:background="@drawable/background_order_dialog"
+    android:orientation="vertical">
+
+
+    <TextView
+        android:id="@+id/liberal_battle_pass"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="73dp"
+        android:text="liberal_battle_pass2"
+        android:textColor="#0D21B2"
+        android:textSize="16sp" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="57dp">
+
+
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="116dp"
+            android:layout_height="38dp"
+            android:layout_marginStart="19dp"
+            android:background="@mipmap/button_liberal_battle_cancel"
+            android:gravity="center"
+            android:text="@string/cancel"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp" />
+
+        <Button
+            android:layout_width="116dp"
+            android:layout_height="38dp"
+            android:layout_gravity="end"
+            android:layout_marginEnd="19dp"
+            android:background="@mipmap/button_liberal_battle_sure"
+            android:gravity="center"
+            android:text="@string/confirm"
+            android:textColor="#E03600"
+            android:textSize="14sp" />
+    </FrameLayout>
+
+</LinearLayout>

common/src/main/res/layout/promotion_elite_popup.xml

@@ -8,6 +8,7 @@
     android:orientation="vertical">
 
     <ImageView
+        android:id="@+id/close"
         android:layout_width="19dp"
         android:layout_height="19dp"
         android:layout_gravity="end"
@@ -40,12 +41,14 @@
         android:layout_marginTop="30dp">
 
         <Button
+            android:id="@+id/button_quintessence"
             android:layout_width="116dp"
             android:layout_height="38dp"
             android:layout_marginStart="34dp"
             android:background="@mipmap/button_quintessence" />
 
         <Button
+            android:id="@+id/button_enjoy"
             android:layout_width="116dp"
             android:layout_height="38dp"
             android:layout_gravity="end"

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

@@ -1406,6 +1406,8 @@ Limited ride And limited avatar frame</string>
     <string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
     <string name="more_integral">更多積分</string>
     <string name="gift_overvalue">禮物價值超 200%</string>
+    <string name="gift_overvalue3">禮物價值超 300%</string>
     <string name="unlock_more_gifts">解鎖更多禮物 和全套珍稀裝扮</string>
     <string name="has_reached_level_after_opening">開通后已達到等級的獎勵將會自動解鎖！</string>
+
 </resources>