diff --git a/app/src/main/java/com/tari/android/wallet/ui/activity/settings/SettingsActivity.kt b/app/src/main/java/com/tari/android/wallet/ui/activity/settings/SettingsActivity.kt index 722ed69c5..d1bde1112 100644 --- a/app/src/main/java/com/tari/android/wallet/ui/activity/settings/SettingsActivity.kt +++ b/app/src/main/java/com/tari/android/wallet/ui/activity/settings/SettingsActivity.kt @@ -48,6 +48,7 @@ class SettingsActivity : AppCompatActivity(), SettingsRouter { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) + overridePendingTransition(R.anim.enter_from_bottom, R.anim.exit_to_top) if (savedInstanceState == null) { loadFragment() } @@ -63,6 +64,11 @@ class SettingsActivity : AppCompatActivity(), SettingsRouter { addFragment(WalletBackupSettingsFragment.newInstance()) } + override fun onBackPressed() { + super.onBackPressed() + overridePendingTransition(R.anim.enter_from_top, R.anim.exit_to_bottom) + } + override fun toWalletBackupWithRecoveryPhrase() { addFragment(WriteDownSeedPhraseFragment.newInstance()) } diff --git a/app/src/main/res/anim/enter_from_bottom.xml b/app/src/main/res/anim/enter_from_bottom.xml new file mode 100644 index 000000000..8253fb4ed --- /dev/null +++ b/app/src/main/res/anim/enter_from_bottom.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/enter_from_top.xml b/app/src/main/res/anim/enter_from_top.xml new file mode 100644 index 000000000..49879c637 --- /dev/null +++ b/app/src/main/res/anim/enter_from_top.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/exit_to_bottom.xml b/app/src/main/res/anim/exit_to_bottom.xml new file mode 100644 index 000000000..509e30281 --- /dev/null +++ b/app/src/main/res/anim/exit_to_bottom.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/exit_to_top.xml b/app/src/main/res/anim/exit_to_top.xml new file mode 100644 index 000000000..32e904139 --- /dev/null +++ b/app/src/main/res/anim/exit_to_top.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0bdba939a..a596e4816 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ https://store.tarilabs.com https://tari.com - https://github.com/tari-project/wallet-android/ + https://github.com/tari-project/wallet-android https://www.tari.com/user_agreement/ https://www.tari.com/privacy_policy/ https://www.tari.com/disclaimer/