VERY experimental Nintendo Switch 2 emulator
C++
[android,ui] carousel view improvements (#4277)
xbzk61ffb309a39a
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.ktindex 6931a1f9d5..49034e81c4 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@@ -18,6 +18,7 @@ import androidx.activity.result.contract.ActivityResultContractsimport androidx.appcompat.app.AppCompatActivityimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompat+import androidx.core.view.doOnPreDrawimport androidx.core.view.updatePaddingimport androidx.core.widget.doOnTextChangedimport androidx.fragment.app.Fragment@@ -59,6 +60,10 @@ class GamesFragment : Fragment() {private var lastViewType: Int = GameAdapter.VIEW_TYPE_GRIDprivate var fallbackBottomInset: Int = 0+ private var pendingPostReloadListSettle = false+ private var pendingPostReloadListSettleGeneration = 0+ private var gameListSubmitGeneration = 0+ private var committedGameListSubmitGeneration = 0companion object {private const val SEARCH_TEXT = "SearchText"@@ -168,10 +173,9 @@ class GamesFragment : Fragment() {gamesViewModel.shouldScrollAfterReload.collect(viewLifecycleOwner) { shouldScroll ->if (shouldScroll) {- binding.gridGames.post {- (binding.gridGames as? CarouselRecyclerView)?.pendingScrollAfterReload = true- gameAdapter.notifyDataSetChanged()- }+ pendingPostReloadListSettle = true+ pendingPostReloadListSettleGeneration = gameListSubmitGeneration+ schedulePostReloadListSettle()gamesViewModel.setShouldScrollAfterReload(false)}}@@ -273,11 +277,42 @@ class GamesFragment : Fragment() {lastSearchText = currentSearchTextlastFilter = currentFilter} else {- ((binding.gridGames as? RecyclerView)?.adapter as? GameAdapter)?.submitList(games)+ submitGameList(games)gamesViewModel.setFilteredGames(games)}}+ private fun submitGameList(games: List<Game>) {+ val adapter = (binding.gridGames as? RecyclerView)?.adapter as? GameAdapter+ if (adapter == null) {+ schedulePostReloadListSettle()+ return+ }++ val submitGeneration = ++gameListSubmitGeneration+ adapter.submitList(games) {+ if (committedGameListSubmitGeneration < submitGeneration) {+ committedGameListSubmitGeneration = submitGeneration+ }+ schedulePostReloadListSettle()+ }+ }+++ private fun schedulePostReloadListSettle() {+ if (!pendingPostReloadListSettle || _binding == null) return++ binding.gridGames.doOnPreDraw {+ if (!pendingPostReloadListSettle || _binding == null) return@doOnPreDraw+ if (committedGameListSubmitGeneration < pendingPostReloadListSettleGeneration) {+ schedulePostReloadListSettle()+ return@doOnPreDraw+ }+ pendingPostReloadListSettle = false++ (binding.gridGames as? CarouselRecyclerView)?.refreshView()+ }+ }private fun setupTopView() {binding.searchText.doOnTextChanged() { text: CharSequence?, _: Int, _: Int, _: Int ->if (text.toString().isNotEmpty()) {@@ -414,9 +449,7 @@ class GamesFragment : Fragment() {val searchTerm = binding.searchText.text.toString().lowercase(Locale.getDefault())if (searchTerm.isEmpty()) {- ((binding.gridGames as? RecyclerView)?.adapter as? GameAdapter)?.submitList(- filteredList- )+ submitGameList(filteredList)gamesViewModel.setFilteredGames(filteredList)return}@@ -432,7 +465,7 @@ class GamesFragment : Fragment() {}}.sortedByDescending { it.score }.map { it.item }- ((binding.gridGames as? RecyclerView)?.adapter as? GameAdapter)?.submitList(sortedList)+ submitGameList(sortedList)gamesViewModel.setFilteredGames(sortedList)}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/CarouselRecyclerView.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/CarouselRecyclerView.ktindex 24dafbcd32..23b2f0be46 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/CarouselRecyclerView.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/CarouselRecyclerView.kt@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-laterpackage org.yuzu.yuzu_emu.ui@@ -11,6 +11,8 @@ import androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.PagerSnapHelperimport androidx.recyclerview.widget.RecyclerViewimport kotlin.math.abs+import kotlin.math.cos+import kotlin.math.sinimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.adapters.GameAdapterimport androidx.core.view.doOnNextLayout@@ -34,6 +36,7 @@ class CarouselRecyclerView @JvmOverloads constructor(private var overlapDecoration: OverlappingDecoration? = nullprivate var pagerSnapHelper: PagerSnapHelper? = nullprivate var scalingScrollListener: OnScrollListener? = null+ private var savedItemAnimator: RecyclerView.ItemAnimator? = nullcompanion object {private const val CAROUSEL_CARD_SIZE_FACTOR = "CarouselCardSizeMultiplier"@@ -42,8 +45,13 @@ class CarouselRecyclerView @JvmOverloads constructor(private const val CAROUSEL_OVERLAP_FACTOR = "CarouselOverlapFactor"private const val CAROUSEL_MAX_FLING_COUNT = "CarouselMaxFlingCount"private const val CAROUSEL_FLING_MULTIPLIER = "CarouselFlingMultiplier"- private const val CAROUSEL_CARDS_SCALING_SHAPE = "CarouselCardsScalingShape"- private const val CAROUSEL_CARDS_ALPHA_SHAPE = "CarouselCardsAlphaShape"+ private const val CAROUSEL_ARC_ANGLE_STEP_DEGREES = 15.0+ private const val CAROUSEL_ARC_MAX_ANGLE_DEGREES = 165.0+ private const val CAROUSEL_ARC_DEPTH_MAX_ANGLE_DEGREES = 85.0+ private const val CAROUSEL_ARC_DEPTH_STRETCH = 5.0f+ private const val CAROUSEL_ARC_X_DEPTH_FACTOR = 0.55f+ private const val CAROUSEL_ARC_FADE_OUT_START_DEGREES = 60.0+ private const val CAROUSEL_ARC_FADE_OUT_END_DEGREES = 95.0const val CAROUSEL_LAST_SCROLL_POSITION = "CarouselLastScrollPosition"const val CAROUSEL_VIEW_TYPE_PORTRAIT = "GamesViewTypePortrait"const val CAROUSEL_VIEW_TYPE_LANDSCAPE = "GamesViewTypeLandscape"@@ -160,46 +168,52 @@ class CarouselRecyclerView @JvmOverloads constructor(}}- fun shapingFunction(x: Float, option: Int = 0): Float {- return when (option) {- 0 -> 1f // Off- 1 -> 1f - x // linear descending- 2 -> (1f - x) * (1f - x) // Ease out- 3 -> if (x < 0.05f) 1f else (1f - x) * 0.8f- 4 -> kotlin.math.cos(x * Math.PI).toFloat() // Cosine- 5 -> kotlin.math.cos((1.5f * x).coerceIn(0f, 1f) * Math.PI).toFloat() // Cosine 1.5x trimmed- else -> 1f // Default to Off- }- }-fun updateChildScaleAndAlphaForPosition(child: View) {val cardSize = (adapter as? GameAdapter ?: return).cardSizeval position = getChildViewHolder(child).bindingAdapterPositionif (position == RecyclerView.NO_POSITION || cardSize <= 0) {return // No valid position or card size}- child.layoutParams.width = cardSize- child.layoutParams.height = cardSize+ val layoutParams = child.layoutParams+ if (layoutParams.width != cardSize || layoutParams.height != cardSize) {+ child.layoutParams = layoutParams.apply {+ width = cardSize+ height = cardSize+ }+ }++ val signedDistance = getChildDistanceToCenter(child)+ val itemStep = (cardSize - overlapPx).toFloat().coerceAtLeast(1f)+ val angleStep = Math.toRadians(CAROUSEL_ARC_ANGLE_STEP_DEGREES).toFloat()+ val maxAngle = Math.toRadians(CAROUSEL_ARC_MAX_ANGLE_DEGREES).toFloat()+ val depthMaxAngle = Math.toRadians(CAROUSEL_ARC_DEPTH_MAX_ANGLE_DEGREES).toFloat()+ val fadeOutStartAngle = Math.toRadians(CAROUSEL_ARC_FADE_OUT_START_DEGREES).toFloat()+ val fadeOutEndAngle = Math.toRadians(CAROUSEL_ARC_FADE_OUT_END_DEGREES).toFloat()+ val angle = (signedDistance / itemStep * angleStep).coerceIn(-maxAngle, maxAngle)+ val arcRadius = itemStep / angleStep+ val arcX = sin(angle) * arcRadius+ val absoluteAngle = abs(angle)+ val rawDepthInput = ((1f - cos(absoluteAngle)) / (1f - cos(depthMaxAngle)))+ .coerceIn(0f, 1f)+ val easedDepthTail = Math.pow(+ (1f - rawDepthInput).toDouble(),+ CAROUSEL_ARC_DEPTH_STRETCH.toDouble()+ ).toFloat()+ val depthInput = (1f - easedDepthTail).coerceIn(0f, 1f)+ val projectedArcX = arcX * (1f - rawDepthInput * CAROUSEL_ARC_X_DEPTH_FACTOR)++ child.animate().cancel()+ child.translationX = projectedArcX - signedDistance- val center = getRecyclerViewCenter()- val distance = abs(getChildDistanceToCenter(child))val internalBorderScale = resources.getFraction(R.fraction.carousel_bordercards_scale, 1, 1)val borderScale = preferences.getFloat(CAROUSEL_BORDERCARDS_SCALE, internalBorderScale).coerceIn(0f,1f)- val shapeInput = (distance / center).coerceIn(0f, 1f)- val internalShapeSetting = resources.getInteger(R.integer.carousel_cards_scaling_shape)- val scalingShapeSetting = preferences.getInt(- CAROUSEL_CARDS_SCALING_SHAPE,- internalShapeSetting- )- val shapedScaling = shapingFunction(shapeInput, scalingShapeSetting)+ val shapedScaling = 1f - depthInputval scale = (borderScale + (1f - borderScale) * shapedScaling).coerceIn(0f, 1f)- val maxDistance = width / 2f- val alphaInput = (distance / maxDistance).coerceIn(0f, 1f)val internalBordersAlpha = resources.getFraction(R.fraction.carousel_bordercards_alpha,1,@@ -209,15 +223,12 @@ class CarouselRecyclerView @JvmOverloads constructor(0f,1f)- val internalAlphaShapeSetting = resources.getInteger(R.integer.carousel_cards_alpha_shape)- val alphaShapeSetting = preferences.getInt(- CAROUSEL_CARDS_ALPHA_SHAPE,- internalAlphaShapeSetting- )- val shapedAlpha = shapingFunction(alphaInput, alphaShapeSetting)- val alpha = (borderAlpha + (1f - borderAlpha) * shapedAlpha).coerceIn(0f, 1f)+ val shapedAlpha = cos(depthInput * Math.PI).toFloat()+ val baseAlpha = (borderAlpha + (1f - borderAlpha) * shapedAlpha).coerceIn(0f, 1f)+ val rearPresence = (1f - (absoluteAngle - fadeOutStartAngle) /+ (fadeOutEndAngle - fadeOutStartAngle)).coerceIn(0f, 1f)+ val alpha = (baseAlpha * rearPresence).coerceIn(0f, 1f)- child.animate().cancel()child.alpha = alphachild.scaleX = scalechild.scaleY = scale@@ -273,7 +284,9 @@ class CarouselRecyclerView @JvmOverloads constructor(0f,1f)- return (userFactor * (height - bottomInset)).toInt()+ val scaledHeight = height * userFactor+ val availableHeight = height - bottomInset+ return minOf(scaledHeight.toInt(), availableHeight.toInt())}fun setupCarousel(enabled: Boolean) {@@ -282,6 +295,13 @@ class CarouselRecyclerView @JvmOverloads constructor(if (gameAdapter.cardSize == 0) returnif (bottomInset < 0) return+ itemAnimator?.let {+ if (savedItemAnimator == null) {+ savedItemAnimator = it+ }+ itemAnimator = null+ }+useCustomDrawingOrder = trueval cardSize = gameAdapter.cardSize@@ -336,6 +356,12 @@ class CarouselRecyclerView @JvmOverloads constructor(// Detach PagerSnapHelperpagerSnapHelper?.attachToRecyclerView(null)pagerSnapHelper = null+ savedItemAnimator?.let {+ if (itemAnimator == null) {+ itemAnimator = it+ }+ savedItemAnimator = null+ }useCustomDrawingOrder = false// Reset padding and flingsetPadding(0, 0, 0, 0)@@ -344,6 +370,7 @@ class CarouselRecyclerView @JvmOverloads constructor(// Reset scalingfor (i in 0 until childCount) {val child = getChildAt(i)+ child?.translationX = 0fchild?.scaleX = 1fchild?.scaleY = 1fchild?.alpha = 1fdiff --git a/src/android/app/src/main/res/values/integers.xml b/src/android/app/src/main/res/values/integers.xmlindex cc05478c21..55e885e42e 100644--- a/src/android/app/src/main/res/values/integers.xml+++ b/src/android/app/src/main/res/values/integers.xml@@ -5,8 +5,6 @@<integer name="game_columns_grid">2</integer><integer name="carousel_max_fling_count">4</integer><integer name="carousel_focus_search_repeat_threshold_ms">100</integer>- <integer name="carousel_cards_scaling_shape">1</integer>- <integer name="carousel_cards_alpha_shape">4</integer><!-- Default SWITCH landscape layout --><integer name="BUTTON_A_X">760</integer>