Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'faster-animations' into 'master'

Browse Source 
Use a central attribute for animation speed

See merge request briar/briar!1368
This commit is contained in:
akwizgran
2021-03-15 15:57:26 +00:00
parent 4f08f81779 eb9ff9c954
commit 2257c005b3
11 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/main/res/anim/fade_in.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<alpha <alpha xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:duration="@integer/animationSpeed"
android:duration="@android:integer/config_longAnimTime"
android:fromAlpha="0.0" android:fromAlpha="0.0"
android:interpolator="@android:interpolator/decelerate_quad" android:interpolator="@android:interpolator/decelerate_quad"
android:toAlpha="1.0"/> android:toAlpha="1.0" />

7
briar-android/src/main/res/anim/fade_out.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<alpha <alpha xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:duration="@integer/animationSpeed"
android:duration="@android:integer/config_mediumAnimTime"
android:fromAlpha="1.0" android:fromAlpha="1.0"
android:interpolator="@android:interpolator/accelerate_quad" android:interpolator="@android:interpolator/accelerate_quad"
android:toAlpha="0.0"/> android:toAlpha="0.0" />

7
briar-android/src/main/res/anim/screen_new_in.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<set <set xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- slide in from right --> <!-- slide in from right -->
<translate <translate
android:duration="@android:integer/config_mediumAnimTime" android:duration="@integer/animationSpeed"
android:fromXDelta="100%p" android:fromXDelta="100%p"
android:interpolator="@android:interpolator/decelerate_quad" android:interpolator="@android:interpolator/decelerate_quad"
android:toXDelta="0"/> android:toXDelta="0" />
</set> </set>

7
briar-android/src/main/res/anim/screen_new_out.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<set <set xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- slide out to right --> <!-- slide out to right -->
<translate <translate
android:duration="@android:integer/config_mediumAnimTime" android:duration="@integer/animationSpeed"
android:fromXDelta="0" android:fromXDelta="0"
android:interpolator="@android:interpolator/accelerate_quad" android:interpolator="@android:interpolator/accelerate_quad"
android:toXDelta="100%p"/> android:toXDelta="100%p" />
</set> </set>

7
briar-android/src/main/res/anim/screen_old_in.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<alpha <alpha xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:duration="@integer/animationSpeed"
android:duration="@android:integer/config_mediumAnimTime"
android:fromAlpha="0.0" android:fromAlpha="0.0"
android:interpolator="@android:interpolator/decelerate_quad" android:interpolator="@android:interpolator/decelerate_quad"
android:toAlpha="1.0"/> android:toAlpha="1.0" />

7
briar-android/src/main/res/anim/screen_old_out.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<alpha <alpha xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:duration="@integer/animationSpeed"
android:duration="@android:integer/config_mediumAnimTime"
android:fromAlpha="1.0" android:fromAlpha="1.0"
android:interpolator="@android:interpolator/accelerate_quad" android:interpolator="@android:interpolator/accelerate_quad"
android:toAlpha="0.0"/> android:toAlpha="0.0" />

2
briar-android/src/main/res/anim/step_next_in.xml
View File

@@ -4,7 +4,7 @@
<!-- slide in from right --> <!-- slide in from right -->
<translate <translate
android:duration="@android:integer/config_mediumAnimTime" android:duration="@integer/animationSpeed"
android:fromXDelta="100%p" android:fromXDelta="100%p"
android:interpolator="@android:interpolator/decelerate_quad" android:interpolator="@android:interpolator/decelerate_quad"
android:toXDelta="0"/> android:toXDelta="0"/>

7
briar-android/src/main/res/anim/step_next_out.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<set <set xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- slide out to right --> <!-- slide out to right -->
<translate <translate
android:duration="@android:integer/config_mediumAnimTime" android:duration="@integer/animationSpeed"
android:fromXDelta="0" android:fromXDelta="0"
android:interpolator="@android:interpolator/accelerate_quad" android:interpolator="@android:interpolator/accelerate_quad"
android:toXDelta="100%p"/> android:toXDelta="100%p" />
</set> </set>

7
briar-android/src/main/res/anim/step_previous_in.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<alpha <alpha xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:duration="@integer/animationSpeed"
android:duration="@android:integer/config_mediumAnimTime"
android:fromAlpha="0.0" android:fromAlpha="0.0"
android:interpolator="@android:interpolator/decelerate_quad" android:interpolator="@android:interpolator/decelerate_quad"
android:toAlpha="1.0"/> android:toAlpha="1.0" />

7
briar-android/src/main/res/anim/step_previous_out.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<alpha <alpha xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:duration="@integer/animationSpeed"
android:duration="@android:integer/config_mediumAnimTime"
android:fromAlpha="1.0" android:fromAlpha="1.0"
android:interpolator="@android:interpolator/accelerate_quad" android:interpolator="@android:interpolator/accelerate_quad"
android:toAlpha="0.0"/> android:toAlpha="0.0" />

2
briar-android/src/main/res/values/attrs.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<integer name="animationSpeed">@android:integer/config_mediumAnimTime</integer>
<declare-styleable name="BriarRecyclerView"> <declare-styleable name="BriarRecyclerView">
<attr name="scrollToEnd" format="boolean" /> <attr name="scrollToEnd" format="boolean" />
<attr name="emptyImage" format="integer" /> <attr name="emptyImage" format="integer" />