diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt index 99f98dcf7..9e68db998 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt @@ -95,11 +95,9 @@ import com.keylesspalace.tusky.pager.MainPagerAdapter import com.keylesspalace.tusky.settings.PrefKeys import com.keylesspalace.tusky.usecase.DeveloperToolsUseCase import com.keylesspalace.tusky.usecase.LogoutUsecase -import com.keylesspalace.tusky.util.ActivityConstants import com.keylesspalace.tusky.util.emojify import com.keylesspalace.tusky.util.getParcelableExtraCompat import com.keylesspalace.tusky.util.hide -import com.keylesspalace.tusky.util.overrideActivityTransitionCompat import com.keylesspalace.tusky.util.reduceSwipeSensitivity import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation @@ -217,14 +215,6 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { viewModel.setupNotifications(this) } - if (explodeAnimationWasRequested()) { - overrideActivityTransitionCompat( - ActivityConstants.OVERRIDE_TRANSITION_OPEN, - R.anim.explode, - R.anim.activity_open_exit - ) - } - selectedEmojiPack = preferences.getString(EMOJI_PREFERENCE, "") var showNotificationTab = false @@ -1118,15 +1108,9 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { } } - private fun explodeAnimationWasRequested(): Boolean { - return intent.getBooleanExtra(OPEN_WITH_EXPLODE_ANIMATION, false) - } - override fun getActionButton() = binding.composeButton companion object { - const val OPEN_WITH_EXPLODE_ANIMATION = "explode" - private const val TAG = "MainActivity" // logging tag private const val DRAWER_ITEM_ADD_ACCOUNT: Long = -13 private const val DRAWER_ITEM_ANNOUNCEMENTS: Long = 14 diff --git a/app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt index 9bd35af3e..33c604755 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt @@ -291,9 +291,8 @@ class LoginActivity : BaseActivity() { oauthScopes = OAUTH_SCOPES, newAccount = newAccount ) - finishAffinity() val intent = Intent(this, MainActivity::class.java) - intent.putExtra(MainActivity.OPEN_WITH_EXPLODE_ANIMATION, true) + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) startActivity(intent) }, { e -> setLoading(false) diff --git a/app/src/main/res/anim/explode.xml b/app/src/main/res/anim/explode.xml deleted file mode 100644 index 08001aef5..000000000 --- a/app/src/main/res/anim/explode.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - -