diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 4792cc938a..d1628f3cf2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -18,6 +18,7 @@ import androidx.annotation.FloatRange import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ActionMode import androidx.core.os.bundleOf +import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.doOnLayout import androidx.core.view.isVisible @@ -291,17 +292,13 @@ class MangaController : } } - binding.swipeRefresh.doOnLayout { swipeRefresh -> + ViewCompat.setOnApplyWindowInsetsListener(binding.swipeRefresh) { swipeRefresh, windowInsets -> swipeRefresh as SwipeRefreshLayout - swipeRefresh.setOnApplyWindowInsetsListener { _, windowInsets -> - val topStatusBarInset = WindowInsetsCompat.toWindowInsetsCompat(windowInsets) - .getInsets(WindowInsetsCompat.Type.statusBars()) - .top - swipeRefresh.isRefreshing = false - swipeRefresh.setProgressViewEndTarget(false, getMainAppBarHeight() + topStatusBarInset) - updateRefreshing() - windowInsets - } + val insets = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars()) + swipeRefresh.isRefreshing = false + swipeRefresh.setProgressViewEndTarget(false, getMainAppBarHeight() + insets.top) + updateRefreshing() + windowInsets } }