summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-14 10:23:11 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-17 14:42:59 +0000
commitc9c01b7ee6526a5ea5dab207fa9a5af41b5b6c4d (patch)
tree24a6bcfb2522191441f903a1afbe86bcbda45802 /android
parentfe24e89a06d4441e9e0c916a977357006e86d966 (diff)
downloadmullvadvpn-c9c01b7ee6526a5ea5dab207fa9a5af41b5b6c4d.tar.xz
mullvadvpn-c9c01b7ee6526a5ea5dab207fa9a5af41b5b6c4d.zip
Animate relay list appearance
Diffstat (limited to 'android')
-rw-r--r--android/src/main/res/anim/fade_in.xml8
-rw-r--r--android/src/main/res/anim/fade_out.xml8
-rw-r--r--android/src/main/res/layout/select_location.xml2
3 files changed, 18 insertions, 0 deletions
diff --git a/android/src/main/res/anim/fade_in.xml b/android/src/main/res/anim/fade_in.xml
new file mode 100644
index 0000000000..fc857c772d
--- /dev/null
+++ b/android/src/main/res/anim/fade_in.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <alpha
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="450"
+ />
+</set>
diff --git a/android/src/main/res/anim/fade_out.xml b/android/src/main/res/anim/fade_out.xml
new file mode 100644
index 0000000000..c1d91f102b
--- /dev/null
+++ b/android/src/main/res/anim/fade_out.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <alpha
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="450"
+ />
+</set>
diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml
index 52cd369729..3a07326b48 100644
--- a/android/src/main/res/layout/select_location.xml
+++ b/android/src/main/res/layout/select_location.xml
@@ -41,6 +41,8 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
+ android:inAnimation="@anim/fade_in"
+ android:outAnimation="@anim/fade_out"
>
<ProgressBar
android:layout_width="60dp"