diff --git a/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt index 77cbde07b8..31b50bfdc9 100644 --- a/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt @@ -706,6 +706,7 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISmartRefresh, mShowTwoLevel = false if (mIsDragging) { + mAutoFinishTwoLevelHandler?.removeMessages(KEY_AUTO_FINISH_TWO_LEVEL) mElapsedHelper.pauseCounting() mPullDownPush?.run { SensorsBridge.trackEvent( @@ -1381,7 +1382,7 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISmartRefresh, val currentTabStyle = getCurrentTabStyle() currentTabStyle?.offsetRatio = offset / totalHeight.toFloat() if (((currentTabStyle?.isSlideBackgroundColorShow == true || (currentTabStyle != null && isDarkModeChanged)) && offset >= totalHeight) - || currentTabStyle?.isSlideBackgroundColorEnable == false + || (currentTabStyle?.isSlideBackgroundColorEnable == false && mViewModel.isTabCustomPage(mLastSelectedPosition)) ) { currentTabStyle.isSlideBackgroundColorShow = false currentTabStyle.primaryColor = mBackgroundWhiteColor @@ -1408,8 +1409,6 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISmartRefresh, updateAppBarColorWhenScrollChanged(colorInBetween) currentTabStyle?.primaryColor = colorInBetween currentTabStyle?.useLightStyle = offsetMeetsCriticalPoint - currentTabStyle?.primaryColor = colorInBetween - currentTabStyle?.useLightStyle = offsetMeetsCriticalPoint if (mIsDisplayingLightContent != currentTabStyle?.useLightStyle) { mIsDisplayingLightContent = offsetMeetsCriticalPoint } diff --git a/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt index a3bbaa2128..afa52bdd6e 100644 --- a/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt @@ -482,6 +482,7 @@ class ToolbarWrapperFragment : LazyFragment(), ToolbarController, ISmartRefresh, mShowTwoLevel = false if (mIsDragging) { + mAutoFinishTwoLevelHandler?.removeMessages(KEY_AUTO_FINISH_TWO_LEVEL) mElapsedHelper.pauseCounting() mPullDownPush?.run { SensorsBridge.trackEvent( diff --git a/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml b/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml index 6bc33453d6..dcf609abbc 100644 --- a/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml +++ b/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml @@ -338,8 +338,7 @@ + android:layout_height="0dp" />