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-11-14 16:05:43 +08:00
parent aff5a178a0
commit 82c1d15ca5
9 changed files with 158 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
common/src/main/res/layout/sud_game_rule_bottom_popup.xml
View File

@@ -11,82 +11,83 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:orientation="vertical">
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFFFFF"
android:textSize="24sp" />
<TextView
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#FFFFFF"
android:textSize="14sp" />
android:layout_marginTop="32dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="4"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFFFFF"
android:textSize="24sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#FFFFFF"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:maxLines="5"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:layout_marginBottom="22dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="21dp"
android:layout_marginBottom="22dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="@color/white"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</ScrollView>
</androidx.appcompat.widget.LinearLayoutCompat>
<ImageView
android:id="@+id/sud_rule_close"

137
common/src/main/res/layout/sud_game_rule_popup.xml
View File

@@ -9,9 +9,9 @@
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="4dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
app:cardCornerRadius="4dp"
app:cardElevation="12dp">
<FrameLayout
@@ -19,82 +19,83 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:orientation="vertical">
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFA800"
android:textSize="24sp" />
<TextView
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#333333"
android:textSize="14sp" />
android:layout_marginTop="32dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="4"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/regular_bubble"
android:textColor="#FFA800"
android:textSize="24sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="3"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint1"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="5"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint2"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="42dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint3"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint4"
android:textColor="#333333"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="42dp"
android:ellipsize="end"
android:text="@string/sud_in_game_rule_hint5"
android:textColor="#333333"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</ScrollView>
</androidx.appcompat.widget.LinearLayoutCompat>
<ImageView
android:id="@+id/sud_rule_close"