VERY experimental Nintendo Switch 2 emulator
C++
android: Scroll shortcut for games list
Charles Lombardo2e39fbd326fd
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.ktindex 709a5b9761..95bad38c65 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt@@ -26,6 +26,9 @@ class GamesViewModel : ViewModel() {private val _shouldSwapData = MutableLiveData(false)val shouldSwapData: LiveData<Boolean> get() = _shouldSwapData+ private val _shouldScrollToTop = MutableLiveData(false)+ val shouldScrollToTop: LiveData<Boolean> get() = _shouldScrollToTop+init {reloadGames(false)}@@ -38,6 +41,10 @@ class GamesViewModel : ViewModel() {_shouldSwapData.postValue(shouldSwap)}+ fun setShouldScrollToTop(shouldScroll: Boolean) {+ _shouldScrollToTop.postValue(shouldScroll)+ }+fun reloadGames(directoryChanged: Boolean) {if (isReloading.value == true)returndiff --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 3ca529b200..227ca1afc3 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@@ -138,6 +138,14 @@ class GamesFragment : Fragment() {searchHidden()}+ // Check if the user reselected the games menu item and then scroll to top of the list+ gamesViewModel.shouldScrollToTop.observe(viewLifecycleOwner) { shouldScroll ->+ if (shouldScroll) {+ scrollToTop()+ gamesViewModel.setShouldScrollToTop(false)+ }+ }+setInsets()// Make sure the loading indicator appears even if the layout is told to refresh before being fully drawn@@ -191,6 +199,12 @@ class GamesFragment : Fragment() {}}+ fun scrollToTop() {+ if (_binding != null) {+ binding.gridGames.smoothScrollToPosition(0)+ }+ }+private fun setInsets() =ViewCompat.setOnApplyWindowInsetsListener(binding.gridGames) { view: View, windowInsets: WindowInsetsCompat ->val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.ktindex e8284471a8..473d38a291 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt@@ -25,6 +25,7 @@ import androidx.preference.PreferenceManagerimport com.google.android.material.color.MaterialColorsimport com.google.android.material.dialog.MaterialAlertDialogBuilderimport com.google.android.material.elevation.ElevationOverlayProvider+import com.google.android.material.navigation.NavigationBarViewimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContext@@ -73,6 +74,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val navHostFragment =supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragmentsetUpNavigation(navHostFragment.navController)+ (binding.navigationBar as NavigationBarView).setOnItemReselectedListener {+ if (it.itemId == R.id.gamesFragment) {+ gamesViewModel.setShouldScrollToTop(true)+ }+ }binding.statusBarShade.setBackgroundColor(MaterialColors.getColor(@@ -243,7 +249,13 @@ class MainActivity : AppCompatActivity(), ThemeProvider {)val dstPath = DirectoryInitialization.userDirectory + "/keys/"- if (FileUtil.copyUriToInternalStorage(applicationContext, result, dstPath, "prod.keys")) {+ if (FileUtil.copyUriToInternalStorage(+ applicationContext,+ result,+ dstPath,+ "prod.keys"+ )+ ) {if (NativeLibrary.reloadKeys()) {Toast.makeText(applicationContext,