王鹏鹏 преди 2 години
родител
ревизия
7e4d7d2295

+ 1 - 1
home/src/main/res/drawable/bg_game_total_level.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_17px" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/color_CCFFFFFF" />
 
     <padding
         android:left="@dimen/divider_14px"

+ 1 - 1
home/src/main/res/drawable/bg_buttom_game.xml → home/src/main/res/drawable/bg_home_buttom_game.xml

@@ -7,5 +7,5 @@
         android:bottomRightRadius="@dimen/divider_20px"
         android:topLeftRadius="@dimen/divider_8px"
         android:topRightRadius="@dimen/divider_8px" />
-    <solid android:color="@color/color_E6ffffff" />
+    <solid android:color="@color/color_FF4A76FF" />
 </shape>

+ 4 - 4
home/src/main/res/layout/activity_home.xml

@@ -219,16 +219,16 @@
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
                         android:layout_marginStart="@dimen/divider_20px"
-                        android:layout_marginTop="@dimen/divider_20px"
+                        android:layout_marginTop="@dimen/divider_10px"
                         android:layout_marginEnd="@dimen/divider_17px"
                         android:layout_weight="1" />
 
                     <Button
                         android:id="@+id/btnNextPage"
                         android:layout_width="@dimen/divider_307px"
-                        android:layout_height="@dimen/divider_80px"
-                        android:layout_marginTop="@dimen/divider_23px"
-                        android:layout_marginBottom="@dimen/divider_36px"
+                        android:layout_height="@dimen/divider_56px"
+                        android:layout_marginTop="@dimen/divider_18px"
+                        android:layout_marginBottom="@dimen/divider_18px"
                         android:background="@drawable/bg_home_game_btn"
                         android:text="@string/next_page"
                         android:textColor="@android:color/white"

+ 51 - 35
home/src/main/res/layout/item_game.xml

@@ -13,57 +13,73 @@
 
     <androidx.cardview.widget.CardView
         android:layout_width="@dimen/divider_200px"
-        android:layout_height="@dimen/divider_200px"
+        android:layout_height="@dimen/divider_245px"
         android:layout_marginStart="@dimen/divider_21px"
-        android:layout_marginTop="@dimen/divider_24px"
+        android:layout_marginTop="@dimen/divider_16px"
         android:layout_marginEnd="@dimen/divider_21px"
-        app:cardCornerRadius="@dimen/divider_20px">
+        app:cardCornerRadius="@dimen/divider_28px">
 
-        <FrameLayout
-            android:id="@+id/gameLayout"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <FrameLayout
+                android:id="@+id/gameLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:isCircle="@{false}"
-                app:loadHeadImg="@{data.gameCoverImage}" />
+                android:layout_height="@dimen/divider_200px"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top|left"
-                android:layout_marginStart="@dimen/divider_21px"
-                android:layout_marginTop="@dimen/divider_14px"
-                android:background="@drawable/bg_game_current_level"
-                android:text='@{"第"+data.currentLevel+"关"}'
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_14px" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:isCircle="@{false}"
+                    app:loadHeadImg="@{data.gameCoverImage}" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top|right"
-                android:layout_marginTop="@dimen/divider_14px"
-                android:layout_marginEnd="@dimen/divider_21px"
-                android:background="@drawable/bg_game_total_level"
-                android:text='@{"总关卡"+data.totalNum}'
-                android:textColor="@color/color_FF416AFF"
-                android:textSize="@dimen/divider_14px" />
+                <TextView
+                    android:layout_width="@dimen/divider_158px"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_marginTop="@dimen/divider_14px"
+                    android:layout_marginBottom="@dimen/divider_9px"
+                    android:background="@drawable/bg_game_total_level"
+                    android:gravity="right"
+                    android:text='@{"总关卡"+data.totalNum}'
+                    android:textColor="@color/color_FF416AFF"
+                    android:textSize="@dimen/divider_14px" />
+
+                <TextView
+                    android:layout_width="@dimen/divider_79px"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom|left"
+                    android:layout_marginStart="@dimen/divider_21px"
+                    android:layout_marginTop="@dimen/divider_14px"
+                    android:layout_marginBottom="@dimen/divider_9px"
+                    android:background="@drawable/bg_game_current_level"
+                    android:gravity="center"
+                    android:text='@{"第"+data.currentLevel+"关"}'
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_14px" />
+
+            </FrameLayout>
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_45px"
-                android:layout_gravity="bottom|center"
-                android:background="@drawable/bg_buttom_game"
+                android:layout_height="0dp"
+                android:background="@drawable/bg_home_buttom_game"
                 android:gravity="center"
                 android:text="@{data.gameName}"
-                android:textColor="@color/color_4A76FF"
+                android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_24px"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/gameLayout" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </FrameLayout>
 
     </androidx.cardview.widget.CardView>
 </layout>

+ 1 - 0
home/src/main/res/values/colors.xml

@@ -63,4 +63,5 @@
     <color name="color_FFA6A9FF" tools:ignore="ResourceName">#FFA6A9FF</color>
     <color name="color_FF88AAFF" tools:ignore="ResourceName">#FF88AAFF</color>
     <color name="color_4A76FF" tools:ignore="ResourceName">#4A76FF</color>
+    <color name="color_CCFFFFFF" tools:ignore="ResourceName">#CCFFFFFF</color>
 </resources>

+ 2 - 0
home/src/main/res/values/dimens.xml

@@ -39,6 +39,7 @@
     <dimen name="divider_255px" tools:ignore="ResourceName">255px</dimen>
     <dimen name="divider_250px" tools:ignore="ResourceName">250px</dimen>
     <dimen name="divider_249px" tools:ignore="ResourceName">249px</dimen>
+    <dimen name="divider_245px" tools:ignore="ResourceName">245px</dimen>
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_234px" tools:ignore="ResourceName">234px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
@@ -55,6 +56,7 @@
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
     <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>
     <dimen name="divider_173px" tools:ignore="ResourceName">173px</dimen>
+    <dimen name="divider_158px" tools:ignore="ResourceName">158px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
     <dimen name="divider_135px" tools:ignore="ResourceName">135px</dimen>
     <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>