archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9034 from JosJuice/android-menu-animation-rtl

Browse source 
Android: Take RTL layout into account for menu animations
This commit is contained in:
LC 2020-08-17 15:24:52 -04:00 committed by GitHub
commit 24ff8b8d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 90 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View file

@ -491,10 +491,10 @@ public final class EmulationActivity extends AppCompatActivity
Fragment fragment = MenuFragment.newInstance(mSelectedTitle);
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(
R.animator.menu_slide_in_from_left,
R.animator.menu_slide_out_to_left,
R.animator.menu_slide_in_from_left,
R.animator.menu_slide_out_to_left)
R.animator.menu_slide_in_from_start,
R.animator.menu_slide_out_to_start,
R.animator.menu_slide_in_from_start,
R.animator.menu_slide_out_to_start)
.add(R.id.frame_menu, fragment)
.addToBackStack(BACKSTACK_NAME_MENU)
.commit();
@ -1235,10 +1235,10 @@ public final class EmulationActivity extends AppCompatActivity
Fragment fragment = SaveLoadStateFragment.newInstance(saveOrLoad);
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(
R.animator.menu_slide_in_from_right,
R.animator.menu_slide_out_to_right,
R.animator.menu_slide_in_from_right,
R.animator.menu_slide_out_to_right)
R.animator.menu_slide_in_from_end,
R.animator.menu_slide_out_to_end,
R.animator.menu_slide_in_from_end,
R.animator.menu_slide_out_to_end)
.replace(R.id.frame_submenu, fragment)
.addToBackStack(BACKSTACK_NAME_SUBMENU)
.commit();

20
Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_end.xml Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:propertyName="translationX"
android:valueType="floatType"
android:valueFrom="-1280dp"
android:valueTo="0"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="300"/>
<objectAnimator
android:propertyName="alpha"
android:valueType="floatType"
android:valueFrom="0"
android:valueTo="1"
android:interpolator="@android:interpolator/accelerate_quad"
android:duration="300"/>
</set>

20
Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_start.xml Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:propertyName="translationX"
android:valueType="floatType"
android:valueFrom="1280dp"
android:valueTo="0"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="300"/>
<objectAnimator
android:propertyName="alpha"
android:valueType="floatType"
android:valueFrom="0"
android:valueTo="1"
android:interpolator="@android:interpolator/accelerate_quad"
android:duration="300"/>
</set>

21
Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- This animation is used ONLY when a submenu is replaced. -->
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:propertyName="translationX"
android:valueType="floatType"
android:valueFrom="0"
android:valueTo="-1280dp"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="200"/>
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:propertyName="alpha"
android:valueType="floatType"
android:valueFrom="1"
android:valueTo="0"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="200"/>
</set>

21
Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_start.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- This animation is used ONLY when a submenu is replaced. -->
<objectAnimator
android:propertyName="translationX"
android:valueType="floatType"
android:valueFrom="0"
android:valueTo="1280dp"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="200"/>
<objectAnimator
android:propertyName="alpha"
android:valueType="floatType"
android:valueFrom="1"
android:valueTo="0"
android:interpolator="@android:interpolator/decelerate_quad"
android:duration="200"/>
</set>

0
Source/Android/app/src/main/res/animator/menu_slide_in_from_right.xml → Source/Android/app/src/main/res/animator/menu_slide_in_from_end.xml
View file

0
Source/Android/app/src/main/res/animator/menu_slide_in_from_left.xml → Source/Android/app/src/main/res/animator/menu_slide_in_from_start.xml
View file

0
Source/Android/app/src/main/res/animator/menu_slide_out_to_right.xml → Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
View file

0
Source/Android/app/src/main/res/animator/menu_slide_out_to_left.xml → Source/Android/app/src/main/res/animator/menu_slide_out_to_start.xml
View file