修改setEdgeEffectColor，适配ViewPager

app/src/main/java/io/legado/app/base/BaseActivity.kt

@@ -30,7 +30,7 @@ abstract class BaseActivity<VM : ViewModel>(private val fullScreen: Boolean = tr
         setupSystemBar()
         super.onCreate(savedInstanceState)
         setContentView(layoutID)
-        onViewModelCreated(viewModel, savedInstanceState)
+        onActivityCreated(viewModel, savedInstanceState)
         observeLiveBus()
     }
 
@@ -39,7 +39,7 @@ abstract class BaseActivity<VM : ViewModel>(private val fullScreen: Boolean = tr
         cancel()
     }
 
-    abstract fun onViewModelCreated(viewModel: VM, savedInstanceState: Bundle?)
+    abstract fun onActivityCreated(viewModel: VM, savedInstanceState: Bundle?)
 
     final override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         return menu?.let {

app/src/main/java/io/legado/app/lib/theme/ATH.kt

@@ -11,6 +11,7 @@ import android.widget.EdgeEffect
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager.widget.ViewPager
 import io.legado.app.utils.getPrefBoolean
 
 
@@ -28,7 +29,10 @@ object ATH {
     }
 
     fun setStatusbarColorAuto(activity: Activity) {
-        setStatusbarColor(activity, ThemeStore.statusBarColor(activity, activity.getPrefBoolean("transparentStatusBar")))
+        setStatusbarColor(
+            activity,
+            ThemeStore.statusBarColor(activity, activity.getPrefBoolean("transparentStatusBar"))
+        )
     }
 
     fun setStatusbarColor(activity: Activity, color: Int) {
@@ -116,8 +120,8 @@ object ATH {
         return dialog
     }
 
-    fun setEdgeEffectColor(view: RecyclerView, color: Int) {
-        view.edgeEffectFactory = object : RecyclerView.EdgeEffectFactory() {
+    fun setEdgeEffectColor(view: RecyclerView?, @ColorInt color: Int) {
+        view?.edgeEffectFactory = object : RecyclerView.EdgeEffectFactory() {
             override fun createEdgeEffect(view: RecyclerView, direction: Int): EdgeEffect {
                 val edgeEffect = super.createEdgeEffect(view, direction)
                 edgeEffect.color = color
@@ -125,4 +129,32 @@ object ATH {
             }
         }
     }
+
+    fun setEdgeEffectColor(viewPager: ViewPager?, @ColorInt color: Int) {
+        try {
+            val clazz = ViewPager::class.java
+            for (name in arrayOf("mLeftEdge", "mRightEdge")) {
+                val field = clazz.getDeclaredField(name)
+                field.isAccessible = true
+                val edge = field.get(viewPager)
+                (edge as EdgeEffect).color = color
+            }
+        } catch (ignored: Exception) {
+        }
+    }
+
+    fun applyEdgeEffectColor(view: View?) {
+        when (view) {
+            is RecyclerView -> view.edgeEffectFactory = DEFAULT_EFFECT_FACTORY
+            is ViewPager -> setEdgeEffectColor(view, ThemeStore.primaryColor(view.context))
+        }
+    }
+
+    private val DEFAULT_EFFECT_FACTORY = object : RecyclerView.EdgeEffectFactory() {
+        override fun createEdgeEffect(view: RecyclerView, direction: Int): EdgeEffect {
+            val edgeEffect = super.createEdgeEffect(view, direction)
+            edgeEffect.color = ThemeStore.primaryColor(view.context)
+            return edgeEffect
+        }
+    }
 }

app/src/main/java/io/legado/app/ui/about/AboutActivity.kt

@@ -17,7 +17,7 @@ class AboutActivity : BaseActivity<AndroidViewModel>() {
     override val layoutID: Int
         get() = R.layout.activity_about
 
-    override fun onViewModelCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
         val fTag = "aboutFragment"
         var aboutFragment = supportFragmentManager.findFragmentByTag(fTag)
         if (aboutFragment == null) aboutFragment = AboutFragment()

app/src/main/java/io/legado/app/ui/about/DonateActivity.kt

@@ -30,7 +30,7 @@ class DonateActivity : BaseActivity<AndroidViewModel>() {
     override val layoutID: Int
         get() = R.layout.activity_donate
 
-    override fun onViewModelCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
         setSupportActionBar(toolbar)
         vw_zfb_tz.setOnClickListener { aliDonate(this) }
         cv_wx_gzh.setOnClickListener {

app/src/main/java/io/legado/app/ui/bookinfo/BookInfoActivity.kt

@@ -11,7 +11,7 @@ class BookInfoActivity : BaseActivity<BookInfoViewModel>() {
     override val layoutID: Int
         get() = R.layout.activity_book_info
 
-    override fun onViewModelCreated(viewModel: BookInfoViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: BookInfoViewModel, savedInstanceState: Bundle?) {
 
     }
 

app/src/main/java/io/legado/app/ui/bookinfo/BookInfoEditActivity.kt

@@ -11,7 +11,7 @@ class BookInfoEditActivity : BaseActivity<BookInfoViewModel>() {
     override val layoutID: Int
         get() = R.layout.activity_book_info_edit
 
-    override fun onViewModelCreated(viewModel: BookInfoViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: BookInfoViewModel, savedInstanceState: Bundle?) {
 
     }
 

app/src/main/java/io/legado/app/ui/bookshelf/BookshelfActivity.kt

@@ -24,7 +24,7 @@ class BookshelfActivity : BaseActivity<BookshelfViewModel>() {
     private lateinit var bookshelfAdapter: BookshelfAdapter
     private var bookshelfLiveData: LiveData<PagedList<Book>>? = null
 
-    override fun onViewModelCreated(viewModel: BookshelfViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: BookshelfViewModel, savedInstanceState: Bundle?) {
         if (viewModel.bookGroup == null) {
             viewModel.bookGroup = intent.getParcelableExtra("data")
         }

app/src/main/java/io/legado/app/ui/booksource/BookSourceActivity.kt

@@ -37,7 +37,7 @@ class BookSourceActivity : BaseActivity<BookshelfViewModel>(), BookSourceAdapter
     private lateinit var adapter: BookSourceAdapter
     private var bookSourceLiveDate: LiveData<PagedList<BookSource>>? = null
 
-    override fun onViewModelCreated(viewModel: BookshelfViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: BookshelfViewModel, savedInstanceState: Bundle?) {
         setSupportActionBar(toolbar)
         initRecyclerView()
         initDataObserve()

app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt

@@ -13,7 +13,7 @@ class ConfigActivity : BaseActivity<ConfigViewModel>() {
     override val layoutID: Int
         get() = R.layout.activity_config
 
-    override fun onViewModelCreated(viewModel: ConfigViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: ConfigViewModel, savedInstanceState: Bundle?) {
         intent.getIntExtra("configType", -1).let {
             if (it != -1) viewModel.configType = it
         }

app/src/main/java/io/legado/app/ui/main/MainActivity.kt

@@ -14,6 +14,7 @@ import io.legado.app.base.BaseActivity
 import io.legado.app.constant.Bus
 import io.legado.app.help.permission.Permissions
 import io.legado.app.help.permission.PermissionsCompat
+import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.Selector
 import io.legado.app.lib.theme.ThemeStore
 import io.legado.app.ui.main.bookshelf.BookshelfFragment
@@ -35,10 +36,11 @@ class MainActivity : BaseActivity<MainViewModel>(), BottomNavigationView.OnNavig
     override val layoutID: Int
         get() = R.layout.activity_main
 
-    override fun onViewModelCreated(viewModel: MainViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: MainViewModel, savedInstanceState: Bundle?) {
+        ATH.applyEdgeEffectColor(view_pager_main)
         bottom_navigation_view.setBackgroundColor(ThemeStore.backgroundColor(this))
         val colorStateList = Selector.colorBuild()
-            .setDefaultColor(bottom_navigation_view.context.getCompatColor(R.color.btn_bg_press_tp))
+            .setDefaultColor(getCompatColor(R.color.btn_bg_press_tp))
             .setSelectedColor(ThemeStore.primaryColor(bottom_navigation_view.context)).create()
         bottom_navigation_view.itemIconTintList = colorStateList
         bottom_navigation_view.itemTextColor = colorStateList

app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt

@@ -17,11 +17,13 @@ import io.legado.app.R
 import io.legado.app.base.BaseFragment
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookGroup
+import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.ThemeStore
 import io.legado.app.ui.bookshelf.BookshelfActivity
 import io.legado.app.ui.search.SearchActivity
 import io.legado.app.utils.disableAutoFill
 import kotlinx.android.synthetic.main.fragment_bookshelf.*
+import kotlinx.android.synthetic.main.fragment_find_book.*
 import kotlinx.android.synthetic.main.view_title_bar.*
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
@@ -58,6 +60,7 @@ class BookshelfFragment : BaseFragment(R.layout.fragment_bookshelf), SearchView.
     }
 
     private fun initRecyclerView() {
+        ATH.applyEdgeEffectColor(rv_bookshelf)
         refresh_layout.setColorSchemeColors(ThemeStore.accentColor(refresh_layout.context))
         refresh_layout.setOnRefreshListener {
             refresh_layout.isRefreshing = false

app/src/main/java/io/legado/app/ui/main/findbook/FindBookFragment.kt

@@ -33,7 +33,7 @@ class FindBookFragment : BaseFragment(R.layout.fragment_find_book) {
     }
 
     private fun initRecyclerView() {
-        ATH.setEdgeEffectColor(rv_find, ThemeStore.primaryColor(rv_find.context))
+        ATH.applyEdgeEffectColor(rv_find)
         rv_find.layoutManager = FlexboxLayoutManager(context)
         adapter = FindBookAdapter()
         rv_find.adapter = adapter

app/src/main/java/io/legado/app/ui/main/my/PreferenceFragment.kt

@@ -2,10 +2,13 @@ package io.legado.app.ui.main.my
 
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.view.View
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import io.legado.app.App
 import io.legado.app.R
+import io.legado.app.lib.theme.ATH
+import io.legado.app.lib.theme.ThemeStore
 import io.legado.app.ui.about.AboutActivity
 import io.legado.app.ui.about.DonateActivity
 import io.legado.app.ui.booksource.BookSourceActivity
@@ -20,6 +23,11 @@ class PreferenceFragment : PreferenceFragmentCompat(),
         addPreferencesFromResource(R.xml.pref_main)
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        ATH.applyEdgeEffectColor(listView)
+    }
+
     override fun onResume() {
         super.onResume()
         preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)

app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt

@@ -4,6 +4,9 @@ import android.os.Bundle
 import android.view.View
 import io.legado.app.R
 import io.legado.app.base.BaseFragment
+import io.legado.app.lib.theme.ATH
+import io.legado.app.lib.theme.ThemeStore
+import kotlinx.android.synthetic.main.fragment_rss.*
 
 class RssFragment : BaseFragment(R.layout.fragment_rss) {
 
@@ -12,6 +15,6 @@ class RssFragment : BaseFragment(R.layout.fragment_rss) {
     }
 
     private fun initRecyclerView() {
-
+        ATH.applyEdgeEffectColor(recycler_view)
     }
 }

app/src/main/java/io/legado/app/ui/qrcode/QrCodeActivity.kt

@@ -26,7 +26,7 @@ class QrCodeActivity : BaseActivity<AndroidViewModel>(), QRCodeView.Delegate {
     private val requestQrImage = 202
     private var flashlightIsOpen: Boolean = false
 
-    override fun onViewModelCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
         setSupportActionBar(toolbar)
         zxingview.setDelegate(this)
         fab_flashlight.setOnClickListener {

app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleActivity.kt

@@ -31,7 +31,7 @@ class ReplaceRuleActivity : BaseActivity<ReplaceRuleViewModel>() {
     private var rulesLiveData: LiveData<PagedList<ReplaceRule>>? = null
     private var allEnabled = false
 
-    override fun onViewModelCreated(viewModel: ReplaceRuleViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: ReplaceRuleViewModel, savedInstanceState: Bundle?) {
         initRecyclerView()
         initDataObservers()
         initSwipeToDelete()

app/src/main/java/io/legado/app/ui/search/SearchActivity.kt

@@ -15,7 +15,7 @@ class SearchActivity : BaseActivity<SearchViewModel>() {
     override val layoutID: Int
         get() = R.layout.activity_search
 
-    override fun onViewModelCreated(viewModel: SearchViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: SearchViewModel, savedInstanceState: Bundle?) {
         initSearchView()
         viewModel.search()
     }

app/src/main/java/io/legado/app/ui/sourcedebug/SourceDebugActivity.kt

@@ -30,7 +30,7 @@ class SourceDebugActivity : BaseActivity<AndroidViewModel>(), SourceDebug.Callba
     private lateinit var adapter: SourceDebugAdapter
     private var bookSource: BookSource? = null
 
-    override fun onViewModelCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
         launch(IO) {
             intent.getStringExtra("key")?.let {
                 bookSource = App.db.bookSourceDao().findByKey(it)

app/src/main/java/io/legado/app/ui/sourceedit/SourceEditActivity.kt

@@ -42,7 +42,7 @@ class SourceEditActivity : BaseActivity<SourceEditViewModel>(false), KeyboardToo
     private var mSoftKeyboardTool: PopupWindow? = null
     private var mIsSoftKeyBoardShowing = false
 
-    override fun onViewModelCreated(viewModel: SourceEditViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: SourceEditViewModel, savedInstanceState: Bundle?) {
         initView()
         viewModel.sourceLiveData.observe(this, Observer {
             upRecyclerView(it)

app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt

@@ -18,7 +18,7 @@ class WelcomeActivity : BaseActivity<AndroidViewModel>() {
     override val layoutID: Int
         get() = R.layout.activity_welcome
 
-    override fun onViewModelCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(viewModel: AndroidViewModel, savedInstanceState: Bundle?) {
         iv_bg.setColorFilter(ThemeStore.accentColor(this))
         val welAnimator = ValueAnimator.ofFloat(1f, 0f).setDuration(800)
         welAnimator.startDelay = 100

app/src/main/res/layout/fragment_bookshelf.xml

@@ -10,12 +10,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:attachToActivity="false"
-        app:title="@string/bookshelf" />
+            app:title="@string/bookshelf"/>
 
     <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_book_group"
             android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:overScrollMode="never"/>
 
     <TextView
             android:id="@+id/tv_recent_reading"
@@ -25,7 +26,7 @@
             android:elevation="3dp"
             android:focusable="true"
             android:padding="5dp"
-        android:text="@string/recent_reading" />
+            android:text="@string/recent_reading"/>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
@@ -36,7 +37,7 @@
         <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_bookshelf"
                 android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+                android:layout_height="match_parent"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </LinearLayout>