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

Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令

Browse Source
This commit is contained in:
zlzw
2023-12-20 16:17:37 +08:00
parent d001712067 42cfcce1dc
commit dea3264577
10 changed files with 187 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
common/src/main/res/layout/activity_end_popup.xml Normal file
View File

@@ -0,0 +1,40 @@
<?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="218dp"
android:layout_marginStart="22dp"
android:layout_marginEnd="22dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginStart="30dp"
android:layout_marginTop="75dp"
android:layout_marginEnd="30dp"
android:gravity="center"
android:text="@string/this_activity_is_over"
android:textColor="#0D21B2"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/confirm"
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginTop="10dp"
android:layout_marginBottom="33dp"
android:background="@mipmap/button_buying_experience"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/edit_one_4"
android:textColor="#E03600"
android:textSize="14sp" />
</LinearLayout>
</FrameLayout>

37
common/src/main/res/layout/liberal_battle_pass_popup.xml
View File

@@ -23,28 +23,43 @@
android:layout_height="wrap_content"
android:layout_marginTop="57dp">
<Button
<LinearLayout
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" />
android:gravity="center_horizontal">
<Button
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/cancel"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/liberal_battle_sure"
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" />
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/confirm"
android:textColor="#E03600"
android:textSize="14sp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>

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

@@ -1412,5 +1412,6 @@ Limited ride And limited avatar frame</string>
<string name="order_level">我的等級</string>
<string name="buying_experience_point">購買經驗值：</string>
<string name="buying_experience">購買</string>
<string name="this_activity_is_over">本期活動已結束，請儘快領取未領取的獎勵積分可保留下次使用</string>
</resources>