From b6bb3bf7948ab6954b663ad676dfd8f69988c901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <zhangyujiu@ghzhushou.com>
Date: Tue, 1 Nov 2022 11:05:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=8C=9C=E4=BD=A0?=
 =?UTF-8?q?=E5=96=9C=E6=AC=A2-=E5=8F=91=E7=8E=B0=E9=A1=B5=E9=AA=A8?=
 =?UTF-8?q?=E6=9E=B6=E5=B1=8F=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/discovery/DiscoveryAdapter.kt  |  1 +
 .../com/gh/gamecenter/discovery/DiscoveryFragment.kt |  4 ++++
 .../gamecenter/common/baselist/LazyListFragment.java | 12 +++++++++++-
 .../src/main/res/layout/fragment_list_base.xml       |  3 ++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt
index 0834682b9a..134b2c1cce 100644
--- a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt
@@ -166,6 +166,7 @@ class DiscoveryAdapter(
             is RecommendInterestViewHolder -> {
                 holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext))
                 holder.binding.backgroundView.background = R.drawable.bg_shape_space_radius_8.toDrawable(mContext)
+                holder.binding.interestTv.setTextColor(R.color.text_title.toColor(mContext))
                 val labels = mEntityList[position].interestCardLabels ?: return
                 val labelTvList = arrayListOf(holder.binding.labelTv1, holder.binding.labelTv2, holder.binding.labelTv3)
                 labelTvList.forEachIndexed { index, labelTv ->
diff --git a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt
index 0f192424d2..d80ed897b6 100644
--- a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt
@@ -64,6 +64,10 @@ class DiscoveryFragment : LazyListFragment<DiscoveryItemData, DiscoveryViewModel
     override fun initRealView() {
         super.initRealView()
         mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext()))
+    }
+
+    override fun initSkeletonScreen() {
+        if (mSkeletonScreenView == null) return
         mSkeletonScreen = Skeleton.bind(mSkeletonScreenView)
             .shimmer(true)
             .angle(Constants.SHIMMER_ANGLE)
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/baselist/LazyListFragment.java b/module_common/src/main/java/com/gh/gamecenter/common/baselist/LazyListFragment.java
index 54f45bfe19..68c940a4cc 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/baselist/LazyListFragment.java
+++ b/module_common/src/main/java/com/gh/gamecenter/common/baselist/LazyListFragment.java
@@ -149,7 +149,7 @@ public abstract class LazyListFragment<T, VM extends BaseListViewModel /* 该泛
         mReuseNoData = mCachedView.findViewById(R.id.reuse_none_data);
         mDataExceptionView = mCachedView.findViewById(R.id.reuse_data_exception);
         mSkeletonScreenView = mCachedView.findViewById(R.id.skeleton);
-
+        initSkeletonScreen();
         if (mListRefresh != null) {
             mListRefresh.setColorSchemeResources(R.color.theme);
             mListRefresh.setOnRefreshListener(this);
@@ -302,6 +302,10 @@ public abstract class LazyListFragment<T, VM extends BaseListViewModel /* 该泛
         }
     }
 
+    protected void initSkeletonScreen() {
+
+    }
+
     // 需要自动加载更多的页面重载这个方法 (默认空方法)
     protected void autoLoadMore() {
 
@@ -320,4 +324,10 @@ public abstract class LazyListFragment<T, VM extends BaseListViewModel /* 该泛
     protected void hideRefreshingLayout() {
         if (mListRefresh != null) mListRefresh.setRefreshing(false);
     }
+
+    @Override
+    protected void onDarkModeChanged() {
+        super.onDarkModeChanged();
+        initSkeletonScreen();
+    }
 }
\ No newline at end of file
diff --git a/module_common/src/main/res/layout/fragment_list_base.xml b/module_common/src/main/res/layout/fragment_list_base.xml
index a3ea6fd9b7..60ed2f9f3e 100644
--- a/module_common/src/main/res/layout/fragment_list_base.xml
+++ b/module_common/src/main/res/layout/fragment_list_base.xml
@@ -17,7 +17,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list_rv"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:visibility="gone" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include