From eb9ff9c954b44cc2533372069026ca5333a797c0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 9 Feb 2021 14:37:24 -0300
Subject: [PATCH] Use a central attribute for animation speed

---
 briar-android/src/main/res/anim/fade_in.xml           | 7 +++----
 briar-android/src/main/res/anim/fade_out.xml          | 7 +++----
 briar-android/src/main/res/anim/screen_new_in.xml     | 7 +++----
 briar-android/src/main/res/anim/screen_new_out.xml    | 7 +++----
 briar-android/src/main/res/anim/screen_old_in.xml     | 7 +++----
 briar-android/src/main/res/anim/screen_old_out.xml    | 7 +++----
 briar-android/src/main/res/anim/step_next_in.xml      | 2 +-
 briar-android/src/main/res/anim/step_next_out.xml     | 7 +++----
 briar-android/src/main/res/anim/step_previous_in.xml  | 7 +++----
 briar-android/src/main/res/anim/step_previous_out.xml | 7 +++----
 briar-android/src/main/res/values/attrs.xml           | 2 ++
 11 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/briar-android/src/main/res/anim/fade_in.xml b/briar-android/src/main/res/anim/fade_in.xml
index 4d3bef4a3..83abd6b5d 100644
--- a/briar-android/src/main/res/anim/fade_in.xml
+++ b/briar-android/src/main/res/anim/fade_in.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="@android:integer/config_longAnimTime"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="@integer/animationSpeed"
 	android:fromAlpha="0.0"
 	android:interpolator="@android:interpolator/decelerate_quad"
-	android:toAlpha="1.0"/>
+	android:toAlpha="1.0" />
diff --git a/briar-android/src/main/res/anim/fade_out.xml b/briar-android/src/main/res/anim/fade_out.xml
index 84bad946f..205435cca 100644
--- a/briar-android/src/main/res/anim/fade_out.xml
+++ b/briar-android/src/main/res/anim/fade_out.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="@android:integer/config_mediumAnimTime"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="@integer/animationSpeed"
 	android:fromAlpha="1.0"
 	android:interpolator="@android:interpolator/accelerate_quad"
-	android:toAlpha="0.0"/>
+	android:toAlpha="0.0" />
diff --git a/briar-android/src/main/res/anim/screen_new_in.xml b/briar-android/src/main/res/anim/screen_new_in.xml
index 6bdf53b16..32b84f2da 100644
--- a/briar-android/src/main/res/anim/screen_new_in.xml
+++ b/briar-android/src/main/res/anim/screen_new_in.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set
-	xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<!-- slide in from right -->
 	<translate
-		android:duration="@android:integer/config_mediumAnimTime"
+		android:duration="@integer/animationSpeed"
 		android:fromXDelta="100%p"
 		android:interpolator="@android:interpolator/decelerate_quad"
-		android:toXDelta="0"/>
+		android:toXDelta="0" />
 
 </set>
diff --git a/briar-android/src/main/res/anim/screen_new_out.xml b/briar-android/src/main/res/anim/screen_new_out.xml
index 5411fa11b..ee1b18e39 100644
--- a/briar-android/src/main/res/anim/screen_new_out.xml
+++ b/briar-android/src/main/res/anim/screen_new_out.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set
-	xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<!-- slide out to right -->
 	<translate
-		android:duration="@android:integer/config_mediumAnimTime"
+		android:duration="@integer/animationSpeed"
 		android:fromXDelta="0"
 		android:interpolator="@android:interpolator/accelerate_quad"
-		android:toXDelta="100%p"/>
+		android:toXDelta="100%p" />
 
 </set>
diff --git a/briar-android/src/main/res/anim/screen_old_in.xml b/briar-android/src/main/res/anim/screen_old_in.xml
index 2360d85b5..83abd6b5d 100644
--- a/briar-android/src/main/res/anim/screen_old_in.xml
+++ b/briar-android/src/main/res/anim/screen_old_in.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="@android:integer/config_mediumAnimTime"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="@integer/animationSpeed"
 	android:fromAlpha="0.0"
 	android:interpolator="@android:interpolator/decelerate_quad"
-	android:toAlpha="1.0"/>
+	android:toAlpha="1.0" />
diff --git a/briar-android/src/main/res/anim/screen_old_out.xml b/briar-android/src/main/res/anim/screen_old_out.xml
index 84bad946f..205435cca 100644
--- a/briar-android/src/main/res/anim/screen_old_out.xml
+++ b/briar-android/src/main/res/anim/screen_old_out.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="@android:integer/config_mediumAnimTime"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="@integer/animationSpeed"
 	android:fromAlpha="1.0"
 	android:interpolator="@android:interpolator/accelerate_quad"
-	android:toAlpha="0.0"/>
+	android:toAlpha="0.0" />
diff --git a/briar-android/src/main/res/anim/step_next_in.xml b/briar-android/src/main/res/anim/step_next_in.xml
index 6bdf53b16..77549112b 100644
--- a/briar-android/src/main/res/anim/step_next_in.xml
+++ b/briar-android/src/main/res/anim/step_next_in.xml
@@ -4,7 +4,7 @@
 
 	<!-- slide in from right -->
 	<translate
-		android:duration="@android:integer/config_mediumAnimTime"
+		android:duration="@integer/animationSpeed"
 		android:fromXDelta="100%p"
 		android:interpolator="@android:interpolator/decelerate_quad"
 		android:toXDelta="0"/>
diff --git a/briar-android/src/main/res/anim/step_next_out.xml b/briar-android/src/main/res/anim/step_next_out.xml
index 5411fa11b..ee1b18e39 100644
--- a/briar-android/src/main/res/anim/step_next_out.xml
+++ b/briar-android/src/main/res/anim/step_next_out.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set
-	xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<!-- slide out to right -->
 	<translate
-		android:duration="@android:integer/config_mediumAnimTime"
+		android:duration="@integer/animationSpeed"
 		android:fromXDelta="0"
 		android:interpolator="@android:interpolator/accelerate_quad"
-		android:toXDelta="100%p"/>
+		android:toXDelta="100%p" />
 
 </set>
diff --git a/briar-android/src/main/res/anim/step_previous_in.xml b/briar-android/src/main/res/anim/step_previous_in.xml
index 2360d85b5..83abd6b5d 100644
--- a/briar-android/src/main/res/anim/step_previous_in.xml
+++ b/briar-android/src/main/res/anim/step_previous_in.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="@android:integer/config_mediumAnimTime"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="@integer/animationSpeed"
 	android:fromAlpha="0.0"
 	android:interpolator="@android:interpolator/decelerate_quad"
-	android:toAlpha="1.0"/>
+	android:toAlpha="1.0" />
diff --git a/briar-android/src/main/res/anim/step_previous_out.xml b/briar-android/src/main/res/anim/step_previous_out.xml
index 84bad946f..205435cca 100644
--- a/briar-android/src/main/res/anim/step_previous_out.xml
+++ b/briar-android/src/main/res/anim/step_previous_out.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="@android:integer/config_mediumAnimTime"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="@integer/animationSpeed"
 	android:fromAlpha="1.0"
 	android:interpolator="@android:interpolator/accelerate_quad"
-	android:toAlpha="0.0"/>
+	android:toAlpha="0.0" />
diff --git a/briar-android/src/main/res/values/attrs.xml b/briar-android/src/main/res/values/attrs.xml
index 588dc4b8d..51e0b887f 100644
--- a/briar-android/src/main/res/values/attrs.xml
+++ b/briar-android/src/main/res/values/attrs.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<integer name="animationSpeed">@android:integer/config_mediumAnimTime</integer>
+
 	<declare-styleable name="BriarRecyclerView">
 		<attr name="scrollToEnd" format="boolean" />
 		<attr name="emptyImage" format="integer" />