full sdk 34 support (#4224)

builds upon work from #4082 

Additionally fixes some deprecations and adds support for [predictive
back](https://developer.android.com/guide/navigation/custom-back/predictive-back-gesture).
I also refactored how the activity transitions work because they are
closely related to predictive back. The awkward
`finishWithoutSlideOutAnimation` is gone, activities that have been
started with slide in will now automatically close with slide out.

To test predictive back you need an emulator or device with Sdk 34
(Android 14) and then enable it in the developer settings.

Predictive back requires the back action to be determined before it
actually occurs so the system can play the right predictive animation,
which made a few reorganisations necessary.

closes #4082 
closes #4005 
unlocks a bunch of dependency upgrades that require sdk 34

---------

Co-authored-by: Goooler <wangzongler@gmail.com>

app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt

@@ -92,6 +92,7 @@ import com.keylesspalace.tusky.util.parseAsMastodonHtml
 import com.keylesspalace.tusky.util.reduceSwipeSensitivity
 import com.keylesspalace.tusky.util.setClickableText
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.util.visible

app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt

@@ -31,7 +31,6 @@ import at.connyduck.calladapter.networkresult.fold
 import autodispose2.androidx.lifecycle.AndroidLifecycleScopeProvider.from
 import autodispose2.autoDispose
 import com.google.android.material.snackbar.Snackbar
-import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.BottomSheetActivity
 import com.keylesspalace.tusky.PostLookupFallbackBehavior
 import com.keylesspalace.tusky.R
@@ -56,6 +55,7 @@ import com.keylesspalace.tusky.settings.PrefKeys
 import com.keylesspalace.tusky.util.HttpHeaderLink
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.view.EndlessOnScrollListener
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -144,17 +144,13 @@ class AccountListFragment :
     }
 
     override fun onViewTag(tag: String) {
-        (activity as BaseActivity?)
-            ?.startActivityWithSlideInAnimation(
-                StatusListActivity.newHashtagIntent(requireContext(), tag)
-            )
+        activity?.startActivityWithSlideInAnimation(
+            StatusListActivity.newHashtagIntent(requireContext(), tag)
+        )
     }
 
     override fun onViewAccount(id: String) {
-        (activity as BaseActivity?)?.let {
-            val intent = AccountActivity.getIntent(it, id)
-            it.startActivityWithSlideInAnimation(intent)
-        }
+        activity?.startActivityWithSlideInAnimation(AccountActivity.getIntent(requireContext(), id))
     }
 
     override fun onViewUrl(url: String) {

app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt

@@ -44,6 +44,7 @@ import com.keylesspalace.tusky.util.Loading
 import com.keylesspalace.tusky.util.Success
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.view.EmojiPicker

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt

@@ -70,6 +70,7 @@ import com.canhub.cropper.CropImage
 import com.canhub.cropper.CropImageContract
 import com.canhub.cropper.options
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
@@ -215,6 +216,24 @@ class ComposeActivity :
         viewModel.cropImageItemOld = null
     }
 
+    private val onBackPressedCallback = object : OnBackPressedCallback(false) {
+        override fun handleOnBackPressed() {
+            if (composeOptionsBehavior.state == BottomSheetBehavior.STATE_EXPANDED ||
+                addMediaBehavior.state == BottomSheetBehavior.STATE_EXPANDED ||
+                emojiBehavior.state == BottomSheetBehavior.STATE_EXPANDED ||
+                scheduleBehavior.state == BottomSheetBehavior.STATE_EXPANDED
+            ) {
+                composeOptionsBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+                addMediaBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+                emojiBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+                scheduleBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+                return
+            }
+
+            handleCloseButton()
+        }
+    }
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -425,7 +444,10 @@ class ComposeActivity :
         if (startingContentWarning != null) {
             binding.composeContentWarningField.setText(startingContentWarning)
         }
-        binding.composeContentWarningField.doOnTextChanged { _, _, _, _ -> updateVisibleCharactersLeft() }
+        binding.composeContentWarningField.doOnTextChanged { newContentWarning, _, _, _ ->
+            updateVisibleCharactersLeft()
+            viewModel.updateContentWarning(newContentWarning?.toString())
+        }
     }
 
     private fun setupComposeField(preferences: SharedPreferences, startingText: String?) {
@@ -456,6 +478,7 @@ class ComposeActivity :
         binding.composeEditField.doAfterTextChanged { editable ->
             highlightSpans(editable!!, mentionColour)
             updateVisibleCharactersLeft()
+            viewModel.updateContent(editable.toString())
         }
 
         // work around Android platform bug -> https://issuetracker.google.com/issues/67102093
@@ -547,6 +570,12 @@ class ComposeActivity :
                 }
             }
         }
+
+        lifecycleScope.launch {
+            viewModel.closeConfirmation.collect {
+                updateOnBackPressedCallbackState()
+            }
+        }
     }
 
     private fun setupButtons() {
@@ -557,6 +586,17 @@ class ComposeActivity :
         scheduleBehavior = BottomSheetBehavior.from(binding.composeScheduleView)
         emojiBehavior = BottomSheetBehavior.from(binding.emojiView)
 
+        val bottomSheetCallback = object : BottomSheetCallback() {
+            override fun onStateChanged(bottomSheet: View, newState: Int) {
+                updateOnBackPressedCallbackState()
+            }
+            override fun onSlide(bottomSheet: View, slideOffset: Float) { }
+        }
+        composeOptionsBehavior.addBottomSheetCallback(bottomSheetCallback)
+        addMediaBehavior.addBottomSheetCallback(bottomSheetCallback)
+        scheduleBehavior.addBottomSheetCallback(bottomSheetCallback)
+        emojiBehavior.addBottomSheetCallback(bottomSheetCallback)
+
         enableButton(binding.composeEmojiButton, clickable = false, colorActive = false)
 
         // Setup the interface buttons.
@@ -618,26 +658,7 @@ class ComposeActivity :
         binding.actionPhotoPick.setOnClickListener { onMediaPick() }
         binding.addPollTextActionTextView.setOnClickListener { openPollDialog() }
 
-        onBackPressedDispatcher.addCallback(
-            this,
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    if (composeOptionsBehavior.state == BottomSheetBehavior.STATE_EXPANDED ||
-                        addMediaBehavior.state == BottomSheetBehavior.STATE_EXPANDED ||
-                        emojiBehavior.state == BottomSheetBehavior.STATE_EXPANDED ||
-                        scheduleBehavior.state == BottomSheetBehavior.STATE_EXPANDED
-                    ) {
-                        composeOptionsBehavior.state = BottomSheetBehavior.STATE_HIDDEN
-                        addMediaBehavior.state = BottomSheetBehavior.STATE_HIDDEN
-                        emojiBehavior.state = BottomSheetBehavior.STATE_HIDDEN
-                        scheduleBehavior.state = BottomSheetBehavior.STATE_HIDDEN
-                        return
-                    }
-
-                    handleCloseButton()
-                }
-            }
-        )
+        onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
     }
 
     private fun setupLanguageSpinner(initialLanguages: List<String>) {
@@ -690,6 +711,15 @@ class ComposeActivity :
         )
     }
 
+    private fun updateOnBackPressedCallbackState() {
+        val confirmation = viewModel.closeConfirmation.value
+        onBackPressedCallback.isEnabled = confirmation != ConfirmationKind.NONE ||
+            composeOptionsBehavior.state != BottomSheetBehavior.STATE_HIDDEN ||
+            addMediaBehavior.state != BottomSheetBehavior.STATE_HIDDEN ||
+            emojiBehavior.state != BottomSheetBehavior.STATE_HIDDEN ||
+            scheduleBehavior.state != BottomSheetBehavior.STATE_HIDDEN
+    }
+
     private fun replaceTextAtCaret(text: CharSequence) {
         // If you select "backward" in an editable, you get SelectionStart > SelectionEnd
         val start = binding.composeEditField.selectionStart.coerceAtMost(
@@ -1004,7 +1034,7 @@ class ComposeActivity :
     }
 
     private fun removePoll() {
-        viewModel.poll.value = null
+        viewModel.updatePoll(null)
         binding.pollPreview.hide()
     }
 
@@ -1219,7 +1249,7 @@ class ComposeActivity :
     }
 
     private fun pickMedia(uri: Uri, description: String? = null) {
-        var sanitizedDescription = sanitizePickMediaDescription(description)
+        val sanitizedDescription = sanitizePickMediaDescription(description)
 
         lifecycleScope.launch {
             viewModel.pickMedia(uri, sanitizedDescription).onFailure { throwable ->
@@ -1292,10 +1322,10 @@ class ComposeActivity :
     private fun handleCloseButton() {
         val contentText = binding.composeEditField.text.toString()
         val contentWarning = binding.composeContentWarningField.text.toString()
-        when (viewModel.handleCloseButton(contentText, contentWarning)) {
+        when (viewModel.closeConfirmation.value) {
             ConfirmationKind.NONE -> {
                 viewModel.stopUploads()
-                finishWithoutSlideOutAnimation()
+                finish()
             }
             ConfirmationKind.SAVE_OR_DISCARD ->
                 getSaveAsDraftOrDiscardDialog(contentText, contentWarning).show()
@@ -1355,7 +1385,7 @@ class ComposeActivity :
             }
             .setNegativeButton(R.string.action_discard) { _, _ ->
                 viewModel.stopUploads()
-                finishWithoutSlideOutAnimation()
+                finish()
             }
     }
 
@@ -1371,7 +1401,7 @@ class ComposeActivity :
             }
             .setNegativeButton(R.string.action_discard) { _, _ ->
                 viewModel.stopUploads()
-                finishWithoutSlideOutAnimation()
+                finish()
             }
     }
 
@@ -1385,7 +1415,7 @@ class ComposeActivity :
             .setPositiveButton(R.string.action_delete) { _, _ ->
                 viewModel.deleteDraft()
                 viewModel.stopUploads()
-                finishWithoutSlideOutAnimation()
+                finish()
             }
             .setNegativeButton(R.string.action_continue_edit) { _, _ ->
                 // Do nothing, dialog will dismiss, user can continue editing
@@ -1394,7 +1424,7 @@ class ComposeActivity :
 
     private fun deleteDraftAndFinish() {
         viewModel.deleteDraft()
-        finishWithoutSlideOutAnimation()
+        finish()
     }
 
     private fun saveDraftAndFinish(contentText: String, contentWarning: String) {
@@ -1412,7 +1442,7 @@ class ComposeActivity :
             }
             viewModel.saveDraft(contentText, contentWarning)
             dialog?.cancel()
-            finishWithoutSlideOutAnimation()
+            finish()
         }
     }
 

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt

@@ -76,6 +76,9 @@ class ComposeViewModel @Inject constructor(
     private var modifiedInitialState: Boolean = false
     private var hasScheduledTimeChanged: Boolean = false
 
+    private var currentContent: String? = ""
+    private var currentContentWarning: String? = ""
+
     val instanceInfo: SharedFlow<InstanceInfo> = instanceInfoRepo::getInstanceInfo.asFlow()
         .shareIn(viewModelScope, SharingStarted.Eagerly, replay = 1)
 
@@ -99,6 +102,8 @@ class ComposeViewModel @Inject constructor(
             onBufferOverflow = BufferOverflow.DROP_OLDEST
         )
 
+    val closeConfirmation = MutableStateFlow(ConfirmationKind.NONE)
+
     private lateinit var composeKind: ComposeKind
 
     // Used in ComposeActivity to pass state to result function when cropImage contract inflight
@@ -199,6 +204,7 @@ class ComposeViewModel @Inject constructor(
                     }
                 }
         }
+        updateCloseConfirmation()
         return mediaItem
     }
 
@@ -228,21 +234,37 @@ class ComposeViewModel @Inject constructor(
     fun removeMediaFromQueue(item: QueuedMedia) {
         mediaUploader.cancelUploadScope(item.localId)
         media.update { mediaList -> mediaList.filter { it.localId != item.localId } }
+        updateCloseConfirmation()
     }
 
     fun toggleMarkSensitive() {
         this.markMediaAsSensitive.value = this.markMediaAsSensitive.value != true
     }
 
-    fun handleCloseButton(contentText: String?, contentWarning: String?): ConfirmationKind {
-        return if (didChange(contentText, contentWarning)) {
+    fun updateContent(newContent: String?) {
+        currentContent = newContent
+        updateCloseConfirmation()
+    }
+
+    fun updateContentWarning(newContentWarning: String?) {
+        currentContentWarning = newContentWarning
+        updateCloseConfirmation()
+    }
+
+    private fun updateCloseConfirmation() {
+        val contentWarning = if (showContentWarning.value) {
+            currentContentWarning
+        } else {
+            ""
+        }
+        this.closeConfirmation.value = if (didChange(currentContent, contentWarning)) {
             when (composeKind) {
-                ComposeKind.NEW -> if (isEmpty(contentText, contentWarning)) {
+                ComposeKind.NEW -> if (isEmpty(currentContent, contentWarning)) {
                     ConfirmationKind.NONE
                 } else {
                     ConfirmationKind.SAVE_OR_DISCARD
                 }
-                ComposeKind.EDIT_DRAFT -> if (isEmpty(contentText, contentWarning)) {
+                ComposeKind.EDIT_DRAFT -> if (isEmpty(currentContent, contentWarning)) {
                     ConfirmationKind.CONTINUE_EDITING_OR_DISCARD_DRAFT
                 } else {
                     ConfirmationKind.UPDATE_OR_DISCARD
@@ -272,6 +294,7 @@ class ComposeViewModel @Inject constructor(
     fun contentWarningChanged(value: Boolean) {
         showContentWarning.value = value
         contentWarningStateChanged = true
+        updateCloseConfirmation()
     }
 
     fun deleteDraft() {
@@ -511,11 +534,14 @@ class ComposeViewModel @Inject constructor(
         replyingStatusContent = composeOptions?.replyingStatusContent
         replyingStatusAuthor = composeOptions?.replyingStatusAuthor
 
+        updateCloseConfirmation()
+
         setupComplete = true
     }
 
-    fun updatePoll(newPoll: NewPoll) {
+    fun updatePoll(newPoll: NewPoll?) {
         poll.value = newPoll
+        updateCloseConfirmation()
     }
 
     fun updateScheduledAt(newScheduledAt: String?) {

app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersActivity.kt

@@ -12,6 +12,7 @@ import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.Filter
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.util.visible
 import javax.inject.Inject
@@ -110,8 +111,7 @@ class FiltersActivity : BaseActivity(), FiltersListener {
                 putExtra(EditFilterActivity.FILTER_TO_EDIT, filter)
             }
         }
-        startActivity(intent)
-        overridePendingTransition(R.anim.slide_from_right, R.anim.slide_to_left)
+        startActivityWithSlideInAnimation(intent)
     }
 
     override fun deleteFilter(filter: Filter) {

app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewActivity.kt

@@ -227,14 +227,10 @@ class LoginWebViewActivity : BaseActivity(), Injectable {
         super.onDestroy()
     }
 
-    override fun finish() {
-        super.finishWithoutSlideOutAnimation()
-    }
-
     override fun requiresLogin() = false
 
     private fun sendResult(result: LoginResult) {
         setResult(Activity.RESULT_OK, OauthLogin.makeResultIntent(result))
-        finishWithoutSlideOutAnimation()
+        finish()
     }
 }

app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt

@@ -51,6 +51,7 @@ import com.keylesspalace.tusky.util.getInitialLanguages
 import com.keylesspalace.tusky.util.getLocaleList
 import com.keylesspalace.tusky.util.getTuskyDisplayName
 import com.keylesspalace.tusky.util.makeIcon
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
@@ -100,11 +101,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 setIcon(R.drawable.ic_tabs)
                 setOnPreferenceClickListener {
                     val intent = Intent(context, TabPreferenceActivity::class.java)
-                    activity?.startActivity(intent)
-                    activity?.overridePendingTransition(
-                        R.anim.slide_from_right,
-                        R.anim.slide_to_left
-                    )
+                    activity?.startActivityWithSlideInAnimation(intent)
                     true
                 }
             }
@@ -114,11 +111,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 setIcon(R.drawable.ic_hashtag)
                 setOnPreferenceClickListener {
                     val intent = Intent(context, FollowedTagsActivity::class.java)
-                    activity?.startActivity(intent)
-                    activity?.overridePendingTransition(
-                        R.anim.slide_from_right,
-                        R.anim.slide_to_left
-                    )
+                    activity?.startActivityWithSlideInAnimation(intent)
                     true
                 }
             }
@@ -129,11 +122,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 setOnPreferenceClickListener {
                     val intent = Intent(context, AccountListActivity::class.java)
                     intent.putExtra("type", AccountListActivity.Type.MUTES)
-                    activity?.startActivity(intent)
-                    activity?.overridePendingTransition(
-                        R.anim.slide_from_right,
-                        R.anim.slide_to_left
-                    )
+                    activity?.startActivityWithSlideInAnimation(intent)
                     true
                 }
             }
@@ -147,11 +136,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 setOnPreferenceClickListener {
                     val intent = Intent(context, AccountListActivity::class.java)
                     intent.putExtra("type", AccountListActivity.Type.BLOCKS)
-                    activity?.startActivity(intent)
-                    activity?.overridePendingTransition(
-                        R.anim.slide_from_right,
-                        R.anim.slide_to_left
-                    )
+                    activity?.startActivityWithSlideInAnimation(intent)
                     true
                 }
             }
@@ -161,11 +146,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 setIcon(R.drawable.ic_mute_24dp)
                 setOnPreferenceClickListener {
                     val intent = Intent(context, DomainBlocksActivity::class.java)
-                    activity?.startActivity(intent)
-                    activity?.overridePendingTransition(
-                        R.anim.slide_from_right,
-                        R.anim.slide_to_left
-                    )
+                    activity?.startActivityWithSlideInAnimation(intent)
                     true
                 }
             }
@@ -176,7 +157,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                     setIcon(R.drawable.ic_logout)
                     setOnPreferenceClickListener {
                         val intent = LoginActivity.getIntent(context, LoginActivity.MODE_MIGRATION)
-                        (activity as BaseActivity).startActivityWithSlideInAnimation(intent)
+                        activity?.startActivityWithSlideInAnimation(intent)
                         true
                     }
                 }
@@ -300,8 +281,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                     it,
                     PreferencesActivity.NOTIFICATION_PREFERENCES
                 )
-                it.startActivity(intent)
-                it.overridePendingTransition(R.anim.slide_from_right, R.anim.slide_to_left)
+                it.startActivityWithSlideInAnimation(intent)
             }
         }
     }
@@ -368,8 +348,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
 
     private fun launchFilterActivity() {
         val intent = Intent(context, FiltersActivity::class.java)
-        activity?.startActivity(intent)
-        activity?.overridePendingTransition(R.anim.slide_from_right, R.anim.slide_to_left)
+        (activity as? BaseActivity)?.startActivityWithSlideInAnimation(intent)
     }
 
     companion object {

app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesActivity.kt

@@ -38,6 +38,7 @@ import com.keylesspalace.tusky.settings.PrefKeys
 import com.keylesspalace.tusky.settings.PrefKeys.APP_THEME
 import com.keylesspalace.tusky.util.getNonNullString
 import com.keylesspalace.tusky.util.setAppNightMode
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
 import javax.inject.Inject
@@ -139,16 +140,14 @@ class PreferencesActivity :
         ).unregisterOnSharedPreferenceChangeListener(this)
     }
 
-    private fun saveInstanceState(outState: Bundle) {
-        outState.putBoolean(EXTRA_RESTART_ON_BACK, restartActivitiesOnBackPressedCallback.isEnabled)
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
         outState.putBoolean(EXTRA_RESTART_ON_BACK, restartActivitiesOnBackPressedCallback.isEnabled)
         super.onSaveInstanceState(outState)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        sharedPreferences ?: return
+        key ?: return
         when (key) {
             APP_THEME -> {
                 val theme = sharedPreferences.getNonNullString(APP_THEME, AppTheme.DEFAULT.value)
@@ -156,11 +155,11 @@ class PreferencesActivity :
                 setAppNightMode(theme)
 
                 restartActivitiesOnBackPressedCallback.isEnabled = true
-                this.restartCurrentActivity()
+                this.recreate()
             }
             PrefKeys.UI_TEXT_SCALE_RATIO -> {
                 restartActivitiesOnBackPressedCallback.isEnabled = true
-                this.restartCurrentActivity()
+                this.recreate()
             }
             PrefKeys.STATUS_TEXT_SIZE, PrefKeys.ABSOLUTE_TIME_VIEW, PrefKeys.SHOW_BOT_OVERLAY, PrefKeys.ANIMATE_GIF_AVATARS, PrefKeys.USE_BLURHASH,
             PrefKeys.SHOW_SELF_USERNAME, PrefKeys.SHOW_CARDS_IN_TIMELINES, PrefKeys.CONFIRM_REBLOGS, PrefKeys.CONFIRM_FAVOURITES,
@@ -173,16 +172,6 @@ class PreferencesActivity :
         }
     }
 
-    private fun restartCurrentActivity() {
-        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
-        val savedInstanceState = Bundle()
-        saveInstanceState(savedInstanceState)
-        intent.putExtras(savedInstanceState)
-        startActivityWithSlideInAnimation(intent)
-        finish()
-        overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
-    }
-
     override fun androidInjector() = androidInjector
 
     companion object {

app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt

@@ -97,10 +97,6 @@ class SearchActivity : BottomSheetActivity(), HasAndroidInjector, MenuProvider,
         return false
     }
 
-    override fun finish() {
-        super.finishWithoutSlideOutAnimation()
-    }
-
     private fun getPageTitle(position: Int): CharSequence {
         return when (position) {
             0 -> getString(R.string.title_posts)

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt

@@ -28,6 +28,7 @@ import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.interfaces.LinkListener
 import com.keylesspalace.tusky.network.MastodonApi
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.util.visible
 import com.mikepenz.iconics.IconicsDrawable

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt

@@ -58,6 +58,7 @@ import com.keylesspalace.tusky.settings.PrefKeys
 import com.keylesspalace.tusky.util.CardViewMode
 import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.util.openLink
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.view.showMuteAccountDialog
 import com.keylesspalace.tusky.viewdata.AttachmentViewData
 import com.keylesspalace.tusky.viewdata.StatusViewData

app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt

@@ -39,7 +39,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import at.connyduck.sparkbutton.helpers.Utils
 import autodispose2.androidx.lifecycle.autoDispose
 import com.google.android.material.color.MaterialColors
-import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.adapter.StatusBaseViewHolder
 import com.keylesspalace.tusky.appstore.EventHub
@@ -66,6 +65,7 @@ import com.keylesspalace.tusky.util.ListStatusAccessibilityDelegate
 import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.viewdata.AttachmentViewData
@@ -463,13 +463,13 @@ class TimelineFragment :
     override fun onShowReblogs(position: Int) {
         val statusId = adapter.peek(position)?.asStatusOrNull()?.id ?: return
         val intent = newIntent(requireContext(), AccountListActivity.Type.REBLOGGED, statusId)
-        (activity as BaseActivity).startActivityWithSlideInAnimation(intent)
+        activity?.startActivityWithSlideInAnimation(intent)
     }
 
     override fun onShowFavs(position: Int) {
         val statusId = adapter.peek(position)?.asStatusOrNull()?.id ?: return
         val intent = newIntent(requireContext(), AccountListActivity.Type.FAVOURITED, statusId)
-        (activity as BaseActivity).startActivityWithSlideInAnimation(intent)
+        activity?.startActivityWithSlideInAnimation(intent)
     }
 
     override fun onLoadMore(position: Int) {

app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingTagsFragment.kt

@@ -30,7 +30,6 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import at.connyduck.sparkbutton.helpers.Utils
-import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.StatusListActivity
 import com.keylesspalace.tusky.components.trending.viewmodel.TrendingTagsViewModel
@@ -42,6 +41,7 @@ import com.keylesspalace.tusky.interfaces.RefreshableFragment
 import com.keylesspalace.tusky.interfaces.ReselectableFragment
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.viewdata.TrendingViewData
 import javax.inject.Inject
@@ -136,7 +136,7 @@ class TrendingTagsFragment :
     }
 
     fun onViewTag(tag: String) {
-        (requireActivity() as BaseActivity).startActivityWithSlideInAnimation(
+        requireActivity().startActivityWithSlideInAnimation(
             StatusListActivity.newHashtagIntent(requireContext(), tag)
         )
     }

app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt

@@ -36,7 +36,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import com.google.android.material.snackbar.Snackbar
-import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.components.accountlist.AccountListActivity
 import com.keylesspalace.tusky.components.accountlist.AccountListActivity.Companion.newIntent
@@ -53,6 +52,7 @@ import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.openLink
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.viewdata.AttachmentViewData.Companion.list
 import com.keylesspalace.tusky.viewdata.StatusViewData
@@ -386,13 +386,13 @@ class ViewThreadFragment :
     override fun onShowReblogs(position: Int) {
         val statusId = adapter.currentList[position].id
         val intent = newIntent(requireContext(), AccountListActivity.Type.REBLOGGED, statusId)
-        (requireActivity() as BaseActivity).startActivityWithSlideInAnimation(intent)
+        requireActivity().startActivityWithSlideInAnimation(intent)
     }
 
     override fun onShowFavs(position: Int) {
         val statusId = adapter.currentList[position].id
         val intent = newIntent(requireContext(), AccountListActivity.Type.FAVOURITED, statusId)
-        (requireActivity() as BaseActivity).startActivityWithSlideInAnimation(intent)
+        requireActivity().startActivityWithSlideInAnimation(intent)
     }
 
     override fun onContentCollapsedChange(isCollapsed: Boolean, position: Int) {

app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt

@@ -46,6 +46,7 @@ import com.keylesspalace.tusky.util.emojify
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.loadAvatar
 import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation
 import com.keylesspalace.tusky.util.unicodeWrap
 import com.keylesspalace.tusky.util.viewBinding
 import com.mikepenz.iconics.IconicsDrawable