From a21ceabfdf4e65254b151fb5df8214d7616be62f Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Wed, 9 Oct 2019 17:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E4=B8=AA=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personalhome/home/UserHistoryFragment.kt   |  2 +-
 .../home/UserVideoHistoryFragment.kt           |  3 +++
 app/src/main/res/layout/fragment_home.xml      | 18 +++++++++---------
 .../main/res/layout/fragment_user_history.xml  |  2 --
 .../res/layout/layout_user_history_filter.xml  |  4 ++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
index 20c204f089..1811788916 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
@@ -80,7 +80,7 @@ class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewM
         val contentList = UserHistoryViewModel.TYPE.TYPE_LIST
 
         val inflater = LayoutInflater.from(filterBtn.context)
-        val layout = inflater.inflate(R.layout.game_comment_hint, null)
+        val layout = inflater.inflate(R.layout.layout_user_history_filter, null)
         val popupWindow = PopupWindow(
                 layout,
                 LinearLayout.LayoutParams.WRAP_CONTENT,
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt
index 1d0bc4b3c7..25e3c245e7 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt
@@ -1,7 +1,9 @@
 package com.gh.gamecenter.personalhome.home
 
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.util.DisplayUtils
@@ -45,6 +47,7 @@ class UserVideoHistoryFragment : ListFragment<PersonalHistoryEntity, UserVideoHi
             }
         }
         mListRv.layoutManager = gridLayoutManager
+        mListRv.background = ColorDrawable(ContextCompat.getColor(requireContext(), R.color.white))
         mListRv.setPadding(DisplayUtils.dip2px(20f), 0, DisplayUtils.dip2px(20f), 0)
     }
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index db4a44cbf2..536bb50659 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -253,21 +253,21 @@
                         </LinearLayout>
                     </LinearLayout>
 
+                    <View
+                        android:id="@+id/divider"
+                        android:layout_width="match_parent"
+                        android:layout_height="8dp"
+                        android:background="@color/background"
+                        app:layout_constraintTop_toBottomOf="@id/user_count_container" />
+
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/playedGameContainer"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:visibility="gone"
-                        app:layout_constraintTop_toBottomOf="@id/user_count_container"
+                        app:layout_constraintTop_toBottomOf="@id/divider"
                         tools:visibility="visible">
 
-                        <View
-                            android:id="@+id/divider"
-                            android:layout_width="match_parent"
-                            android:layout_height="8dp"
-                            android:background="@color/background"
-                            app:layout_constraintTop_toTopOf="parent" />
-
                         <TextView
                             android:id="@+id/playedGameTitleTv"
                             android:layout_width="wrap_content"
@@ -279,7 +279,7 @@
                             android:textSize="14sp"
                             android:textStyle="bold"
                             app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/divider" />
+                            app:layout_constraintTop_toTopOf="parent" />
 
                         <TextView
                             android:id="@+id/checkMoreTv"
diff --git a/app/src/main/res/layout/fragment_user_history.xml b/app/src/main/res/layout/fragment_user_history.xml
index 6c10ab0715..644900d715 100644
--- a/app/src/main/res/layout/fragment_user_history.xml
+++ b/app/src/main/res/layout/fragment_user_history.xml
@@ -46,8 +46,6 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list_rv"
-            android:clipToPadding="false"
-            android:paddingTop="-50dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/layout_user_history_filter.xml b/app/src/main/res/layout/layout_user_history_filter.xml
index 313c5f29b9..3bc9de5fb7 100644
--- a/app/src/main/res/layout/layout_user_history_filter.xml
+++ b/app/src/main/res/layout/layout_user_history_filter.xml
@@ -17,8 +17,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
             android:scrollbars="none">
 
             <LinearLayout