From b5b1d20e1e0756066abf0457bd66695dde40bab7 Mon Sep 17 00:00:00 2001 From: xbzk Date: Sun, 29 Jun 2025 17:10:29 +0000 Subject: [PATCH] fix: refresh icon color & infinite when in portrait (#231) quick fix for refresh features in portrait, casting them as SwipeRefreshLayout, since MidScreenSwipeRefreshLayout only exists in landscape. Co-authored-by: Allison Cunha Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/231 Co-authored-by: xbzk Co-committed-by: xbzk --- .../main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt index ce5960c546..38d6ebc7d3 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt @@ -119,16 +119,16 @@ class GamesFragment : Fragment() { applyGridGamesBinding() binding.swipeRefresh.apply { - (binding.swipeRefresh as? MidScreenSwipeRefreshLayout)?.setOnRefreshListener { + (binding.swipeRefresh as? SwipeRefreshLayout)?.setOnRefreshListener { gamesViewModel.reloadGames(false) } - (binding.swipeRefresh as? MidScreenSwipeRefreshLayout)?.setProgressBackgroundColorSchemeColor( + (binding.swipeRefresh as? SwipeRefreshLayout)?.setProgressBackgroundColorSchemeColor( com.google.android.material.color.MaterialColors.getColor( binding.swipeRefresh, com.google.android.material.R.attr.colorPrimary ) ) - (binding.swipeRefresh as? MidScreenSwipeRefreshLayout)?.setColorSchemeColors( + (binding.swipeRefresh as? SwipeRefreshLayout)?.setColorSchemeColors( com.google.android.material.color.MaterialColors.getColor( binding.swipeRefresh, com.google.android.material.R.attr.colorOnPrimary @@ -138,12 +138,12 @@ class GamesFragment : Fragment() { if (_binding == null) { return@post } - (binding.swipeRefresh as? MidScreenSwipeRefreshLayout)?.isRefreshing = gamesViewModel.isReloading.value + (binding.swipeRefresh as? SwipeRefreshLayout)?.isRefreshing = gamesViewModel.isReloading.value } } gamesViewModel.isReloading.collect(viewLifecycleOwner) { - (binding.swipeRefresh as? MidScreenSwipeRefreshLayout)?.isRefreshing = it + (binding.swipeRefresh as? SwipeRefreshLayout)?.isRefreshing = it binding.noticeText.setVisible( visible = gamesViewModel.games.value.isEmpty() && !it, gone = false @@ -415,7 +415,7 @@ class GamesFragment : Fragment() { val spacingNavigation = resources.getDimensionPixelSize(R.dimen.spacing_navigation) resources.getDimensionPixelSize(R.dimen.spacing_navigation_rail) - (binding.swipeRefresh as? MidScreenSwipeRefreshLayout)?.setProgressViewEndTarget( + (binding.swipeRefresh as? SwipeRefreshLayout)?.setProgressViewEndTarget( false, barInsets.top + resources.getDimensionPixelSize(R.dimen.spacing_refresh_end) )