diff options
Diffstat (limited to 'src/android/app/src/main/java/org')
2 files changed, 4 insertions, 50 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt index e403aa6d7..1fa7b2e0b 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt @@ -97,10 +97,10 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { if (addToStack) { if (areSystemAnimationsEnabled()) { transaction.setCustomAnimations( - R.animator.settings_enter, - R.animator.settings_exit, - R.animator.settings_pop_enter, - R.animator.setttings_pop_exit + R.anim.anim_settings_fragment_in, + R.anim.anim_settings_fragment_out, + 0, + R.anim.anim_pop_settings_fragment_out ) } transaction.addToBackStack(null) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFrameLayout.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFrameLayout.kt deleted file mode 100644 index c9918d608..000000000 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFrameLayout.kt +++ /dev/null @@ -1,46 +0,0 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.yuzu.yuzu_emu.features.settings.ui - -import android.content.Context -import android.util.AttributeSet -import android.widget.FrameLayout - -/** - * FrameLayout subclass with few Properties added to simplify animations. - * Don't remove the methods appearing as unused, in order not to break the menu animations - */ -class SettingsFrameLayout : FrameLayout { - private val mVisibleness = 1.0f - - constructor(context: Context?) : super(context!!) - constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) - - constructor( - context: Context?, - attrs: AttributeSet?, - defStyleAttr: Int - ) : super(context!!, attrs, defStyleAttr) - - constructor( - context: Context?, - attrs: AttributeSet?, - defStyleAttr: Int, - defStyleRes: Int - ) : super(context!!, attrs, defStyleAttr, defStyleRes) - - var yFraction: Float - get() = y / height - set(yFraction) { - val height = height - y = (if (height > 0) yFraction * height else -9999) as Float - } - var visibleness: Float - get() = mVisibleness - set(visibleness) { - scaleX = visibleness - scaleY = visibleness - alpha = visibleness - } -} |