VERY experimental Nintendo Switch 2 emulator
C++
android: Use autofit grid for games fragment
Charles Lombardo5e2695275ed7
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.ktnew file mode 100644index 0000000000..be5e4c86c7--- /dev/null+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.kt@@ -0,0 +1,61 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++package org.yuzu.yuzu_emu.layout++import android.content.Context+import androidx.recyclerview.widget.GridLayoutManager+import androidx.recyclerview.widget.RecyclerView+import androidx.recyclerview.widget.RecyclerView.Recycler+import org.yuzu.yuzu_emu.R++/**+ * Cut down version of the solution provided here+ * https://stackoverflow.com/questions/26666143/recyclerview-gridlayoutmanager-how-to-auto-detect-span-count+ */+class AutofitGridLayoutManager(+ context: Context,+ columnWidth: Int+) : GridLayoutManager(context, 1) {+ private var columnWidth = 0+ private var isColumnWidthChanged = true+ private var lastWidth = 0+ private var lastHeight = 0++ init {+ setColumnWidth(checkedColumnWidth(context, columnWidth))+ }++ private fun checkedColumnWidth(context: Context, columnWidth: Int): Int {+ var newColumnWidth = columnWidth+ if (newColumnWidth <= 0) {+ newColumnWidth = context.resources.getDimensionPixelSize(R.dimen.spacing_xtralarge)+ }+ return newColumnWidth+ }++ private fun setColumnWidth(newColumnWidth: Int) {+ if (newColumnWidth > 0 && newColumnWidth != columnWidth) {+ columnWidth = newColumnWidth+ isColumnWidthChanged = true+ }+ }++ override fun onLayoutChildren(recycler: Recycler, state: RecyclerView.State) {+ val width = width+ val height = height+ if (columnWidth > 0 && width > 0 && height > 0 && (isColumnWidthChanged || lastWidth != width || lastHeight != height)) {+ val totalSpace: Int = if (orientation == VERTICAL) {+ width - paddingRight - paddingLeft+ } else {+ height - paddingTop - paddingBottom+ }+ val spanCount = 1.coerceAtLeast(totalSpace / columnWidth)+ setSpanCount(spanCount)+ isColumnWidthChanged = false+ }+ lastWidth = width+ lastHeight = height+ super.onLayoutChildren(recycler, state)+ }+}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/platform/PlatformGamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/platform/PlatformGamesFragment.ktindex 7b8d7c5a37..998a008474 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/platform/PlatformGamesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/platform/PlatformGamesFragment.kt@@ -8,22 +8,20 @@ import android.os.Bundleimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup-import android.view.ViewTreeObserver.OnGlobalLayoutListenerimport androidx.appcompat.app.AppCompatActivityimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompatimport androidx.core.view.updatePaddingimport androidx.fragment.app.Fragment-import androidx.recyclerview.widget.GridLayoutManagerimport com.google.android.material.color.MaterialColorsimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.adapters.GameAdapterimport org.yuzu.yuzu_emu.databinding.FragmentGridBinding+import org.yuzu.yuzu_emu.layout.AutofitGridLayoutManagerclass PlatformGamesFragment : Fragment(), PlatformGamesView {private val presenter = PlatformGamesPresenter(this)- private var adapter: GameAdapter? = nullprivate var _binding: FragmentGridBinding? = nullprivate val binding get() = _binding!!@@ -39,27 +37,12 @@ class PlatformGamesFragment : Fragment(), PlatformGamesView {}override fun onViewCreated(view: View, savedInstanceState: Bundle?) {- adapter = GameAdapter(requireActivity() as AppCompatActivity)-- // Organize our grid layout based on the current view.- if (isAdded) {- view.viewTreeObserver- .addOnGlobalLayoutListener(object : OnGlobalLayoutListener {- override fun onGlobalLayout() {- if (view.measuredWidth == 0) {- return- }- var columns = view.measuredWidth /- requireContext().resources.getDimensionPixelSize(R.dimen.card_width)- if (columns == 0) {- columns = 1- }- view.viewTreeObserver.removeOnGlobalLayoutListener(this)- val layoutManager = GridLayoutManager(activity, columns)- binding.gridGames.layoutManager = layoutManager- binding.gridGames.adapter = adapter- }- })+ binding.gridGames.apply {+ layoutManager = AutofitGridLayoutManager(+ requireContext(),+ requireContext().resources.getDimensionPixelSize(R.dimen.card_width)+ )+ adapter = GameAdapter(requireActivity() as AppCompatActivity)}// Add swipe down to refresh gesture@@ -92,8 +75,8 @@ class PlatformGamesFragment : Fragment(), PlatformGamesView {}override fun showGames(games: Cursor) {- if (adapter != null) {- adapter!!.swapCursor(games)+ if (binding.gridGames.adapter != null) {+ (binding.gridGames.adapter as GameAdapter).swapCursor(games)}updateTextView()}@@ -103,7 +86,7 @@ class PlatformGamesFragment : Fragment(), PlatformGamesView {returnbinding.gamelistEmptyText.visibility =- if (adapter!!.itemCount == 0) View.VISIBLE else View.GONE+ if ((binding.gridGames.adapter as GameAdapter).itemCount == 0) View.VISIBLE else View.GONE}private fun setInsets() {diff --git a/src/android/app/src/main/res/values/dimens.xml b/src/android/app/src/main/res/values/dimens.xmlindex 0b028a167a..5573d6922c 100644--- a/src/android/app/src/main/res/values/dimens.xml+++ b/src/android/app/src/main/res/values/dimens.xml@@ -6,7 +6,7 @@<dimen name="spacing_list">64dp</dimen><dimen name="spacing_fab">72dp</dimen><dimen name="menu_width">256dp</dimen>- <dimen name="card_width">150dp</dimen>+ <dimen name="card_width">170dp</dimen><dimen name="dialog_margin">20dp</dimen><dimen name="elevated_app_bar">3dp</dimen>