跨房PK发起弹窗UI修改

2022-03-30 17:04:41 +08:00
parent 4b8c6e91e0
commit 0f99ff56ba
10 changed files with 67 additions and 27 deletions
--- a/app/src/common/res/drawable/bg_2a2a39_radius_top_15.xml
+++ b/app/src/common/res/drawable/bg_2a2a39_radius_top_15.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:topLeftRadius="15dp" android:topRightRadius="15dp"/>
+
+    <solid android:color="#2a2a39"/>
+
+</shape>
--- a/app/src/main/res/drawable/bg_room_pk_bottom.xml
+++ b/app/src/main/res/drawable/bg_room_pk_bottom.xml
@@ -3,7 +3,7 @@
    <gradient
        android:angle="45"
        android:endColor="@color/transparent"
-        android:startColor="@color/bg_secondary_2a2a39"
+        android:startColor="@color/black"
        android:type="linear"
        android:useLevel="true" />

--- a/app/src/main/res/drawable/bg_room_pk_common_btn.xml
+++ b/app/src/main/res/drawable/bg_room_pk_common_btn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <solid android:color="#FFF1F1FA" />
+    <solid android:color="#FF4C4C6A" />
    <corners android:radius="100dp" />
 </shape>
--- a/app/src/main/res/drawable/bg_room_pk_rb.xml
+++ b/app/src/main/res/drawable/bg_room_pk_rb.xml
@@ -15,7 +15,7 @@

    <item android:state_checked="false">
        <shape android:shape="rectangle">
-            <solid android:color="#4dFFCB47" />
+            <solid android:color="#FF4C4C6A" />
            <corners android:radius="100dp" />
        </shape>
    </item>
--- a/app/src/main/res/drawable/common_room_pk_btn_bg.xml
+++ b/app/src/main/res/drawable/common_room_pk_btn_bg.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="true">
+        <shape android:shape="rectangle">
+            <gradient android:angle="180" android:endColor="#218EFF" android:startColor="#7727E4" android:type="linear" android:useLevel="true" />
+            <corners android:radius="100dp" />
+        </shape>
+    </item>
+
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="#4C4C6A" />
+            <corners android:radius="100dp" />
+        </shape>
+    </item>
+
+</selector>
--- a/app/src/main/res/drawable/common_room_pk_cancel_btn_bg.xml
+++ b/app/src/main/res/drawable/common_room_pk_cancel_btn_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="180"
+        android:endColor="#FFBCDDFF"
+        android:startColor="#FFD6BEF7"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners android:radius="100dp" />
+</shape>
+
--- a/app/src/main/res/layout/activity_room_pk_create.xml
+++ b/app/src/main/res/layout/activity_room_pk_create.xml
@@ -10,7 +10,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom"
-        android:background="@drawable/bg_secondary_radius_top_15"
+        android:background="@drawable/bg_2a2a39_radius_top_15"
        android:orientation="vertical">

        <TextView
@@ -19,7 +19,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="18dp"
            android:text="跨房PK"
-            android:textColor="@color/text_title_white"
+            android:textColor="@color/white"
            android:textSize="18sp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
            android:layout_marginStart="12dp"
            android:layout_marginTop="40dp"
            android:text="选择PK对象"
-            android:textColor="@color/text_title_white"
+            android:textColor="@color/white"
            android:textSize="16sp"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/tv_title" />
@@ -88,7 +88,7 @@
                    android:id="@+id/tv_room_title"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:textColor="#ffffffff"
+                    android:textColor="@color/white"
                    android:textSize="14sp"
                    tools:text="厅的名字000" />

@@ -96,7 +96,7 @@
                    android:id="@+id/tv_room_id"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:textColor="#ffffffff"
+                    android:textColor="@color/white"
                    android:textSize="14sp"
                    tools:text="大鹅号:1234" />
            </LinearLayout>
@@ -120,7 +120,7 @@
            android:layout_marginStart="12dp"
            android:layout_marginTop="40dp"
            android:text="选择PK时长"
-            android:textColor="@color/text_title_white"
+            android:textColor="@color/white"
            android:textSize="16sp"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/tv_pk_object" />
@@ -147,7 +147,7 @@
                android:checked="true"
                android:gravity="center"
                android:text="10分钟"
-                android:textColor="@color/text_title_white"
+                android:textColor="@color/white"
                android:textSize="15sp" />

            <RadioButton
@@ -160,7 +160,7 @@
                android:button="@null"
                android:gravity="center"
                android:text="20分钟"
-                android:textColor="@color/text_title_white"
+                android:textColor="@color/white"
                android:textSize="15sp" />

            <RadioButton
@@ -173,7 +173,7 @@
                android:button="@null"
                android:gravity="center"
                android:text="30分钟"
-                android:textColor="@color/text_title_white"
+                android:textColor="@color/white"
                android:textSize="15sp" />

        </RadioGroup>
@@ -189,8 +189,8 @@
            android:maxLength="3"
            android:paddingStart="20dp"
            android:paddingEnd="50dp"
-            android:textColor="@color/text_title_white"
-            android:textColorHint="@color/color_666666"
+            android:textColor="@color/white"
+            android:textColorHint="@color/color_c6c6e9"
            android:textSize="15dp"
            app:layout_constraintStart_toStartOf="@id/rg"
            app:layout_constraintTop_toBottomOf="@id/rg" />
@@ -200,7 +200,7 @@
            android:layout_height="wrap_content"
            android:layout_marginEnd="16dp"
            android:text="分钟"
-            android:textColor="@color/text_title_white"
+            android:textColor="@color/white"
            android:textSize="15sp"
            app:layout_constraintBottom_toBottomOf="@id/edit_time"
            app:layout_constraintEnd_toEndOf="@id/edit_time"
@@ -212,7 +212,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="40dp"
            android:text="PK玩法"
-            android:textColor="@color/text_title_white"
+            android:textColor="@color/white"
            android:textSize="16sp"
            app:layout_constraintEnd_toEndOf="@id/tv_pk_time"
            app:layout_constraintTop_toBottomOf="@id/edit_time" />
@@ -227,8 +227,8 @@
            android:maxLength="10"
            android:paddingStart="20dp"
            android:paddingEnd="50dp"
-            android:textColor="@color/text_title_white"
-            android:textColorHint="@color/color_666666"
+            android:textColor="@color/white"
+            android:textColorHint="@color/color_c6c6e9"
            android:textSize="15sp"
            app:layout_constraintBottom_toBottomOf="@id/tv_pk_desc"
            app:layout_constraintEnd_toEndOf="parent"
@@ -241,7 +241,7 @@
            android:layout_height="40dp"
            android:layout_marginTop="50dp"
            android:layout_marginBottom="38dp"
-            android:background="@drawable/common_btn_bg"
+            android:background="@drawable/common_room_pk_btn_bg"
            android:enabled="false"
            android:gravity="center"
            android:text="发起挑战"
--- a/app/src/main/res/layout/activity_room_pk_search.xml
+++ b/app/src/main/res/layout/activity_room_pk_search.xml
@@ -10,7 +10,7 @@
        android:layout_width="match_parent"
        android:layout_height="405dp"
        android:layout_gravity="bottom"
-        android:background="@drawable/bg_secondary_radius_top_15"
+        android:background="@drawable/bg_2a2a39_radius_top_15"
        android:orientation="vertical">

        <ImageView
@@ -19,7 +19,7 @@
            android:layout_height="40dp"
            android:layout_marginTop="16dp"
            android:scaleType="center"
-            android:src="@drawable/arrow_left"
+            android:src="@drawable/arrow_left_white"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

@@ -36,8 +36,8 @@
            android:maxLength="15"
            android:paddingStart="20dp"
            android:paddingEnd="50dp"
-            android:textColor="@color/text_title_white"
-            android:textColorHint="@color/color_666666"
+            android:textColor="@color/white"
+            android:textColorHint="@color/white"
            android:textSize="15sp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toEndOf="@id/iv_back"
@@ -49,7 +49,7 @@
            android:layout_height="40dp"
            android:layout_marginEnd="10dp"
            android:scaleType="center"
-            android:src="@drawable/ic_home_search"
+            android:src="@drawable/ic_room_pk_search"
            app:layout_constraintBottom_toBottomOf="@id/edit_search"
            app:layout_constraintEnd_toEndOf="@id/edit_search"
            app:layout_constraintTop_toTopOf="@id/edit_search" />
@@ -75,7 +75,7 @@
            android:layout_height="40dp"
            android:layout_marginTop="50dp"
            android:layout_marginBottom="38dp"
-            android:background="@drawable/common_btn_bg"
+            android:background="@drawable/common_room_pk_btn_bg"
            android:enabled="false"
            android:gravity="center"
            android:text="确认选择"
--- a/app/src/main/res/layout/item_room_pk_search.xml
+++ b/app/src/main/res/layout/item_room_pk_search.xml
@@ -25,7 +25,7 @@
            android:id="@+id/tv_room_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:textColor="@color/text_title_white"
+            android:textColor="@color/white"
            android:textSize="14sp"
            tools:text="厅的名字000" />

@@ -33,7 +33,7 @@
            android:id="@+id/tv_room_id"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:textColor="@color/text_title_white"
+            android:textColor="@color/white"
            android:textSize="14sp"
            tools:text="大鹅号:1234" />
    </LinearLayout>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -599,5 +599,6 @@

    <color name="color_40_333333">#66333333</color>
    <color name="color_30_ffce4e">#4DFFCE4E</color>
+    <color name="color_c6c6e9">#c6c6e9</color>

 </resources>