Browse Source

attempt to fix issues

pull/2854/head
Kleidis 4 weeks ago
committed by kleidis
parent
commit
7c5531bdb7
  1. 21
      src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
  2. 5
      src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt

21
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt

@ -34,6 +34,7 @@ import org.yuzu.yuzu_emu.adapters.SetupAdapter
import org.yuzu.yuzu_emu.databinding.FragmentSetupBinding import org.yuzu.yuzu_emu.databinding.FragmentSetupBinding
import org.yuzu.yuzu_emu.features.settings.model.Settings import org.yuzu.yuzu_emu.features.settings.model.Settings
import org.yuzu.yuzu_emu.model.ButtonState import org.yuzu.yuzu_emu.model.ButtonState
import org.yuzu.yuzu_emu.model.GamesViewModel
import org.yuzu.yuzu_emu.model.HomeViewModel import org.yuzu.yuzu_emu.model.HomeViewModel
import org.yuzu.yuzu_emu.model.PageButton import org.yuzu.yuzu_emu.model.PageButton
import org.yuzu.yuzu_emu.model.SetupCallback import org.yuzu.yuzu_emu.model.SetupCallback
@ -51,6 +52,7 @@ class SetupFragment : Fragment() {
private val binding get() = _binding!! private val binding get() = _binding!!
private val homeViewModel: HomeViewModel by activityViewModels() private val homeViewModel: HomeViewModel by activityViewModels()
private val gamesViewModel: GamesViewModel by activityViewModels()
private lateinit var mainActivity: MainActivity private lateinit var mainActivity: MainActivity
@ -284,13 +286,19 @@ class SetupFragment : Fragment() {
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {
super.onPageSelected(position) super.onPageSelected(position)
if (position == 1 && previousPosition == 0) {
ViewUtils.showView(binding.buttonNext)
ViewUtils.showView(binding.buttonBack)
} else if (position == 0 && previousPosition == 1) {
val isFirstPage = position == 0
val isLastPage = position == pages.size - 1
if (isFirstPage) {
ViewUtils.hideView(binding.buttonBack) ViewUtils.hideView(binding.buttonBack)
} else if (position == pages.size - 1 && previousPosition == pages.size - 2) {
} else {
ViewUtils.showView(binding.buttonBack)
}
if (isLastPage) {
ViewUtils.hideView(binding.buttonNext) ViewUtils.hideView(binding.buttonNext)
} else {
ViewUtils.showView(binding.buttonNext)
} }
previousPosition = position previousPosition = position
@ -450,6 +458,9 @@ class SetupFragment : Fragment() {
.edit() .edit()
.putBoolean(Settings.PREF_FIRST_APP_LAUNCH, false) .putBoolean(Settings.PREF_FIRST_APP_LAUNCH, false)
.apply() .apply()
gamesViewModel.reloadGames(directoriesChanged = true, firstStartup = false)
mainActivity.finishSetup(binding.root.findNavController()) mainActivity.finishSetup(binding.root.findNavController())
} }

5
src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt

@ -145,7 +145,10 @@ class GamesViewModel : ViewModel() {
viewModelScope.launch { viewModelScope.launch {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
NativeConfig.addGameDir(gameDir) NativeConfig.addGameDir(gameDir)
getGameDirs(true)
val isFirstTimeSetup = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
.getBoolean(org.yuzu.yuzu_emu.features.settings.model.Settings.PREF_FIRST_APP_LAUNCH, true)
getGameDirs(!isFirstTimeSetup)
} }
if (savedFromGameFragment) { if (savedFromGameFragment) {

Loading…
Cancel
Save