VERY experimental Nintendo Switch 2 emulator
C++
android: Use the same transition animation between every fragment in settings
t895975bdf8302b8
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.ktindex 3c4aefbcb3..769baf7444 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt@@ -87,17 +87,6 @@ class SettingsFragment : Fragment() {}}}- launch {- settingsViewModel.isUsingSearch.collectLatest {- if (it) {- reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)- exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)- } else {- reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)- exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)- }- }- }}if (args.menuTag == Settings.MenuTag.SECTION_ROOT) {@@ -105,8 +94,6 @@ class SettingsFragment : Fragment() {binding.toolbarSettings.setOnMenuItemClickListener {when (it.itemId) {R.id.action_search -> {- reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)- exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)view.findNavController().navigate(R.id.action_settingsFragment_to_settingsSearchFragment)true@@ -122,11 +109,6 @@ class SettingsFragment : Fragment() {setInsets()}- override fun onResume() {- super.onResume()- settingsViewModel.setIsUsingSearch(false)- }-private fun setInsets() {ViewCompat.setOnApplyWindowInsetsListener(binding.rootdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.ktindex 9d0594c6ed..f95d545bff 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsSearchFragment.kt@@ -40,8 +40,10 @@ class SettingsSearchFragment : Fragment() {override fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)- enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)- returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)+ enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)+ returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)+ reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)+ exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)}override fun onCreateView(@@ -55,7 +57,6 @@ class SettingsSearchFragment : Fragment() {override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)- settingsViewModel.setIsUsingSearch(true)if (savedInstanceState != null) {binding.searchText.setText(savedInstanceState.getString(SEARCH_TEXT))diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.ktindex 53fa7a8dec..6f947674e7 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt@@ -29,9 +29,6 @@ class SettingsViewModel : ViewModel() {val shouldReloadSettingsList: StateFlow<Boolean> get() = _shouldReloadSettingsListprivate val _shouldReloadSettingsList = MutableStateFlow(false)- val isUsingSearch: StateFlow<Boolean> get() = _isUsingSearch- private val _isUsingSearch = MutableStateFlow(false)-val sliderProgress: StateFlow<Int> get() = _sliderProgressprivate val _sliderProgress = MutableStateFlow(-1)@@ -57,10 +54,6 @@ class SettingsViewModel : ViewModel() {_shouldReloadSettingsList.value = value}- fun setIsUsingSearch(value: Boolean) {- _isUsingSearch.value = value- }-fun setSliderTextValue(value: Float, units: String) {_sliderProgress.value = value.toInt()_sliderTextValue.value = String.format(