diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-11 15:48:35 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-17 10:14:36 +0000 |
| commit | 72ed08ba1ae257900ecd97f74a8d6c49d4470b7e (patch) | |
| tree | c74c6004e828bf1fb90957a3537d44f46b3ea830 /android | |
| parent | 17f4496def494a13e446a1f5661dd8977cad29bd (diff) | |
| download | mullvadvpn-72ed08ba1ae257900ecd97f74a8d6c49d4470b7e.tar.xz mullvadvpn-72ed08ba1ae257900ecd97f74a8d6c49d4470b7e.zip | |
Animate Account screen transitions
Diffstat (limited to 'android')
6 files changed, 39 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt index 91e097eb2a..c13998ece5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt @@ -48,6 +48,12 @@ class SettingsFragment : Fragment() { private fun openAccountSettings() { fragmentManager?.beginTransaction()?.apply { + setCustomAnimations( + R.anim.fragment_enter_from_right, + R.anim.fragment_half_exit_to_left, + R.anim.fragment_half_enter_from_left, + R.anim.fragment_exit_to_right + ) replace(R.id.main_fragment, AccountFragment()) addToBackStack(null) commit() diff --git a/android/src/main/res/anim/fragment_enter_from_right.xml b/android/src/main/res/anim/fragment_enter_from_right.xml new file mode 100644 index 0000000000..c8e79bd2ee --- /dev/null +++ b/android/src/main/res/anim/fragment_enter_from_right.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate + android:fromXDelta="100%p" + android:toXDelta="0" + android:duration="450" + /> +</set> diff --git a/android/src/main/res/anim/fragment_exit_to_right.xml b/android/src/main/res/anim/fragment_exit_to_right.xml new file mode 100644 index 0000000000..9d5970e110 --- /dev/null +++ b/android/src/main/res/anim/fragment_exit_to_right.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate + android:fromXDelta="0" + android:toXDelta="100%p" + android:duration="450" + /> +</set> diff --git a/android/src/main/res/anim/fragment_half_enter_from_left.xml b/android/src/main/res/anim/fragment_half_enter_from_left.xml new file mode 100644 index 0000000000..178181d7fb --- /dev/null +++ b/android/src/main/res/anim/fragment_half_enter_from_left.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate + android:fromXDelta="-50%p" + android:toXDelta="0" + android:duration="450" + /> +</set> diff --git a/android/src/main/res/anim/fragment_half_exit_to_left.xml b/android/src/main/res/anim/fragment_half_exit_to_left.xml new file mode 100644 index 0000000000..ba05a62afe --- /dev/null +++ b/android/src/main/res/anim/fragment_half_exit_to_left.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <translate + android:fromXDelta="0%p" + android:toXDelta="-50%p" + android:duration="450" + /> +</set> diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index 9424a428b5..69d9c7a896 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -5,7 +5,7 @@ android:background="@color/darkBlue" android:orientation="vertical" android:gravity="left" - android:elevation="1dp" + android:elevation="2dp" > <LinearLayout android:layout_width="match_parent" |