diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-05-01 14:30:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-01 14:30:40 +0200 |
commit | df47dd37ef6f7e12d0500f8061f9ab8341256e69 (patch) | |
tree | a8e076086d48b402febf5fa7e01213640b135b5c | |
parent | b870c233eed3e2ea085d41daf4c099f20b9794d4 (diff) | |
parent | d7772b84df4feed9001a5cfae22d6171d5f021b5 (diff) | |
download | AntennaPod-df47dd37ef6f7e12d0500f8061f9ab8341256e69.zip |
Merge pull request #4094 from ByteHamster/fragment-transition-speed
Made fragment transition a bit faster
-rw-r--r-- | app/src/main/res/anim/fade_in.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/anim/fade_out.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/anim/slide_left_in.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/anim/slide_left_out.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/anim/slide_right_in.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/anim/slide_right_out.xml | 3 | ||||
-rw-r--r-- | core/src/main/res/values/integers.xml | 1 |
7 files changed, 11 insertions, 6 deletions
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml index fa1ba9ade..7d2fea5a6 100644 --- a/app/src/main/res/anim/fade_in.xml +++ b/app/src/main/res/anim/fade_in.xml @@ -2,7 +2,7 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" > <alpha - android:duration="@android:integer/config_mediumAnimTime" + android:duration="@integer/fragment_transition_duration" android:fromAlpha="0.0" android:interpolator="@android:anim/accelerate_interpolator" android:toAlpha="1.0" /> diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml index 392ec4277..ecfb092ae 100644 --- a/app/src/main/res/anim/fade_out.xml +++ b/app/src/main/res/anim/fade_out.xml @@ -2,7 +2,7 @@ <set xmlns:android="http://schemas.android.com/apk/res/android"> <alpha - android:duration="@android:integer/config_mediumAnimTime" + android:duration="@integer/fragment_transition_duration" android:fromAlpha="1.0" android:interpolator="@android:anim/accelerate_interpolator" android:toAlpha="0.0" /> diff --git a/app/src/main/res/anim/slide_left_in.xml b/app/src/main/res/anim/slide_left_in.xml index 6effe70f4..288e06dd8 100644 --- a/app/src/main/res/anim/slide_left_in.xml +++ b/app/src/main/res/anim/slide_left_in.xml @@ -4,5 +4,6 @@ <translate android:fromXDelta="-100%" android:toXDelta="0%" android:fromYDelta="0%" android:toYDelta="0%" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@integer/fragment_transition_duration" + android:interpolator="@android:anim/accelerate_decelerate_interpolator" /> </set> diff --git a/app/src/main/res/anim/slide_left_out.xml b/app/src/main/res/anim/slide_left_out.xml index ee28900e9..873947de4 100644 --- a/app/src/main/res/anim/slide_left_out.xml +++ b/app/src/main/res/anim/slide_left_out.xml @@ -4,5 +4,6 @@ <translate android:fromXDelta="0%" android:toXDelta="-100%" android:fromYDelta="0%" android:toYDelta="0%" - android:duration="@android:integer/config_mediumAnimTime" /> + android:duration="@integer/fragment_transition_duration" + android:interpolator="@android:anim/accelerate_decelerate_interpolator" /> </set> diff --git a/app/src/main/res/anim/slide_right_in.xml b/app/src/main/res/anim/slide_right_in.xml index 368927438..a00815052 100644 --- a/app/src/main/res/anim/slide_right_in.xml +++ b/app/src/main/res/anim/slide_right_in.xml @@ -4,5 +4,6 @@ <translate android:fromXDelta="100%" android:toXDelta="0%" android:fromYDelta="0%" android:toYDelta="0%" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@integer/fragment_transition_duration" + android:interpolator="@android:anim/accelerate_decelerate_interpolator" /> </set> diff --git a/app/src/main/res/anim/slide_right_out.xml b/app/src/main/res/anim/slide_right_out.xml index 13567b256..46de69db3 100644 --- a/app/src/main/res/anim/slide_right_out.xml +++ b/app/src/main/res/anim/slide_right_out.xml @@ -4,5 +4,6 @@ <translate android:fromXDelta="0%" android:toXDelta="100%" android:fromYDelta="0%" android:toYDelta="0%" - android:duration="@android:integer/config_mediumAnimTime" /> + android:duration="@integer/fragment_transition_duration" + android:interpolator="@android:anim/accelerate_decelerate_interpolator" /> </set> diff --git a/core/src/main/res/values/integers.xml b/core/src/main/res/values/integers.xml index 73d90cf98..c48880245 100644 --- a/core/src/main/res/values/integers.xml +++ b/core/src/main/res/values/integers.xml @@ -1,3 +1,4 @@ <resources> <integer name="episode_cache_size_unlimited">-1</integer> + <integer name="fragment_transition_duration">300</integer> </resources> |