Display notification filter/clear actions as menu items (#3877)

Previously the notification filter and clear actions were shown as buttons in the UI, with a preference that determined whether they were displayed. Remove this preference, and display them as menu items. - "Filter notifications" is shown as an icon, if possible - "Clear notifications" is only ever shown as a menu item, to reduce the chance the user inadvertently selects it To ensure that the options menu appears correctly, remove the code that creates a "fake" action bar, and adjust the layouts so that there are three toolbars; - mainToolbar -- displays the icons, and the current "location" (Home, Notifications, etc) - topNav -- displays the row of tabs at the top - bottomNav -- displays the row of tabs at the bottom Only one of them is set as the support action bar (depending on the user's preferences). This provides the "show a logo" and "show the options menu" functionality as standard, without needing to re-implement as the previous code did.
2023-08-19 14:41:10 +02:00 · 2023-08-19 14:41:10 +02:00 · 059352f471
parent c7ffc6ad93
commit 059352f471
56 changed files with 152 additions and 304 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@ -16,6 +16,7 @@
 package com.keylesspalace.tusky

 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.NotificationManager
 import android.content.Context
 import android.content.DialogInterface
@ -34,6 +35,7 @@ import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.MenuItem.SHOW_AS_ACTION_NEVER
 import android.view.View
 import android.widget.ImageView
 import androidx.activity.OnBackPressedCallback
@ -46,6 +48,8 @@ import androidx.core.content.IntentCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.MenuProvider
+import androidx.core.view.forEach
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.MarginPageTransformer
@ -102,7 +106,6 @@ import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.keylesspalace.tusky.util.updateShortcut
 import com.keylesspalace.tusky.util.viewBinding
-import com.keylesspalace.tusky.util.visible
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.utils.colorInt
@ -177,6 +180,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
    /** Adapter for the different timeline tabs */
    private lateinit var tabAdapter: MainPagerAdapter

+    @SuppressLint("RestrictedApi")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@ -253,7 +257,6 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
        }
        window.statusBarColor = Color.TRANSPARENT // don't draw a status bar, the DrawerLayout and the MaterialDrawerLayout have their own
        setContentView(binding.root)
-        setSupportActionBar(binding.mainToolbar)

        glide = Glide.with(this)

@ -262,8 +265,21 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
            startActivity(composeIntent)
        }

+        // Determine which of the three toolbars should be the supportActionBar (which hosts
+        // the options menu).
        val hideTopToolbar = preferences.getBoolean(PrefKeys.HIDE_TOP_TOOLBAR, false)
-        binding.mainToolbar.visible(!hideTopToolbar)
+        if (hideTopToolbar) {
+            when (preferences.getString(PrefKeys.MAIN_NAV_POSITION, "top")) {
+                "top" -> setSupportActionBar(binding.topNav)
+                "bottom" -> setSupportActionBar(binding.bottomNav)
+            }
+            binding.mainToolbar.hide()
+            // There's not enough space in the top/bottom bars to show the title as well.
+            supportActionBar?.setDisplayShowTitleEnabled(false)
+        } else {
+            setSupportActionBar(binding.mainToolbar)
+            binding.mainToolbar.show()
+        }

        loadDrawerAvatar(activeAccount.profilePictureUrl, true)

@ -361,6 +377,14 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
        }
    }

+    override fun onPrepareMenu(menu: Menu) {
+        super.onPrepareMenu(menu)
+
+        // If the main toolbar is hidden then there's no space in the top/bottomNav to show
+        // the menu items as icons, so forceably disable them
+        if (!binding.mainToolbar.isVisible) menu.forEach { it.setShowAsAction(SHOW_AS_ACTION_NEVER) }
+    }
+
    override fun onMenuItemSelected(item: MenuItem): Boolean {
        return when (item.itemId) {
            R.id.action_search -> {
@ -458,8 +482,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
        val drawerOpenClickListener = View.OnClickListener { binding.mainDrawerLayout.open() }

        binding.mainToolbar.setNavigationOnClickListener(drawerOpenClickListener)
-        binding.topNavAvatar.setOnClickListener(drawerOpenClickListener)
-        binding.bottomNavAvatar.setOnClickListener(drawerOpenClickListener)
+        binding.topNav.setNavigationOnClickListener(drawerOpenClickListener)
+        binding.bottomNav.setNavigationOnClickListener(drawerOpenClickListener)

        header = AccountHeaderView(this).apply {
            headerBackgroundScaleType = ImageView.ScaleType.CENTER_CROP
@ -894,112 +918,75 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
        val hideTopToolbar = preferences.getBoolean(PrefKeys.HIDE_TOP_TOOLBAR, false)
        val animateAvatars = preferences.getBoolean("animateGifAvatars", false)

-        if (hideTopToolbar) {
+        val activeToolbar = if (hideTopToolbar) {
            val navOnBottom = preferences.getString("mainNavPosition", "top") == "bottom"
-
-            val avatarView = if (navOnBottom) {
-                binding.bottomNavAvatar.show()
-                binding.bottomNavAvatar
+            if (navOnBottom) {
+                binding.bottomNav
            } else {
-                binding.topNavAvatar.show()
-                binding.topNavAvatar
-            }
-
-            if (animateAvatars) {
-                Glide.with(this)
-                    .load(avatarUrl)
-                    .placeholder(R.drawable.avatar_default)
-                    .into(avatarView)
-            } else {
-                Glide.with(this)
-                    .asBitmap()
-                    .load(avatarUrl)
-                    .placeholder(R.drawable.avatar_default)
-                    .into(avatarView)
+                binding.topNav
            }
        } else {
-            binding.bottomNavAvatar.hide()
-            binding.topNavAvatar.hide()
+            binding.mainToolbar
+        }

-            val navIconSize = resources.getDimensionPixelSize(R.dimen.avatar_toolbar_nav_icon_size)
+        val navIconSize = resources.getDimensionPixelSize(R.dimen.avatar_toolbar_nav_icon_size)

-            if (animateAvatars) {
-                glide.asDrawable()
-                    .load(avatarUrl)
-                    .transform(
-                        RoundedCorners(resources.getDimensionPixelSize(R.dimen.avatar_radius_36dp))
-                    )
-                    .apply {
-                        if (showPlaceholder) {
-                            placeholder(R.drawable.avatar_default)
+        if (animateAvatars) {
+            glide.asDrawable().load(avatarUrl).transform(RoundedCorners(resources.getDimensionPixelSize(R.dimen.avatar_radius_36dp)))
+                .apply {
+                    if (showPlaceholder) placeholder(R.drawable.avatar_default)
+                }
+                .into(object : CustomTarget<Drawable>(navIconSize, navIconSize) {
+
+                    override fun onLoadStarted(placeholder: Drawable?) {
+                        placeholder?.let {
+                            activeToolbar.navigationIcon = FixedSizeDrawable(it, navIconSize, navIconSize)
                        }
                    }
-                    .into(object : CustomTarget<Drawable>(navIconSize, navIconSize) {

-                        override fun onLoadStarted(placeholder: Drawable?) {
-                            if (placeholder != null) {
-                                binding.mainToolbar.navigationIcon =
-                                    FixedSizeDrawable(placeholder, navIconSize, navIconSize)
-                            }
-                        }
+                    override fun onResourceReady(
+                        resource: Drawable,
+                        transition: Transition<in Drawable>?
+                    ) {
+                        if (resource is Animatable) resource.start()
+                        activeToolbar.navigationIcon = FixedSizeDrawable(resource, navIconSize, navIconSize)
+                    }

-                        override fun onResourceReady(
-                            resource: Drawable,
-                            transition: Transition<in Drawable>?
-                        ) {
-                            if (resource is Animatable) {
-                                resource.start()
-                            }
-                            binding.mainToolbar.navigationIcon =
-                                FixedSizeDrawable(resource, navIconSize, navIconSize)
-                        }
-
-                        override fun onLoadCleared(placeholder: Drawable?) {
-                            if (placeholder != null) {
-                                binding.mainToolbar.navigationIcon =
-                                    FixedSizeDrawable(placeholder, navIconSize, navIconSize)
-                            }
-                        }
-                    })
-            } else {
-                glide.asBitmap()
-                    .load(avatarUrl)
-                    .transform(
-                        RoundedCorners(resources.getDimensionPixelSize(R.dimen.avatar_radius_36dp))
-                    )
-                    .apply {
-                        if (showPlaceholder) {
-                            placeholder(R.drawable.avatar_default)
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        placeholder?.let {
+                            activeToolbar.navigationIcon = FixedSizeDrawable(it, navIconSize, navIconSize)
                        }
                    }
-                    .into(object : CustomTarget<Bitmap>(navIconSize, navIconSize) {
-
-                        override fun onLoadStarted(placeholder: Drawable?) {
-                            if (placeholder != null) {
-                                binding.mainToolbar.navigationIcon =
-                                    FixedSizeDrawable(placeholder, navIconSize, navIconSize)
-                            }
+                })
+        } else {
+            glide.asBitmap().load(avatarUrl).transform(RoundedCorners(resources.getDimensionPixelSize(R.dimen.avatar_radius_36dp)))
+                .apply {
+                    if (showPlaceholder) placeholder(R.drawable.avatar_default)
+                }
+                .into(object : CustomTarget<Bitmap>(navIconSize, navIconSize) {
+                    override fun onLoadStarted(placeholder: Drawable?) {
+                        placeholder?.let {
+                            activeToolbar.navigationIcon = FixedSizeDrawable(it, navIconSize, navIconSize)
                        }
+                    }

-                        override fun onResourceReady(
-                            resource: Bitmap,
-                            transition: Transition<in Bitmap>?
-                        ) {
-                            binding.mainToolbar.navigationIcon = FixedSizeDrawable(
-                                BitmapDrawable(resources, resource),
-                                navIconSize,
-                                navIconSize
-                            )
-                        }
+                    override fun onResourceReady(
+                        resource: Bitmap,
+                        transition: Transition<in Bitmap>?
+                    ) {
+                        activeToolbar.navigationIcon = FixedSizeDrawable(
+                            BitmapDrawable(resources, resource),
+                            navIconSize,
+                            navIconSize
+                        )
+                    }

-                        override fun onLoadCleared(placeholder: Drawable?) {
-                            if (placeholder != null) {
-                                binding.mainToolbar.navigationIcon =
-                                    FixedSizeDrawable(placeholder, navIconSize, navIconSize)
-                            }
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        placeholder?.let {
+                            activeToolbar.navigationIcon = FixedSizeDrawable(it, navIconSize, navIconSize)
                        }
-                    })
-            }
+                    }
+                })
        }
    }

--- a/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
@ -130,6 +130,12 @@ class TuskyApplication : Application(), HasAndroidInjector {
            editor.remove(PrefKeys.MEDIA_PREVIEW_ENABLED)
        }

+        if (oldVersion < 2023072401) {
+            // The notifications filter / clear options are shown on a menu, not a separate bar,
+            // the preference to display them is not needed.
+            editor.remove(PrefKeys.Deprecated.SHOW_NOTIFICATIONS_FILTER)
+        }
+
        editor.putInt(PrefKeys.SCHEMA_VERSION, newVersion)
        editor.apply()
    }
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
@ -28,7 +28,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
-import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
@ -46,7 +45,6 @@ import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 import androidx.recyclerview.widget.SimpleItemAnimator
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import at.connyduck.sparkbutton.helpers.Utils
-import com.google.android.material.appbar.AppBarLayout.ScrollingViewBehavior
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.R
@ -123,21 +121,6 @@ class NotificationsFragment :
        return inflater.inflate(R.layout.fragment_timeline_notifications, container, false)
    }

-    private fun updateFilterVisibility(showFilter: Boolean) {
-        val params = binding.swipeRefreshLayout.layoutParams as CoordinatorLayout.LayoutParams
-        if (showFilter) {
-            binding.appBarOptions.setExpanded(true, false)
-            binding.appBarOptions.visibility = View.VISIBLE
-            // Set content behaviour to hide filter on scroll
-            params.behavior = ScrollingViewBehavior()
-        } else {
-            binding.appBarOptions.setExpanded(false, false)
-            binding.appBarOptions.visibility = View.GONE
-            // Clear behaviour to hide app bar
-            params.behavior = null
-        }
-    }
-
    private fun confirmClearNotifications() {
        AlertDialog.Builder(requireContext())
            .setMessage(R.string.notification_clear_text)
@ -215,8 +198,6 @@ class NotificationsFragment :
            footer = NotificationsLoadStateAdapter { adapter.retry() }
        )

-        binding.buttonClear.setOnClickListener { confirmClearNotifications() }
-        binding.buttonFilter.setOnClickListener { showFilterDialog() }
        (binding.recyclerView.itemAnimator as SimpleItemAnimator?)!!.supportsChangeAnimations =
            false

@ -369,10 +350,10 @@ class NotificationsFragment :
                    }
                }

-                // Update filter option visibility from uiState
-                launch {
-                    viewModel.uiState.collectLatest { updateFilterVisibility(it.showFilterOptions) }
-                }
+                // Collect the uiState. Nothing is done with it, but if you don't collect it then
+                // accessing viewModel.uiState.value (e.g., when the filter dialog is created)
+                // returns an empty object.
+                launch { viewModel.uiState.collect() }

                // Update status display from statusDisplayOptions. If the new options request
                // relative time display collect the flow to periodically update the timestamp in the list gui elements.
@ -439,10 +420,17 @@ class NotificationsFragment :

    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
        menuInflater.inflate(R.menu.fragment_notifications, menu)
+        val iconColor = MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary)
        menu.findItem(R.id.action_refresh)?.apply {
            icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply {
                sizeDp = 20
-                colorInt = MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary)
+                colorInt = iconColor
+            }
+        }
+        menu.findItem(R.id.action_edit_notification_filter)?.apply {
+            icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_tune).apply {
+                sizeDp = 20
+                colorInt = iconColor
            }
        }
    }
@ -458,6 +446,14 @@ class NotificationsFragment :
                viewModel.accept(InfallibleUiAction.LoadNewest)
                true
            }
+            R.id.action_edit_notification_filter -> {
+                showFilterDialog()
+                true
+            }
+            R.id.action_clear_notifications -> {
+                confirmClearNotifications()
+                true
+            }
            else -> false
        }
    }
@ -625,7 +621,6 @@ class NotificationsFragment :

    override fun onReselect() {
        if (isAdded) {
-            binding.appBarOptions.setExpanded(true, false)
            layoutManager.scrollToPosition(0)
        }
    }
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt
@ -74,23 +74,18 @@ data class UiState(
    /** Filtered notification types */
    val activeFilter: Set<Notification.Type> = emptySet(),

-    /** True if the UI to filter and clear notifications should be shown */
-    val showFilterOptions: Boolean = false,
-
    /** True if the FAB should be shown while scrolling */
    val showFabWhileScrolling: Boolean = true
 )

 /** Preferences the UI reacts to */
 data class UiPrefs(
-    val showFabWhileScrolling: Boolean,
-    val showFilter: Boolean
+    val showFabWhileScrolling: Boolean
 ) {
    companion object {
        /** Relevant preference keys. Changes to any of these trigger a display update */
        val prefKeys = setOf(
-            PrefKeys.FAB_HIDE,
-            PrefKeys.SHOW_NOTIFICATIONS_FILTER
+            PrefKeys.FAB_HIDE
        )
    }
 }
@ -495,7 +490,6 @@ class NotificationsViewModel @Inject constructor(
        uiState = combine(notificationFilter, getUiPrefs()) { filter, prefs ->
            UiState(
                activeFilter = filter.filter,
-                showFilterOptions = prefs.showFilter,
                showFabWhileScrolling = prefs.showFabWhileScrolling
            )
        }.stateIn(
@ -544,8 +538,7 @@ class NotificationsViewModel @Inject constructor(
        .onStart { emit(toPrefs()) }

    private fun toPrefs() = UiPrefs(
-        showFabWhileScrolling = !preferences.getBoolean(PrefKeys.FAB_HIDE, false),
-        showFilter = preferences.getBoolean(PrefKeys.SHOW_NOTIFICATIONS_FILTER, true)
+        showFabWhileScrolling = !preferences.getBoolean(PrefKeys.FAB_HIDE, false)
    )

    companion object {
--- a/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
@ -208,13 +208,6 @@ class PreferencesFragment : PreferenceFragmentCompat(), Injectable {
                    isSingleLineTitle = false
                }

-                switchPreference {
-                    setDefaultValue(true)
-                    key = PrefKeys.SHOW_NOTIFICATIONS_FILTER
-                    setTitle(R.string.pref_title_show_notifications_filter)
-                    isSingleLineTitle = false
-                }
-
                switchPreference {
                    setDefaultValue(true)
                    key = PrefKeys.CONFIRM_REBLOGS
--- a/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt
@ -41,7 +41,7 @@ enum class AppTheme(val value: String) {
 *
 * - Adding a new preference that does not change the interpretation of an existing preference
 */
-const val SCHEMA_VERSION = 2023022701
+const val SCHEMA_VERSION = 2023072401

 object PrefKeys {
    // Note: not all of these keys are actually used as SharedPreferences keys but we must give
@ -61,7 +61,6 @@ object PrefKeys {
    const val ANIMATE_GIF_AVATARS = "animateGifAvatars"
    const val USE_BLURHASH = "useBlurhash"
    const val SHOW_SELF_USERNAME = "showSelfUsername"
-    const val SHOW_NOTIFICATIONS_FILTER = "showNotificationsFilter"
    const val SHOW_CARDS_IN_TIMELINES = "showCardsInTimelines"
    const val CONFIRM_REBLOGS = "confirmReblogs"
    const val CONFIRM_FAVOURITES = "confirmFavourites"
@ -104,4 +103,9 @@ object PrefKeys {

    /** UI text scaling factor, stored as float, 100 = 100% = no scaling */
    const val UI_TEXT_SCALE_RATIO = "uiTextScaleRatio"
+
+    /** Keys that are no longer used (e.g., the preference has been removed */
+    object Deprecated {
+        const val SHOW_NOTIFICATIONS_FILTER = "showNotificationsFilter"
+    }
 }
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -29,22 +29,14 @@
                app:layout_scrollFlags="scroll|enterAlways"
                app:navigationContentDescription="@string/action_open_drawer" />

-            <LinearLayout
+            <androidx.appcompat.widget.Toolbar
                android:id="@+id/topNav"
                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/topNavAvatar"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:contentDescription="@string/action_open_drawer"
-                    app:shapeAppearance="@style/ShapeAppearance.Avatar"
-                    tools:src="@drawable/avatar_default" />
+                android:layout_height="48dp"
+                android:orientation="horizontal"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationContentDescription="@string/action_open_drawer">

                <com.google.android.material.tabs.TabLayout
                    android:id="@+id/tabLayout"
@ -54,8 +46,7 @@
                    app:tabGravity="fill"
                    app:tabMaxWidth="0dp"
                    app:tabMode="fixed" />
-
-            </LinearLayout>
+            </androidx.appcompat.widget.Toolbar>

        </com.google.android.material.appbar.AppBarLayout>

@ -73,33 +64,16 @@
            android:layout_height="wrap_content"
            android:layout_gravity="bottom"
            app:contentInsetStart="0dp"
+            app:contentInsetStartWithNavigation="0dp"
            app:fabAlignmentMode="end">

-            <LinearLayout
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/bottomTabLayout"
                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/bottomNavAvatar"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:contentDescription="@string/action_open_drawer"
-                    app:shapeAppearance="@style/ShapeAppearance.Avatar"
-                    tools:src="@drawable/avatar_default" />
-
-                <com.google.android.material.tabs.TabLayout
-                    android:id="@+id/bottomTabLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:tabGravity="fill"
-                    app:tabIndicator="@null"
-                    app:tabMode="fixed" />
-
-            </LinearLayout>
+                android:layout_height="?attr/actionBarSize"
+                app:tabGravity="fill"
+                app:tabIndicatorGravity="top"
+                app:tabMode="fixed" />

        </com.google.android.material.bottomappbar.BottomAppBar>

@ -132,4 +106,3 @@
        android:fitsSystemWindows="true" />

 </androidx.drawerlayout.widget.DrawerLayout>
-
--- a/app/src/main/res/layout/fragment_timeline_notifications.xml
+++ b/app/src/main/res/layout/fragment_timeline_notifications.xml
@ -18,53 +18,10 @@

 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="?android:attr/colorBackground">

-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarOptions"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/colorSurface"
-        app:elevation="0dp">
-
-        <LinearLayout
-            android:id="@+id/topButtonsLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/buttonClear"
-                style="@style/TuskyButton.TextButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/notifications_clear"
-                android:textSize="?attr/status_text_medium" />
-
-            <Button
-                android:id="@+id/buttonFilter"
-                style="@style/TuskyButton.TextButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/notifications_apply_filter"
-                android:textSize="?attr/status_text_medium" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_gravity="bottom"
-            android:background="?android:attr/listDivider"
-            app:layout_scrollFlags="scroll|enterAlways" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/swipeRefreshLayout"
        android:layout_width="match_parent"
--- a/app/src/main/res/menu/fragment_notifications.xml
+++ b/app/src/main/res/menu/fragment_notifications.xml
@ -27,4 +27,14 @@
        android:id="@+id/load_newest"
        android:title="@string/load_newest_notifications"
        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_edit_notification_filter"
+        android:title="@string/notifications_apply_filter"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_clear_notifications"
+        android:title="@string/notifications_clear"
+        app:showAsAction="never" />
 </menu>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -450,7 +450,6 @@
    <string name="report_remote_instance">أعد تحويله إلى %s</string>
    <string name="failed_report">فشل الابلاغ</string>
    <string name="failed_fetch_posts">فشلت عملية جلب المنشورات</string>
-    <string name="pref_title_show_notifications_filter">اعرض مصفاة الإشعارات</string>
    <string name="filter_dialog_whole_word">الكلمة كاملة</string>
    <string name="description_poll">استطلاع رأي بالخيارات: %1$s, %2$s, %3$s, %4$s; %5$s</string>
    <string name="mute_domain_warning">هل أنت متأكد من أنك تريد حجب كافة %s؟ سوف لن يكون باستطاعتك رؤية أي محتوى قادم من هذا النطاق بعد الآن ، لا في الخيوط الزمنية العامة ولا في إخطاراتك. سيتم إزالة متابِعيك الذين هم على هذا النطاق.</string>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@ -483,7 +483,6 @@
    <string name="hint_additional_info">Дадатковыя каментары</string>
    <string name="title_accounts">Уліковыя запісы</string>
    <string name="failed_search">Пошук не атрымаўся</string>
-    <string name="pref_title_show_notifications_filter">Паказаць фільтр апавяшчэнняў</string>
    <string name="create_poll_title">Апытанне</string>
    <string name="duration_1_day">1 дзень</string>
    <string name="duration_3_days">3 дні</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -9,7 +9,6 @@
    <string name="label_duration">Продължителност</string>
    <string name="create_poll_title">Анкета</string>
    <string name="pref_title_enable_swipe_for_tabs">Активиране на плъзгащия жест за превключване между раздели</string>
-    <string name="pref_title_show_notifications_filter">Показване на филтър за известия</string>
    <string name="failed_search">Търсенето бе неуспешно</string>
    <string name="title_accounts">Акаунти</string>
    <string name="report_description_remote_instance">Акаунтът е от друг сървър. Да изпратите ли и там анонимно копие на доклада\?</string>
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@ -362,7 +362,6 @@
    <string name="title_accounts">অ্যাকাউন্টগুলো</string>
    <string name="filter_dialog_whole_word_description">যখন শব্দ বা বাক্যাংশটি শুধুমাত্র আলফানিউমেরিক হয় তখন এটি শুধুমাত্র তখনই প্রয়োগ করা হবে যদি এটি সম্পূর্ণ শব্দটির সাথে মেলে</string>
    <string name="filter_dialog_whole_word">সম্পূর্ণ শব্দ</string>
-    <string name="pref_title_show_notifications_filter">বিজ্ঞপ্তি ফিল্টার দেখান</string>
    <string name="mute_domain_warning_dialog_ok">পুরো ডোমেইন লুকান</string>
    <string name="mute_domain_warning">আপনি কি সব %s ব্লক করতে চান\? আপনি যে ডোমেন থেকে কোনও পাবলিক টাইমলাইনে বা আপনার বিজ্ঞপ্তিগুলিতে সামগ্রী দেখতে পাবেন না। আপনার অনুসরণকারীদের সরানো হবে।</string>
    <string name="action_mute_domain">নিঃশব্দ %s</string>
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@ -389,7 +389,6 @@
    <string name="mute_domain_warning_dialog_ok">পুরো ডোমেইন লুকান</string>
    <string name="filter_dialog_whole_word">সম্পূর্ণ শব্দ</string>
    <string name="filter_dialog_whole_word_description">যখন শব্দ বা বাক্যাংশটি শুধুমাত্র আলফানিউমেরিক হয় তখন এটি শুধুমাত্র তখনই প্রয়োগ করা হবে যদি এটি সম্পূর্ণ শব্দটির সাথে মেলে</string>
-    <string name="pref_title_show_notifications_filter">বিজ্ঞপ্তি ফিল্টার দেখান</string>
    <string name="pref_title_alway_open_spoiler">সর্বদা সামগ্রী সতর্কতা সহ চিহ্নিত টুটগুলি প্রসারিত করুন</string>
    <string name="title_accounts">অক্কোউন্টগুলি</string>
    <string name="failed_search">অনুসন্ধান করতে ব্যর্থ</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -397,7 +397,6 @@
    <string name="failed_fetch_posts">Error obtenint els estats</string>
    <string name="report_description_1">L\'informe s\'enviarà al moderador del teu servidor. Pots afegir una explicació del motiu d\'aquest informe del compte a sota:</string>
    <string name="title_accounts">Comptes</string>
-    <string name="pref_title_show_notifications_filter">Mostrar el filtre de les notificacions</string>
    <string name="mute_domain_warning">Estàs segur que vols bloquejar tot de %s\? No veuràs cap contingut de domini ni en els fils públics ni a les teves notificacions. Els teus seguidors d\'aquest domini seran eliminats.</string>
    <string name="filter_dialog_whole_word_description">Quan la paraula o la frase siguin només alfanumèrica , només s\'aplicarà si coincideix amb tota la paraula</string>
    <string name="report_sent_success">\@%s reportat satisfactoriament</string>
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@ -261,7 +261,6 @@
    <string name="create_poll_title">ڕاپرسی</string>
    <string name="pref_title_enable_swipe_for_tabs">چالاککردنی ئاماژەکردنی لێدانی چالاک بۆ گۆڕین لە نێوان خشتەبەندەکان</string>
    <string name="license_description">تاسکی کۆد و سەرمایەکانی تێدایە لەم پڕۆژە کراوەی سەرچاوە:</string>
-    <string name="pref_title_show_notifications_filter">فلتەری ئاگانامەکان نیشان بدە</string>
    <string name="failed_search">گەڕانەکە سەرکەوتوو نەبوو</string>
    <string name="title_accounts">ئەژمێرەکان</string>
    <string name="report_description_remote_instance">هەژمارەلە ڕاژەیەکی دیکەیە ترە. کۆپیەکی بێ سەروبەر بنێرە بۆ ڕاپۆرتەکە لەوێ؟</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -423,7 +423,6 @@
    <string name="failed_fetch_posts">Stahování příspěvků selhalo</string>
    <string name="report_description_1">Nahlášení bude zasláno moderátorovi vašeho serveru. Níže můžete uvést, proč tento účet nahlašujete:</string>
    <string name="report_description_remote_instance">Tento účet je z jiného serveru. Chcete na něj také poslat anonymizovanou kopii nahlášení\?</string>
-    <string name="pref_title_show_notifications_filter">Zobrazit filtr oznámení</string>
    <string name="create_poll_title">Anketa</string>
    <string name="duration_5_min">5 minut</string>
    <string name="duration_30_min">30 minut</string>
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@ -307,7 +307,6 @@
    <string name="notification_clear_text">Ydych chi\'n siŵr eich bod chi am glirio\'ch holl hysbysiadau\'n barhaol\?</string>
    <string name="error_multimedia_size_limit">Ni all ffeiliau fideo a sain fod yn fwy na %s MB.</string>
    <string name="url_domain_notifier">%s (🔗 %s)</string>
-    <string name="pref_title_show_notifications_filter">Dangos yr hidlydd hysbysiadau</string>
    <string name="error_following_hashtag_format">Gwall wrth ddilyn #%s</string>
    <string name="error_unfollowing_hashtag_format">Gwall wrth ddad-ddilyn #%s</string>
    <string name="action_unmute_domain">Dad-dewi %s</string>
@ -732,4 +731,4 @@
    <string name="about_copied">Copïwyd fersiwn a gwybodaeth dyfais</string>
    <string name="list_exclusive_label">Cuddio o\'r ffrwd cartref</string>
    <string name="error_media_playback">Methodd chwarae: %s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -395,7 +395,6 @@
    <string name="failed_report">Melden fehlgeschlagen</string>
    <string name="report_description_1">Die Meldung wird an die Moderator*innen deines Servers geschickt. Du kannst hier eine Erklärung angeben, warum du dieses Konto meldest:</string>
    <string name="report_description_remote_instance">Dieses Konto ist von einem anderen Server. Soll eine anonymisierte Kopie der Meldung auch dorthin geschickt werden\?</string>
-    <string name="pref_title_show_notifications_filter">Benachrichtigungsfilter anzeigen</string>
    <string name="create_poll_title">Umfrage</string>
    <string name="duration_5_min">5 Minuten</string>
    <string name="duration_30_min">30 Minuten</string>
@ -683,4 +682,4 @@
    <string name="about_copy">Version und Geräteinformationen kopieren</string>
    <string name="list_exclusive_label">Nicht in der Startseite anzeigen</string>
    <string name="error_media_upload_sending_fmt">Das Hochladen ist fehlgeschlagen: %s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@ -403,7 +403,6 @@
    <string name="failed_fetch_posts">Venigo de statusoj malsukcesis</string>
    <string name="report_description_1">La signalo estos sendita al la kontrolantoj de via servilo. Vi povas doni klarigon pri kial vi signalas ĉi tiun konton sube:</string>
    <string name="report_description_remote_instance">La konto estas en alia servilo. Ĉu sendi sennomigitan kopion de la signalo ankaŭ tien\?</string>
-    <string name="pref_title_show_notifications_filter">Montri filtrilon de sciigoj</string>
    <string name="filter_dialog_whole_word">Tuta vorto</string>
    <string name="filter_dialog_whole_word_description">Ŝlosilvorto aŭ frazo litercifera aplikiĝos, nur se ĝi kongruas kun la tuta vorto</string>
    <string name="title_accounts">Kontoj</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -431,7 +431,6 @@
    <string name="failed_fetch_posts">Fallo al obtener estados</string>
    <string name="report_description_1">El reporte será enviado a un moderador de tu servidor. Puedes añadir una explicación de por qué estás reportando esta cuenta a continuación:</string>
    <string name="report_description_remote_instance">La cuenta es de otro servidor. ¿Enviar una copia anónima del reporte\?</string>
-    <string name="pref_title_show_notifications_filter">Mostrar filtro de notificaciones</string>
    <string name="pref_title_alway_open_spoiler">Mostrar siempre publicaciones marcadas con avisos de contenido</string>
    <string name="title_accounts">Cuentas</string>
    <string name="failed_search">Error al buscar</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -417,7 +417,6 @@
    <string name="report_description_remote_instance">Kontua beste zerbitzari batekoa da. Bidali txostenaren kopia anonimatua hara ere\?</string>
    <string name="title_accounts">Kontuak</string>
    <string name="failed_search">Bilaketa huts egin du</string>
-    <string name="pref_title_show_notifications_filter">Erakutsi jakinarazpenen iragazkia</string>
    <string name="create_poll_title">Inkesta</string>
    <string name="duration_5_min">5 minutu</string>
    <string name="duration_30_min">30 minutu</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -398,7 +398,6 @@
    <string name="failed_fetch_posts">شکست در واکشی فرسته‌ها</string>
    <string name="title_accounts">حساب‌ها</string>
    <string name="failed_search">شکست در جست‌وجو</string>
-    <string name="pref_title_show_notifications_filter">نمایش پالایهٔ آگاهی‌ها</string>
    <string name="create_poll_title">نظرسنجی</string>
    <string name="duration_5_min">۵ دقیقه</string>
    <string name="duration_30_min">۳۰ دقیقه</string>
@ -684,4 +683,4 @@
    <string name="about_copied">اطّلاعات افزاره و نگارش رونوشت شد</string>
    <string name="list_exclusive_label">نهفتن از خط زمانی خانگی</string>
    <string name="error_media_playback">پخش شکست خورد: %s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -422,7 +422,6 @@
    <string name="mute_domain_warning">Êtes-vous sûr⋅e de vouloir bloquer %s en entier \? Vous ne verrez plus de contenu provenant de ce domaine, ni dans les fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.</string>
    <string name="button_done">Terminé</string>
    <string name="report_description_remote_instance">Le compte provient d’un autre serveur. Envoyez également une copie anonyme du rapport \?</string>
-    <string name="pref_title_show_notifications_filter">Montrer le filtre des notifications</string>
    <string name="filter_dialog_whole_word">Mot entier</string>
    <string name="filter_dialog_whole_word_description">Un mot-clé ou une phrase alphanumérique sera appliqué·e seulement s’il ou elle correspond au mot entier</string>
    <string name="title_accounts">Comptes</string>
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@ -439,7 +439,6 @@
    <string name="report_description_remote_instance">Is ó fhreastalaí eile an cuntas. Seol cóip gan ainm den tuarascáil ansin freisin\?</string>
    <string name="title_accounts">Cuntais</string>
    <string name="failed_search">Theip ar chuardach</string>
-    <string name="pref_title_show_notifications_filter">Taispeáin scagaire Fógraí</string>
    <string name="pref_title_enable_swipe_for_tabs">Cumasaigh gotha swipe aistriú idir cluaisíní</string>
    <string name="create_poll_title">Vótaíocht</string>
    <string name="duration_5_min">5 nóiméid</string>
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@ -109,7 +109,6 @@
    <string name="add_poll_choice">Cuir roghainn ris</string>
    <string name="create_poll_title">Cunntas-bheachd</string>
    <string name="pref_title_enable_swipe_for_tabs">Cuir an comas gluasad grad-shlaighdidh airson leum a ghearradh o thaba gu taba</string>
-    <string name="pref_title_show_notifications_filter">Seall criathrag nam brathan</string>
    <string name="failed_search">Dh’fhàillig leis an lorg</string>
    <string name="title_accounts">Cunntasan</string>
    <string name="report_description_remote_instance">Chaidh an cunntas a chlàradh air frithealaiche eile. A bheil thu airson lethbhreac dhen ghearan a chur dha-san gun ainm cuideachd\?</string>
@ -700,4 +699,4 @@
    <string name="about_copied">Chaidh lethbhreac de thionndadh is fiosrachadh an uidheim a dhèanamh</string>
    <string name="list_exclusive_label">Falaich o loidhne-ama na dachaigh</string>
    <string name="error_media_upload_sending_fmt">Dh’fhàillig leis an luchdadh suas: %s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -128,7 +128,6 @@
    <string name="label_duration">Duración</string>
    <string name="create_poll_title">Enquisa</string>
    <string name="pref_title_enable_swipe_for_tabs">Activar xestos de desprazamento para moverse entre lapelas</string>
-    <string name="pref_title_show_notifications_filter">Mostrar filtro das notificacións</string>
    <string name="failed_search">Fallou a busca</string>
    <string name="title_accounts">Contas</string>
    <string name="report_description_remote_instance">A conta pertence a outro servidor. Queres enviar unha copia anónima da denuncia alí tamén\?</string>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -256,7 +256,6 @@
    <string name="no_drafts">आपके पास कोई ड्राफ्ट नहीं है।</string>
    <string name="post_lookup_error_format">%s पोस्ट खोजने में त्रुटि</string>
    <string name="pref_title_enable_swipe_for_tabs">टैब के बीच स्विच करने के लिए स्वाइप जेस्चर को सक्षम करें</string>
-    <string name="pref_title_show_notifications_filter">सूचना फ़िल्टर दिखाएं</string>
    <string name="failed_search">खोज करने में विफल</string>
    <string name="report_description_remote_instance">खाता किसी अन्य सर्वर से है। रिपोर्ट की अनाम प्रति वहां भी भेजें\?</string>
    <string name="report_description_1">रिपोर्ट आपके सर्वर मॉडरेटर को भेजी जाएगी। आप इस बारे में स्पष्टीकरण दे सकते हैं कि आप इस खाते को रिपोर्ट क्यों कर रहे हैं:</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -412,7 +412,6 @@
    <string name="failed_fetch_posts">Sikertelen a bejegyzések letöltése</string>
    <string name="report_description_1">A bejelentést a szervered moderátorának küldjük el. Alább megadhatsz egy magyarázatot arra, hogy miért jelented be ezt a fiókot:</string>
    <string name="report_description_remote_instance">A fiók egy másik szerverről származik. Küldjünk oda is egy anonimizált másolatot a bejelentésről\?</string>
-    <string name="pref_title_show_notifications_filter">Értesítések szűrőjének mutatása</string>
    <string name="pref_title_alway_open_spoiler">Tartalomfigyelmeztetéssel ellátott bejegyzések kinyitása mindig</string>
    <string name="title_accounts">Fiókok</string>
    <string name="failed_search">Sikertelen keresés</string>
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@ -396,7 +396,6 @@
    <string name="report_description_remote_instance">Notandaaðgangurinn er af öðrum vefþjóni. Á einnig að senda nafnlaust afrit af kærunni þangað\?</string>
    <string name="title_accounts">Notandaaðgangar</string>
    <string name="failed_search">Tókst ekki að leita</string>
-    <string name="pref_title_show_notifications_filter">Birta tilkynningasíu</string>
    <string name="create_poll_title">Athuga</string>
    <string name="duration_5_min">5 mínútur</string>
    <string name="duration_30_min">30 mínútur</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -439,7 +439,6 @@
    <string name="report_description_remote_instance">L\'utente è su un altro server. Mandare una copia della segnalazione anche lì\?</string>
    <string name="title_accounts">Utenti</string>
    <string name="failed_search">Errore durante la ricerca</string>
-    <string name="pref_title_show_notifications_filter">Mostra il filtro delle notifiche</string>
    <string name="create_poll_title">Sondaggio</string>
    <string name="duration_5_min">5 minuti</string>
    <string name="duration_30_min">30 minuti</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -389,7 +389,6 @@
    <string name="poll_info_closed">投票終了</string>
    <string name="title_accounts">アカウント</string>
    <string name="failed_search">検索に失敗しました</string>
-    <string name="pref_title_show_notifications_filter">通知フィルターを表示</string>
    <string name="action_reset_schedule">リセット</string>
    <string name="title_bookmarks">ブックマーク</string>
    <string name="action_bookmark">ブックマーク</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -402,7 +402,6 @@
    <string name="failed_fetch_posts">게시물을 불러오지 못했습니다</string>
    <string name="report_description_1">인스턴스 관리자에게 신고합니다. 이 계정을 신고하려는 이유를 작성하실 수 있습니다:</string>
    <string name="report_description_remote_instance">이 유저는 다른 인스턴스에 속해 있습니다. 그 인스턴스에도 익명으로 신고 내용을 보내시겠습니까\?</string>
-    <string name="pref_title_show_notifications_filter">알림 필터 보이기</string>
    <string name="action_open_as">%s(으)로 열기</string>
    <string name="title_accounts">계정</string>
    <string name="failed_search">검색하지 못했습니다</string>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@ -425,7 +425,6 @@
    <string name="pref_title_show_self_username">Rādīt lietotājvārdu rīkjoslās</string>
    <string name="pref_title_confirm_reblogs">Pirms pastiprināšanas rādīt apstiprināšanas dialogu</string>
    <string name="failed_search">Meklēšana neizdevās</string>
-    <string name="pref_title_show_notifications_filter">Rādīt paziņojumu filtru</string>
    <string name="pref_title_enable_swipe_for_tabs">Iespējot vilkšanas žestu, lai pārslēgtos starp cilnēm</string>
    <string name="pref_title_hide_top_toolbar">Paslēpt augšējās rīkjoslas virsrakstu</string>
    <string name="pref_title_notification_filter_reports">iesniegts jauns ziņojums</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -404,7 +404,6 @@
    <string name="confirmation_domain_unmuted">%s er ikke lenger skjult</string>
    <string name="mute_domain_warning">Er du sikker på at du vil blokkere alt fra %s\? Du kommer ikke til å se innhold fra domenet i noen offentlige tidslinjer, eller i varslene dine. Kontoer som følger deg fra dette domenet vil bli fjernet.</string>
    <string name="mute_domain_warning_dialog_ok">Skjul hele domenet</string>
-    <string name="pref_title_show_notifications_filter">Vis varselfilter</string>
    <string name="filter_dialog_whole_word">Helt ord</string>
    <string name="filter_dialog_whole_word_description">Når nøkkelordet eller frasen kun inneholder bokstaver og tall, vil det bare brukes dersom det stemmer overens med hele ordet</string>
    <string name="title_accounts">Kontoer</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -411,7 +411,6 @@
    <string name="failed_fetch_posts">Het ophalen van berichten is mislukt</string>
    <string name="report_description_1">Deze rapportage wordt naar jouw servermoderator(en) gestuurd. Je kunt hieronder een uitleg geven over waarom je het account wilt rapporteren:</string>
    <string name="report_description_remote_instance">Het account is van een andere server. Wil je ook een geanonimiseerde kopie van de rapportage daarnaartoe sturen\?</string>
-    <string name="pref_title_show_notifications_filter">Meldingenfilter tonen</string>
    <string name="filter_dialog_whole_word">Heel woord</string>
    <string name="filter_dialog_whole_word_description">Wanneer het trefwoord of zinsdeel alfanumeriek is, wordt het alleen gefilterd wanneer het hele woord overeenkomt</string>
    <string name="duration_5_min">5 minuten</string>
@ -664,4 +663,4 @@
    <string name="about_copied">Versie en apparaatinformatie gekopieerd</string>
    <string name="error_media_upload_sending_fmt">De upload is mislukt: %s</string>
    <string name="socket_timeout_exception">Contact zoeken met je server duurde te lang</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@ -411,7 +411,6 @@
    <string name="confirmation_domain_unmuted">%s es pas mai rescondut</string>
    <string name="mute_domain_warning">Volètz vertadièrament blocar complètament %s \? Veiretz pas mai de contengut venent d’aqueste domeni, nimai los flux d’actualitat o las notificacion. Vòstres seguidors d’aqueste domeni seràn tirats.</string>
    <string name="mute_domain_warning_dialog_ok">Rescondre tot lo domeni</string>
-    <string name="pref_title_show_notifications_filter">Mostrar lo filtre de las notificacions</string>
    <string name="filter_dialog_whole_word">Mot complèt</string>
    <string name="filter_dialog_whole_word_description">Quand un mot clau o una frasa es solament alfanumeric, serà pas qu’aplicat se correspond al mot complèt</string>
    <string name="pref_title_alway_open_spoiler">Totjorn desplegar las publicacions marcadas amb un avertiment de contengut</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -440,7 +440,6 @@
    <string name="report_description_remote_instance">To konto jest na innym serwerze. Czy przesłać anonimizowaną kopię zgłoszenia na ten serwer\?</string>
    <string name="title_accounts">Konta</string>
    <string name="failed_search">Wyszukiwanie nie powidło się</string>
-    <string name="pref_title_show_notifications_filter">Pokaż filtr powiadomień</string>
    <string name="create_poll_title">Głosowanie</string>
    <string name="duration_5_min">5 minut</string>
    <string name="duration_30_min">30 minut</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -422,7 +422,6 @@
    <string name="confirmation_domain_unmuted">%s desbloqueada</string>
    <string name="mute_domain_warning">Tem certeza de que deseja bloquear tudo de %s\? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.</string>
    <string name="mute_domain_warning_dialog_ok">Bloquear instância</string>
-    <string name="pref_title_show_notifications_filter">Mostrar filtro de notificações</string>
    <string name="filter_dialog_whole_word">Toda palavra</string>
    <string name="filter_dialog_whole_word_description">Se for apenas alfanumérico, só se aplicará se combinar com a palavra inteira</string>
    <string name="action_add_poll">Adicionar enquete</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -467,7 +467,6 @@
    <string name="report_description_remote_instance">A conta está noutra instância. Quer enviar uma cópia anónima da denúncia para lá\?</string>
    <string name="title_accounts">Contas</string>
    <string name="failed_search">Erro ao pesquisar</string>
-    <string name="pref_title_show_notifications_filter">Mostrar Filtro das Notificações</string>
    <string name="pref_title_enable_swipe_for_tabs">Ativar gesto de deslizar para alternar entre separadores</string>
    <string name="create_poll_title">Votação</string>
    <string name="label_duration">Duração</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -433,7 +433,6 @@
    <string name="failed_fetch_posts">Не удалось получить статусы</string>
    <string name="report_description_1">Жалоба будет отправлена модератору вашего узла. Ниже вы можете добавить пояснение о причинах жалобы:</string>
    <string name="report_description_remote_instance">Этот аккаунт расположен на другом узле. Отправить анонимную копию жалобы туда\?</string>
-    <string name="pref_title_show_notifications_filter">Показать фильтр уведомлений</string>
    <string name="action_add_poll">Создать опрос</string>
    <string name="pref_title_alway_open_spoiler">Всегда разворачивать посты с предупреждением о содержимом</string>
    <string name="title_accounts">Аккаунты</string>
--- a/app/src/main/res/values-sa/strings.xml
+++ b/app/src/main/res/values-sa/strings.xml
@ -378,7 +378,6 @@
    <string name="duration_5_min">५ निमेषाः</string>
    <string name="create_poll_title">मतपेटिका</string>
    <string name="pref_title_enable_swipe_for_tabs">सारणहावभावस्य संयुतनं पीठिकापरिवर्तनार्थं कार्यम्</string>
-    <string name="pref_title_show_notifications_filter">सूचनाशोधकं दृश्यताम्</string>
    <string name="failed_search">अन्वेषणे विफलता जाता</string>
    <string name="title_accounts">व्यक्तित्वविवरणलेखाः</string>
    <string name="report_description_remote_instance">अन्यजालवितारकादियं व्यक्तित्वविवरणलेखा । आवेदनस्य रक्षितप्रतिलिपिरपि प्रेष्यतां वा \?</string>
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@ -48,7 +48,6 @@
    <string name="hint_display_name">දර්ශන නාමය</string>
    <string name="post_text_size_medium">මධ්‍යම</string>
    <string name="post_media_audio">ශ්‍රව්‍ය</string>
-    <string name="pref_title_show_notifications_filter">දැනුම්දීම් පෙරහන පෙන්වන්න</string>
    <string name="abbreviated_days_ago">දව. %d</string>
    <string name="action_logout">නික්මෙන්න</string>
    <string name="filter_edit_title">පෙරහන සංස්කරණය</string>
@ -268,4 +267,4 @@
    <string name="pref_title_browser_settings">අතිරික්සුව</string>
    <string name="abbreviated_seconds_ago">තත්. %d</string>
    <string name="url_domain_notifier">%s (🔗 %s)</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -407,7 +407,6 @@
    <string name="confirmation_domain_unmuted">Domena %s odrita</string>
    <string name="mute_domain_warning">Ali ste prepričani, da želite blokirati vse iz domene %s\? Vsebine iz te domene ne boste videli v nobeni javni časovnici ali v obvestilih. Vaši sledilci iz te domene bodo odstranjeni.</string>
    <string name="mute_domain_warning_dialog_ok">Skrij celotno domeno</string>
-    <string name="pref_title_show_notifications_filter">Pokaži filtre obvestil</string>
    <string name="filter_dialog_whole_word">Cela beseda</string>
    <string name="filter_dialog_whole_word_description">Če je ključna beseda ali fraza samo alfanumerična, bo uporabljena le, če se ujema s celotno besedo</string>
    <string name="title_accounts">Računi</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -418,7 +418,6 @@
    <string name="failed_fetch_posts">Misslyckades att hämta status</string>
    <string name="report_description_1">Anmälan kommer att skickas till din servermoderator. Du kan beskriva varför du anmäler kontot nedan:</string>
    <string name="report_description_remote_instance">Kontot är från en annan server. Skicka en anonym kopia av anmälan dit också\?</string>
-    <string name="pref_title_show_notifications_filter">Visa notifikationsfilter</string>
    <string name="filter_dialog_whole_word">Helt ord</string>
    <string name="filter_dialog_whole_word_description">När nyckelordet eller frasen enbart är alfanumerisk, appliceras den om den matchar hela ordet</string>
    <string name="pref_title_alway_open_spoiler">Expandera alltid inlägg med innehållsvarningar</string>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@ -10,7 +10,6 @@
    <string name="duration_5_min">5 นาที</string>
    <string name="create_poll_title">โพล</string>
    <string name="pref_title_enable_swipe_for_tabs">เปิดใช้งานการเลื่อนนิ้วเพื่อสลับระหว่างแท็บ</string>
-    <string name="pref_title_show_notifications_filter">แสดงตัวกรองการแจ้งเตือน</string>
    <string name="failed_search">ค้นหาล้มเหลว</string>
    <string name="title_accounts">บัญชี</string>
    <string name="report_description_remote_instance">บัญชีนี้มาจากเซิร์ฟเวอร์อื่น ส่งสำเนารายงานที่ไม่ระบุชื่อไปที่นั่นด้วยหรือไม่\?</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -395,7 +395,6 @@
    <string name="failed_fetch_posts">Yayınlar getirilemedi</string>
    <string name="report_description_1">Bildirim sunucu yöneticinize gönderilecektir. Bu hesabı neden bildirdiğinizle ilgili açıklama yapabilirsiniz:</string>
    <string name="report_description_remote_instance">Hesap başka bir sunucudan. Raporun anonim bir kopyasını da oraya gönderilsin mi\?</string>
-    <string name="pref_title_show_notifications_filter">Bildirim süzgecini göster</string>
    <string name="action_mentions">Bahsedenler</string>
    <string name="action_open_reblogger">Gönderi yazanını aç</string>
    <string name="action_open_reblogged_by">Yeniden paylaşımları göster</string>
@ -684,4 +683,4 @@
    <string name="about_copied">Kopyalanan sürüm ve cihaz bilgileri</string>
    <string name="list_exclusive_label">Anasayfa ağ akışından gizle</string>
    <string name="error_media_playback">Oynatma başarısız oldu: %s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -473,7 +473,6 @@
    <string name="no_drafts">У вас немає чернеток.</string>
    <string name="post_lookup_error_format">Помилка пошуку допису %s</string>
    <string name="pref_title_enable_swipe_for_tabs">Увімкнути перемикання між вкладками жестом проведення пальцем</string>
-    <string name="pref_title_show_notifications_filter">Показати фільтр сповіщень</string>
    <string name="failed_search">Не вдалося здійснити пошук</string>
    <string name="report_description_remote_instance">Обліковий запис з іншого сервера. Надіслати анонімізовану копію звіту й туди\?</string>
    <string name="report_description_1">Скаргу буде надіслано вашому модератору сервера. Ви можете надати пояснення, чому ви повідомляєте про цей обліковий запис знизу:</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -324,7 +324,6 @@
    <string name="duration_5_min">5 phút</string>
    <string name="create_poll_title">Bình chọn</string>
    <string name="pref_title_enable_swipe_for_tabs">Vuốt qua lại giữa các tab</string>
-    <string name="pref_title_show_notifications_filter">Hiện bộ lọc thông báo</string>
    <string name="failed_search">Không thể tìm thấy</string>
    <string name="title_accounts">Người</string>
    <string name="report_description_remote_instance">Người này thuộc máy chủ khác. Gửi luôn cho máy chủ đó\?</string>
@ -666,4 +665,4 @@
    <string name="about_device_info_title">Thiết bị của bạn</string>
    <string name="list_exclusive_label">Ẩn khỏi bảng tin</string>
    <string name="error_media_playback">Không thể phát: %s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -421,7 +421,6 @@
    <string name="report_description_remote_instance">该账户来自其他服务器。向那里发送一份匿名的报告副本？</string>
    <string name="title_accounts">账户</string>
    <string name="failed_search">搜索失败</string>
-    <string name="pref_title_show_notifications_filter">显示通知过滤器</string>
    <string name="create_poll_title">投票</string>
    <string name="duration_5_min">5 分钟</string>
    <string name="duration_30_min">30 分钟</string>
@ -680,4 +679,4 @@
    <string name="about_copy">复制版本及设备信息</string>
    <string name="list_exclusive_label">不出现在首页时间线中</string>
    <string name="error_media_playback">播放失败了：%s</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -471,7 +471,6 @@
    <string name="label_duration">期間</string>
    <string name="create_poll_title">投票</string>
    <string name="pref_title_enable_swipe_for_tabs">啟用在分頁間切換的滑動手勢</string>
-    <string name="pref_title_show_notifications_filter">顯示通知過濾器</string>
    <string name="failed_search">搜尋失敗</string>
    <string name="title_accounts">帳號</string>
    <string name="failed_fetch_posts">擷取狀態失敗</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -426,7 +426,6 @@
    <string name="failed_fetch_posts">無法獲取狀態</string>
    <string name="report_description_1">該報告將發送給您的伺服器管理員。 您可以在下面提供有關回報此帳戶的原因的說明：</string>
    <string name="report_description_remote_instance">該帳戶來自其他伺服器。向那裡發送一份匿名的報告副本？</string>
-    <string name="pref_title_show_notifications_filter">顯示通知過濾器</string>
    <string name="hashtags">話題</string>
    <string name="notification_follow_request_name">關注請求</string>
    <string name="edit_poll">編輯</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -610,8 +610,8 @@
    <string name="error_list_load">Error loading lists</string>
    <string name="list_exclusive_label">Hide from the home timeline</string>
    <string name="list">List</string>
-    <string name="notifications_clear">Clear</string>
-    <string name="notifications_apply_filter">Filter</string>
+    <string name="notifications_clear">Delete notifications</string>
+    <string name="notifications_apply_filter">Filter notifications</string>
    <string name="filter_apply">Apply</string>

    <string name="compose_shortcut_long_label">Compose post</string>
@ -670,7 +670,6 @@
    <string name="title_accounts">Accounts</string>
    <string name="failed_search">Failed to search</string>

-    <string name="pref_title_show_notifications_filter">Show Notifications filter</string>
    <string name="pref_title_enable_swipe_for_tabs">Enable swipe gesture to switch between tabs</string>
    <string name="pref_title_show_stat_inline">Show post statistics in timeline</string>

--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -179,9 +179,4 @@
        <item name="materialDrawerMaskDrawable">@drawable/materialdrawer_shape_small</item>
        <item name="materialDrawerDrawCircularShadow">false</item>
    </style>
-
-    <style name="ShapeAppearance.Avatar" parent="ShapeAppearance.MaterialComponents">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">12.5%</item>
-    </style>
 </resources>
--- a/app/src/test/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModelTestBase.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModelTestBase.kt
@ -99,7 +99,6 @@ abstract class NotificationsViewModelTestBase {
            PrefKeys.CONFIRM_REBLOGS to true,
            PrefKeys.CONFIRM_FAVOURITES to false,
            PrefKeys.WELLBEING_HIDE_STATS_POSTS to false,
-            PrefKeys.SHOW_NOTIFICATIONS_FILTER to true,
            PrefKeys.FAB_HIDE to false
        )

--- a/app/src/test/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModelTestUiState.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModelTestUiState.kt
@ -35,7 +35,6 @@ class NotificationsViewModelTestUiState : NotificationsViewModelTestBase() {

    private val initialUiState = UiState(
        activeFilter = setOf(Notification.Type.FOLLOW),
-        showFilterOptions = true,
        showFabWhileScrolling = true
    )

@ -64,23 +63,4 @@ class NotificationsViewModelTestUiState : NotificationsViewModelTestBase() {
            assertThat(expectMostRecentItem().showFabWhileScrolling).isFalse()
        }
    }
-
-    @Test
-    fun `showFilterOptions depends on SHOW_NOTIFICATIONS_FILTER preference`() = runTest {
-        // Prior
-        viewModel.uiState.test {
-            assertThat(expectMostRecentItem().showFilterOptions).isTrue()
-        }
-
-        // Given
-        sharedPreferencesMap[PrefKeys.SHOW_NOTIFICATIONS_FILTER] = false
-
-        // When
-        eventHub.dispatch(PreferenceChangedEvent(PrefKeys.SHOW_NOTIFICATIONS_FILTER))
-
-        // Then
-        viewModel.uiState.test {
-            assertThat(expectMostRecentItem().showFilterOptions).isFalse()
-        }
-    }
 }