Cleaning tags duplications.

Retry to fix post login issues.
Merge pull request 'filters' (#107 ) from filters into master
2022-12-08 14:02:30 +01:00 · 2022-12-08 13:09:02 +01:00 · 2022-12-07 19:13:46 +00:00 · 2022-12-07 12:11:58 +01:00 · 2022-12-06 22:36:15 +01:00 · 2022-12-06 22:18:38 +01:00
49 changed files with 581 additions and 849 deletions
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -148,9 +148,6 @@ dependencies {
    kapt("com.github.bumptech.glide:compiler:4.11.0")
    implementation("com.github.bumptech.glide:okhttp3-integration:4.1.1")

-    // Drawer
-    implementation("com.mikepenz:materialdrawer:8.4.5")
-
    // Themes
    implementation("com.github.rubensousa:floatingtoolbar:1.5.1")

--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -79,8 +79,5 @@
            android:value="true" />

        <meta-data android:name="android.max_aspect" android:value="2.1" />
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
    </application>
 </manifest>
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ACRAUtils.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ACRAUtils.kt
@@ -0,0 +1,9 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import org.acra.ACRA
+import org.acra.ktx.sendSilentlyWithAcra
+
+fun Throwable.sendSilentlyWithAcraWithName(name: String) {
+        ACRA.errorReporter.putCustomData("error_source", name)
+    this.sendSilentlyWithAcra()
+}
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@@ -1,23 +1,17 @@
 package bou.amine.apps.readerforselfossv2.android

 import android.content.Intent
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.ImageView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.*
 import androidx.work.Constraints
@@ -29,6 +23,7 @@ import bou.amine.apps.readerforselfossv2.android.adapters.ItemListAdapter
 import bou.amine.apps.readerforselfossv2.android.adapters.ItemsAdapter
 import bou.amine.apps.readerforselfossv2.android.background.LoadingWorker
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityHomeBinding
+import bou.amine.apps.readerforselfossv2.android.fragments.FilterSheetFragment
 import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
@@ -36,32 +31,13 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.ItemType
-import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
-import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.longHash
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
-import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.materialdrawer.holder.BadgeStyle
-import com.mikepenz.materialdrawer.holder.ColorHolder
-import com.mikepenz.materialdrawer.holder.StringHolder
-import com.mikepenz.materialdrawer.model.DividerDrawerItem
-import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
-import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.*
-import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import com.mikepenz.materialdrawer.util.addStickyFooterItem
-import com.mikepenz.materialdrawer.util.updateBadge
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.acra.ACRA
-import org.acra.ktx.sendSilentlyWithAcra
-import org.acra.ktx.sendWithAcra
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
@@ -73,11 +49,6 @@ import java.util.concurrent.TimeUnit

 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {

-    private val DRAWER_ID_TAGS = 100101L
-    private val DRAWER_ID_HIDDEN_TAGS = 101100L
-    private val DRAWER_ID_SOURCES = 100110L
-    private val DRAWER_ID_FILTERS = 100111L
-
    private var items: ArrayList<SelfossModel.Item> = ArrayList()

    private var elementsShown: ItemType = ItemType.UNREAD
@@ -124,14 +95,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        setContentView(view)

        setSupportActionBar(binding.toolBar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setHomeButtonEnabled(true)
-        val mDrawerToggle = ActionBarDrawerToggle(this, binding.drawerContainer, binding.toolBar, R.string.material_drawer_open, R.string.material_drawer_close)
-        binding.drawerContainer.addDrawerListener(mDrawerToggle)
-        mDrawerToggle.syncState()

        handleBottomBar()
-        initDrawer()

        handleSwipeRefreshLayout()

@@ -152,7 +117,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        binding.swipeRefreshLayout.setOnRefreshListener {
            repository.offlineOverride = false
            lastFetchDone = false
-            handleDrawerItems()
            CoroutineScope(Dispatchers.Main).launch {
                getElementsAccordingToTab()
                binding.swipeRefreshLayout.isRefreshing = false
@@ -200,7 +164,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                (it.key to it.value)
                            }
                        }.toMap()
-                        reloadTagsBadges()

                        // Just load everythin
                        if (items.size <= 0) {
@@ -298,8 +261,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    override fun onResume() {
        super.onResume()

-        handleDrawerItems()
-
        reloadLayoutManager()

        if (appSettingsService.isInfiniteLoadingEnabled()) {
@@ -325,7 +286,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    private fun handleGDPRDialog(GDPRShown: Boolean) {
        val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
        messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
-        ACRA.errorReporter.putCustomData("unique_id", String(messageDigest.digest()))
        if (!GDPRShown) {
            val alertDialog = AlertDialog.Builder(this).create()
            alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
@@ -341,249 +301,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        }
    }

-    private fun initDrawer() {
-        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                Glide.with(this@HomeActivity)
-                    .asBitmap()
-                    .load(uri)
-                    .apply(RequestOptions()
-                        .placeholder(R.mipmap.ic_launcher)
-                        .fallback(R.mipmap.ic_launcher)
-                        .fitCenter())
-                    .into(imageView)
-            }
-
-            override fun cancel(imageView: ImageView) {
-                Glide.with(this@HomeActivity).clear(imageView)
-            }
-        })
-
-        val drawerListener = object : DrawerLayout.DrawerListener {
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                // We do nothing
-            }
-
-            override fun onDrawerOpened(drawerView: View) {
-                binding.bottomBar.hide()
-            }
-
-            override fun onDrawerClosed(drawerView: View) {
-                binding.bottomBar.show()
-            }
-
-            override fun onDrawerStateChanged(newState: Int) {
-                // We do nothing
-            }
-
-        }
-
-        binding.drawerContainer.addDrawerListener(drawerListener)
-
-        // Sticky items
-        addStickyPrimaryItem(R.string.drawer_report_bug, R.drawable.ic_bug_report_black_24dp) { _, _, _ ->
-            val browserIntent =
-                Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-            startActivity(browserIntent)
-            false
-        }
-        addStickyPrimaryItem(R.string.title_activity_settings, R.drawable.ic_settings_black_24dp) { _, _, _ ->
-            settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
-            false
-        }
-    }
-
-    private fun addStickyPrimaryItem(name: Int, icon: Int, clickListener: ((v: View?, item: IDrawerItem<*>, position: Int) -> Boolean)?) {
-        binding.mainDrawer.addStickyFooterItem(
-            PrimaryDrawerItem().apply {
-                nameRes = name
-                iconRes = icon
-                isIconTinted = true
-                onDrawerItemClickListener = clickListener
-            })
-    }
-
-    private fun handleDrawerItems() {
-        tagsBadge = emptyMap()
-        binding.mainDrawer.itemAdapter.add(
-            PrimaryDrawerItem().apply {
-                nameRes = R.string.drawer_loading
-                isSelectable = false
-            }
-        )
-
-        CoroutineScope(Dispatchers.IO).launch {
-            val tags = repository.getTags()
-            val sources = repository.getSources()
-            runOnUiThread {
-                handleDrawerData(tags, sources)
-            }
-        }
-    }
-
-    private fun handleDrawerData(tags: List<SelfossModel.Tag>, sources: List<SelfossModel.Source>) {
-        binding.mainDrawer.itemAdapter.clear()
-
-        // Filters title with clear action
-        secondaryItem(withDivider = false, R.string.drawer_item_filters, DRAWER_ID_FILTERS, R.string.drawer_action_clear) { _,_,_ ->
-            repository.sourceFilter = null
-            repository.tagFilter = null
-            binding.mainDrawer.setSelectionAtPosition(-1)
-            getElementsAccordingToTab()
-            fetchOnEmptyList()
-            false
-        }
-
-        // Hidden tags
-        if (tags.isNotEmpty() && appSettingsService.getHiddenTags().isNotEmpty()) {
-            secondaryItem(
-                withDivider = true,
-                R.string.drawer_item_hidden_tags,
-                DRAWER_ID_HIDDEN_TAGS
-            )
-            handleHiddenTags(tags)
-        }
-
-        // Tags
-        secondaryItem(withDivider = true, R.string.drawer_item_tags, DRAWER_ID_TAGS)
-        if (tags.isEmpty()) {
-            binding.mainDrawer.itemAdapter.add(
-                SecondaryDrawerItem()
-                    .apply { nameRes = R.string.drawer_error_loading_tags; isSelectable = false }
-            )
-        } else {
-            handleTags(tags)
-        }
-
-        // Sources
-        secondaryItem(withDivider = true, R.string.drawer_item_sources, DRAWER_ID_SOURCES, R.string.drawer_action_edit) { v, _, _ ->
-            startActivity(Intent(v!!.context, SourcesActivity::class.java))
-            false
-        }
-        if (sources.isEmpty()) {
-            binding.mainDrawer.itemAdapter.add(
-                SecondaryDrawerItem().apply {
-                    nameRes = R.string.drawer_error_loading_sources
-                    isSelectable = false
-                }
-            )
-        } else {
-            handleSources(sources)
-        }
-
-        // About action
-        binding.mainDrawer.itemAdapter.add(
-            DividerDrawerItem(),
-            PrimaryDrawerItem().apply {
-                nameRes = R.string.action_about
-                isSelectable = false
-                iconRes = R.drawable.ic_info_outline_white_24dp
-                isIconTinted = true
-                onDrawerItemClickListener = { _,_,_ ->
-                    LibsBuilder()
-                        .withAboutIconShown(true)
-                        .withAboutVersionShown(true)
-                        .start(this@HomeActivity)
-                    false
-                }
-            }
-        )
-    }
-
-    private fun secondaryItem(withDivider: Boolean, name: Int, id: Long, badgeId: Int? = null, clickListener: ((v: View?, item: IDrawerItem<*>, position: Int) -> Boolean)? = null) {
-        if (withDivider) {
-            binding.mainDrawer.itemAdapter.add(DividerDrawerItem())
-        }
-
-        binding.mainDrawer.itemAdapter.add(
-            SecondaryDrawerItem().apply {
-                nameRes = name
-                identifier = id
-                isSelectable = false
-                if (badgeId != null) {
-                    badgeRes = badgeId
-                }
-                onDrawerItemClickListener = clickListener
-            }
-        )
-    }
-
-    private fun createDrawerItem(it: SelfossModel.Tag) {
-        val gd = GradientDrawable()
-        val gdColor = try {
-            Color.parseColor(it.color)
-        } catch (e: IllegalArgumentException) {
-            e.sendSilentlyWithAcra()
-            resources.getColor(R.color.colorPrimary)
-        }
-        gd.setColor(gdColor)
-        gd.shape = GradientDrawable.RECTANGLE
-        gd.setSize(30, 30)
-        gd.cornerRadius = 30F
-
-        val drawerItem = PrimaryDrawerItem()
-            .apply {
-                nameText = it.tag.getHtmlDecoded()
-                identifier = it.tag.longHash()
-                iconDrawable = gd
-                badgeStyle = BadgeStyle().apply {
-                    textColor = ColorHolder.fromColor(Color.WHITE)
-                    color = ColorHolder.fromColor(resources.getColor(R.color.colorAccent))
-                }
-                onDrawerItemClickListener = { _, _, _ ->
-                    repository.tagFilter = it
-                    repository.sourceFilter = null
-                    getElementsAccordingToTab()
-                    fetchOnEmptyList()
-                    false
-                }
-            }
-        if (it.unread > 0) {
-            drawerItem.badgeText = it.unread.toString()
-        }
-
-        binding.mainDrawer.itemAdapter.add(drawerItem)
-    }
-
-    private fun handleTags(tags: List<SelfossModel.Tag>) {
-        val filteredTags = tags
-            .filterNot { appSettingsService.getHiddenTags().contains(it.tag) }
-            .sortedBy { it.tag }
-        createTagItems(filteredTags)
-    }
-
-    private fun handleHiddenTags(tags: List<SelfossModel.Tag>) {
-        val filteredHiddenTags: List<SelfossModel.Tag> =
-            tags.filter { appSettingsService.getHiddenTags().contains(it.tag) }
-        createTagItems(filteredHiddenTags)
-    }
-
-    private fun createTagItems(tags: List<SelfossModel.Tag>) {
-        tagsBadge = tags.associate {
-            createDrawerItem(it)
-
-            (it.tag.longHash() to it.unread)
-        }
-    }
-
-    private fun handleSources(sources: List<SelfossModel.Source>) {
-        for (source in sources) {
-            val item = PrimaryDrawerItem().apply {
-                nameText = source.title.getHtmlDecoded()
-                identifier = source.id.toLong()
-                iconUrl = source.getIcon(repository.baseUrl)
-                onDrawerItemClickListener = { _,_,_ ->
-                    repository.sourceFilter = source
-                    repository.tagFilter = null
-                    getElementsAccordingToTab()
-                    fetchOnEmptyList()
-                    false
-                }
-            }
-            binding.mainDrawer.itemAdapter.add(item)
-        }
-    }
-
    private fun reloadLayoutManager() {
        val currentManager = binding.recyclerView.layoutManager
        val layoutManager: RecyclerView.LayoutManager
@@ -665,7 +382,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        })
    }

-    private fun fetchOnEmptyList() {
+    fun fetchOnEmptyList() {
        binding.recyclerView.doOnNextLayout {
            // TODO: do if last element (or is empty ?)
            getElementsAccordingToTab(true)
@@ -706,7 +423,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            binding.emptyText.visibility = View.GONE
        }

-    private fun getElementsAccordingToTab(
+    fun getElementsAccordingToTab(
        appendResults: Boolean = false
    ) {
        offset = if (appendResults && items.size > 0) {
@@ -787,13 +504,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        }
    }

-    private fun reloadTagsBadges() {
-        tagsBadge.forEach {
-            binding.mainDrawer.updateBadge(it.key, StringHolder(it.value.toString()))
-        }
-        binding.mainDrawer.resetDrawerContent()
-    }
-
    private fun calculateNoOfColumns(): Int {
        val displayMetrics = resources.displayMetrics
        val dpWidth = displayMetrics.widthPixels / displayMetrics.density
@@ -839,6 +549,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
+            R.id.action_filter -> {
+                val filterSheetFragment = FilterSheetFragment()
+                filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG)
+                return true
+            }
            R.id.refresh -> {
                needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                    Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
@@ -878,8 +593,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                ).show()
                                tabNewBadge.removeBadge()

-                                handleDrawerItems()
-
                                getElementsAccordingToTab()
                            } else {
                                Toast.makeText(
@@ -904,6 +617,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                this@HomeActivity.finish()
                return true
            }
+            R.id.action_settings -> {
+                settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
+                return true
+            }
            else -> return super.onOptionsItemSelected(item)
        }
    }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
@@ -21,8 +21,6 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.github.ln_12.library.ConnectivityStatus
-import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
@@ -67,8 +65,6 @@ class MyApp : MultiDexApplication(), DIAware {
        Napier.base(DebugAntilog())

        if (!ACRA.isACRASenderServiceProcess()) {
-            initDrawerImageLoader()
-
            tryToHandleBug()

            handleNotificationChannels()
@@ -99,8 +95,6 @@ class MyApp : MultiDexApplication(), DIAware {

        initAcra {
            reportFormat = StringFormat.JSON
-            reportSendSuccessToast = "YES"
-            reportSendFailureToast = "NO !"
            reportContent = listOf(
                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
@@ -140,25 +134,6 @@ class MyApp : MultiDexApplication(), DIAware {
        }
    }

-    private fun initDrawerImageLoader() {
-        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                Glide.with(imageView.context)
-                    .load(uri.toString())
-                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
-                    .into(imageView)
-            }
-
-            override fun cancel(imageView: ImageView) {
-                Glide.with(imageView.context).clear(imageView)
-            }
-
-            override fun placeholder(ctx: Context, tag: String?): Drawable {
-                return baseContext.resources.getDrawable(R.mipmap.ic_launcher)
-            }
-        })
-    }
-
    private fun tryToHandleBug() {
        val oldHandler = Thread.getDefaultUncaughtExceptionHandler()

--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
@@ -25,6 +25,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBind
 import bou.amine.apps.readerforselfossv2.android.model.ParecelableItem
 import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
@@ -51,6 +52,7 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 import java.net.MalformedURLException
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.util.*
 import java.util.concurrent.ExecutionException
@@ -109,17 +111,6 @@ class ArticleFragment : Fragment(), DIAware {
            staticBar = appSettingsService.isStaticBarEnabled()
            font = appSettingsService.getFont()

-            if (font.isNotEmpty()) {
-                resId = requireContext().resources.getIdentifier(font, "font", requireContext().packageName)
-                typeface = try {
-                    ResourcesCompat.getFont(requireContext(), resId)!!
-                } catch (e: java.lang.Exception) {
-                    e.sendSilentlyWithAcra()
-                    // Just to be sure
-                    null
-                }
-            }
-
            refreshAlignment()

            fab = binding.fab
@@ -220,7 +211,7 @@ class ArticleFragment : Fragment(), DIAware {
            )

        } catch (e: InflateException) {
-            e.sendSilentlyWithAcra()
+            e.sendSilentlyWithAcraWithName("webview not available")
            AlertDialog.Builder(requireContext())
                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
@@ -254,74 +245,69 @@ class ArticleFragment : Fragment(), DIAware {
            binding.progressBar.visibility = View.VISIBLE

            CoroutineScope(Dispatchers.Main).launch {
-                 val response = mercuryApi.query(url)
-                if (response.success) {
-                    try {
-                        if (response.data != null && response.data!!.content != null && !response.data!!.content.isNullOrEmpty()) {
+                try {
+                    val response = mercuryApi.query(url)
+                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
+                        binding.titleView.text = response.data!!.title.orEmpty()
+                        try {
+                            if (typeface != null) {
+                                binding.titleView.typeface = typeface
+                            }
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
+                        }
+
+                        try {
+                            // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                            URL(response.data!!.url)
+                            url = response.data!!.url
+                        } catch (e: MalformedURLException) {
+                            // Mercury returned a relative url
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
+                        }
+
+                        try {
+                            contentText = response.data!!.content.orEmpty()
+                            htmlToWebview()
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > contenttext or html")
+                        }
+
+                        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
                            try {
-                                binding.titleView.text = response.data!!.title
-                                if (typeface != null) {
-                                    binding.titleView.typeface = typeface
-                                }
+                                binding.imageView.visibility = View.VISIBLE
                                try {
-                                    // Note: Mercury may return relative urls... If it does the url val will not be changed.
-                                    URL(response.data!!.url)
-                                    url = response.data!!.url
-                                } catch (e: MalformedURLException) {
-                                    // Mercury returned a relative url
-                                    e.sendSilentlyWithAcra()
+                                    Glide
+                                        .with(requireContext())
+                                        .asBitmap()
+                                        .load(
+                                            response.data!!.lead_image_url.orEmpty()
+                                        )
+                                        .apply(RequestOptions.fitCenterTransform())
+                                        .into(binding.imageView)
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
                                }
                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
-                            }
-
-                            try {
-                                contentText = response.data!!.content.orEmpty()
-                                htmlToWebview()
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
-                            }
-
-                            try {
-                                if (response.data!!.lead_image_url != null && !response.data!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                    binding.imageView.visibility = View.VISIBLE
-                                    try {
-                                        Glide
-                                            .with(requireContext())
-                                            .asBitmap()
-                                            .load(
-                                                response.data!!.lead_image_url.orEmpty()
-                                            )
-                                            .apply(RequestOptions.fitCenterTransform())
-                                            .into(binding.imageView)
-                                    } catch (e: Exception) {
-                                        e.sendSilentlyWithAcra()
-                                    }
-                                } else {
-                                    binding.imageView.visibility = View.GONE
-                                }
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
-                            }
-
-                            try {
-                                binding.nestedScrollView.scrollTo(0, 0)
-
-                                binding.progressBar.visibility = View.GONE
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
+                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
                            }
                        } else {
-                            try {
-                                openInBrowserAfterFailing()
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
-                            }
+                            binding.imageView.visibility = View.GONE
                        }
-                    } catch (e: Exception) {
-                        e.sendSilentlyWithAcra()
+
+                        try {
+                            binding.nestedScrollView.scrollTo(0, 0)
+                            binding.progressBar.visibility = View.GONE
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
+                        }
+                    } else {
+                        openInBrowserAfterFailing()
                    }
-                } else {
+                } catch (e: SocketTimeoutException) {
+                    openInBrowserAfterFailing()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
                    openInBrowserAfterFailing()
                }
            }
@@ -364,7 +350,7 @@ class ArticleFragment : Fragment(), DIAware {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcra()
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg")
                    }
                }
                else if (url.lowercase(Locale.US).contains(".png")) {
@@ -372,7 +358,7 @@ class ArticleFragment : Fragment(), DIAware {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcra()
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png")
                    }
                }
                else if (url.lowercase(Locale.US).contains(".webp")) {
@@ -380,7 +366,7 @@ class ArticleFragment : Fragment(), DIAware {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
                    } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcra()
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp")
                    }
                }

@@ -405,7 +391,7 @@ class ArticleFragment : Fragment(), DIAware {
            val itemUrl = URL(url)
            baseUrl = itemUrl.protocol + "://" + itemUrl.host
        } catch (e: MalformedURLException) {
-            e.sendSilentlyWithAcra()
+            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
        }

        val fontName =  when (font) {
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
@@ -0,0 +1,195 @@
+package bou.amine.apps.readerforselfossv2.android.fragments
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
+import bou.amine.apps.readerforselfossv2.utils.getIcon
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.chip.Chip
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.android.x.closestDI
+import org.kodein.di.instance
+
+
+class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
+
+    override val di: DI by closestDI()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
+
+    private var selectedChip: Chip? = null
+
+    @SuppressLint("ResourceAsColor")
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val binding =
+            bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding.inflate(
+                inflater,
+                container,
+                false
+            )
+
+        val tagGroup = binding.tagsGroup
+        val hiddenTagGroup = binding.hiddenTagsGroup
+        val sourceGroup = binding.sourcesGroup
+
+        CoroutineScope(Dispatchers.Main).launch {
+            val tags = repository.getTags()
+            val hiddenTags = appSettingsService.getHiddenTags()
+
+            tags.filterNot { hiddenTags.contains(it.tag) }.forEach { tag ->
+                val c = chipForTag(tag)
+                tagGroup.addView(c)
+            }
+
+            if (hiddenTags.isNotEmpty()) {
+                binding.filterHiddenTagsTitle.visibility = VISIBLE
+                binding.hiddenTagsGroup.visibility = VISIBLE
+
+                tags.filter { hiddenTags.contains(it.tag) }.forEach { tag ->
+                    val c = chipForTag(tag)
+
+                    hiddenTagGroup.addView(c)
+                }
+            }
+
+            repository.getSources().forEach { source ->
+                val c = Chip(requireContext())
+
+                Glide.with(requireContext())
+                    .load(source.getIcon(repository.baseUrl))
+                    .listener(object : RequestListener<Drawable?> {
+                        override fun onLoadFailed(
+                            e: GlideException?,
+                            model: Any?,
+                            target: Target<Drawable?>?,
+                            isFirstResource: Boolean
+                        ): Boolean {
+                            return false
+                        }
+
+                        override fun onResourceReady(
+                            resource: Drawable?,
+                            model: Any?,
+                            target: Target<Drawable?>?,
+                            dataSource: DataSource?,
+                            isFirstResource: Boolean
+                        ): Boolean {
+                            c.chipIcon = resource
+                            return false
+                        }
+                    }).preload()
+
+                c.text = source.title.getHtmlDecoded()
+
+                c.setOnCloseIconClickListener {
+                    (it as Chip).isCloseIconVisible = false
+                    selectedChip = null
+                    repository.setSourceFilter(null)
+                }
+
+                c.setOnClickListener {
+                    if (selectedChip != null) {
+                        selectedChip!!.isCloseIconVisible = false
+                    }
+                    (it as Chip).isCloseIconVisible = true
+                    selectedChip = it
+                    repository.setSourceFilter(source)
+
+                    repository.setTagFilter(null)
+                }
+
+
+                if (repository.sourceFilter.value?.equals(source) == true) {
+                    c.isCloseIconVisible = true
+                    selectedChip = c
+                }
+
+                sourceGroup.addView(c)
+            }
+
+            binding.progressBar2.visibility = GONE
+            binding.filterView.visibility = VISIBLE
+        }
+
+        binding.floatingActionButton2.setOnClickListener {
+            (activity as HomeActivity).getElementsAccordingToTab()
+            (activity as HomeActivity).fetchOnEmptyList()
+            dismiss()
+        }
+        return binding.root
+    }
+
+    private fun chipForTag(tag: SelfossModel.Tag): Chip {
+        val c = Chip(requireContext())
+        c.text = tag.tag
+
+        val gd = GradientDrawable()
+        val gdColor = try {
+            Color.parseColor(tag.color)
+        } catch (e: IllegalArgumentException) {
+            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
+            resources.getColor(R.color.colorPrimary)
+        }
+        gd.setColor(gdColor)
+        gd.shape = GradientDrawable.RECTANGLE
+        gd.setSize(30, 30)
+        gd.cornerRadius = 30F
+        c.chipIcon = gd
+
+        c.setOnCloseIconClickListener {
+            (it as Chip).isCloseIconVisible = false
+            selectedChip = null
+            repository.setTagFilter(null)
+        }
+
+        c.setOnClickListener {
+            if (selectedChip != null) {
+                selectedChip!!.isCloseIconVisible = false
+            }
+            (it as Chip).isCloseIconVisible = true
+            selectedChip = it
+            repository.setTagFilter(tag)
+
+            repository.setSourceFilter(null)
+        }
+
+        if (repository.tagFilter.value?.equals(tag) == true) {
+            c.isCloseIconVisible = true
+            selectedChip = c
+        }
+        return c
+    }
+
+    companion object {
+        const val TAG = "ModalBottomSheet"
+    }
+
+
+}
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/AndroidIModelUtils.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/AndroidIModelUtils.kt
@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android.model

 import android.content.Context
 import android.webkit.URLUtil
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
@@ -24,7 +25,7 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
            }
        }
    } catch (e : Error) {
-        e.sendSilentlyWithAcra()
+        e.sendSilentlyWithAcraWithName("preloadImages")
        return false
    }

@@ -37,7 +38,7 @@ fun String.toTextDrawableString(): String {
        try {
            textDrawable.append(s[0])
        } catch (e: StringIndexOutOfBoundsException) {
-            e.sendSilentlyWithAcra()
+            e.sendSilentlyWithAcraWithName("toTextDrawableString")
        }
    }
    return textDrawable.toString()
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
@@ -16,7 +16,9 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import com.mikepenz.aboutlibraries.LibsBuilder
 import org.acra.ktx.sendSilentlyWithAcra
 import org.acra.ktx.sendWithAcra
 import org.kodein.di.DIAware
@@ -108,6 +110,16 @@ class SettingsActivity : AppCompatActivity(),
                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
                true
            }
+
+            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
+                context?.let {
+                    LibsBuilder()
+                        .withAboutIconShown(true)
+                        .withAboutVersionShown(true)
+                        .start(it)
+                }
+                true
+            }
        }
    }

@@ -124,7 +136,7 @@ class SettingsActivity : AppCompatActivity(),
                                val input: Int = (dest.toString() + source.toString()).toInt()
                                if (input in 1..200) return@InputFilter null
                            } catch (nfe: NumberFormatException) {
-                                nfe.sendSilentlyWithAcra()
+                                nfe.sendSilentlyWithAcraWithName("GeneralPreferenceFragment")
                                Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                            }
                            ""
@@ -148,7 +160,7 @@ class SettingsActivity : AppCompatActivity(),
                        try {
                            editText.textSize = editable.toString().toInt().toFloat()
                        } catch (e: NumberFormatException) {
-                            e.sendSilentlyWithAcra()
+                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                        }
                    }
                } }
@@ -158,7 +170,7 @@ class SettingsActivity : AppCompatActivity(),
                                val input = (dest.toString() + source.toString()).toInt()
                                if (input > 0) return@InputFilter null
                            } catch (nfe: NumberFormatException) {
-                                nfe.sendSilentlyWithAcra()
+                                nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                            }
                            ""
                        }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/drawer/CustomBaseViewHolder.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/drawer/CustomBaseViewHolder.kt
@@ -1,14 +0,0 @@
-/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomBaseViewHolder.java */
-package bou.amine.apps.readerforselfossv2.android.utils.drawer
-
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import bou.amine.apps.readerforselfossv2.android.R
-
-open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
-    var icon: ImageView = view.findViewById(R.id.material_drawer_icon)
-    var name: TextView = view.findViewById(R.id.material_drawer_name)
-    var description: TextView = view.findViewById(R.id.material_drawer_description)
-}
--- a/androidApp/src/main/res/anim/slide_in_right.xml
+++ b/androidApp/src/main/res/anim/slide_in_right.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Google Inc. All Rights Reserved.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-         http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="100%p" android:toXDelta="0"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-</set>
--- a/androidApp/src/main/res/anim/slide_out_left.xml
+++ b/androidApp/src/main/res/anim/slide_out_left.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Google Inc. All Rights Reserved.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-         http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0" android:toXDelta="-100%p"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-</set>
--- a/androidApp/src/main/res/drawable/ic_baseline_filter_alt_24.xml
+++ b/androidApp/src/main/res/drawable/ic_baseline_filter_alt_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
+</vector>
--- a/androidApp/src/main/res/drawable/ic_bug_report_black_24dp.xml
+++ b/androidApp/src/main/res/drawable/ic_bug_report_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
-</vector>
--- a/androidApp/src/main/res/drawable/ic_close_white_24dp.xml
+++ b/androidApp/src/main/res/drawable/ic_close_white_24dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
--- a/androidApp/src/main/res/drawable/ic_history_white_24dp.xml
+++ b/androidApp/src/main/res/drawable/ic_history_white_24dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
-</vector>
--- a/androidApp/src/main/res/drawable/ic_menu_refresh_white_24dp.xml
+++ b/androidApp/src/main/res/drawable/ic_menu_refresh_white_24dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
--- a/androidApp/src/main/res/font/open_sans.xml
+++ b/androidApp/src/main/res/font/open_sans.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-        app:fontProviderAuthority="com.google.android.gms.fonts"
-        app:fontProviderPackage="com.google.android.gms"
-        app:fontProviderQuery="Open Sans"
-        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
-</font-family>
--- a/androidApp/src/main/res/font/roboto.xml
+++ b/androidApp/src/main/res/font/roboto.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-        app:fontProviderAuthority="com.google.android.gms.fonts"
-        app:fontProviderPackage="com.google.android.gms"
-        app:fontProviderQuery="Roboto"
-        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
-</font-family>
--- a/androidApp/src/main/res/font/source_code_pro_medium.xml
+++ b/androidApp/src/main/res/font/source_code_pro_medium.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-        app:fontProviderAuthority="com.google.android.gms.fonts"
-        app:fontProviderPackage="com.google.android.gms"
-        app:fontProviderQuery="name=Source Code Pro&amp;weight=500"
-        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
-</font-family>
--- a/androidApp/src/main/res/layout/activity_home.xml
+++ b/androidApp/src/main/res/layout/activity_home.xml
@@ -85,11 +85,4 @@
            app:bnbActiveColor="@color/colorAccent"
            app:bnbBackgroundColor="?attr/bottomBarBackground" />
    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
-        android:id="@+id/mainDrawer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true" />
 </androidx.drawerlayout.widget.DrawerLayout>
--- a/androidApp/src/main/res/layout/filter_fragment.xml
+++ b/androidApp/src/main/res/layout/filter_fragment.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    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">
+
+    <ProgressBar
+        android:id="@+id/progressBar2"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/filterView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/floatingActionButton2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+
+            android:layout_marginTop="8dp"
+            android:clickable="true"
+            app:backgroundTint="@color/colorAccent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:rippleColor="@color/colorAccentDark"
+            app:srcCompat="@drawable/ic_menu_search_white_24dp" />
+
+        <TextView
+            android:id="@+id/filterTagsTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/filter_item_tags"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/tagsGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
+            app:singleSelection="true">
+
+        </com.google.android.material.chip.ChipGroup>
+
+        <TextView
+            android:id="@+id/filterHiddenTagsTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="@string/filter_item_hidden_tags"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
+
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/hiddenTagsGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filterHiddenTagsTitle"
+            app:singleSelection="true">
+
+        </com.google.android.material.chip.ChipGroup>
+
+
+        <TextView
+            android:id="@+id/filterSourcesTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="@string/filter_item_sources"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/hiddenTagsGroup" />
+
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/sourcesGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
+
+        </com.google.android.material.chip.ChipGroup>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/androidApp/src/main/res/menu/home_menu.xml
+++ b/androidApp/src/main/res/menu/home_menu.xml
@@ -8,16 +8,27 @@
        app:showAsAction="ifRoom|collapseActionView"
        app:actionViewClass="androidx.appcompat.widget.SearchView" />

+    <item android:id="@+id/action_filter"
+        android:title="@string/menu_home_filter"
+        android:icon="@drawable/ic_baseline_filter_alt_24"
+        android:orderInCategory="1"
+        app:showAsAction="always" />
+
    <item android:id="@+id/readAll"
          android:icon="@drawable/ic_menu_done_all_white_24dp"
          android:title="@string/readAll"
-          android:orderInCategory="1"
-          app:showAsAction="always"/>
+          android:orderInCategory="2"
+          app:showAsAction="ifRoom"/>
+
+    <item android:id="@+id/action_settings"
+        android:title="@string/title_activity_settings"
+        android:orderInCategory="98"
+        app:showAsAction="never"/>

    <item
        android:id="@+id/refresh"
-        android:icon="@drawable/ic_menu_refresh_white_24dp"
-        android:orderInCategory="99"
+        app:showAsAction="never"
+        android:orderInCategory="101"
        android:title="@string/menu_home_refresh" />

    <item android:id="@+id/action_disconnect"
--- a/androidApp/src/main/res/values-ca-rES/strings.xml
+++ b/androidApp/src/main/res/values-ca-rES/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Autenticació (si és necessària)"</string>
    <string name="login_url_problem">"Pot ser que falti una \"/\" al final de l'url."</string>
    <string name="prompt_login">"Nom d'usuari"</string>
-    <string name="label_share">"Comparteix"</string>
    <string name="readAll">"Llegeix-ho tot"</string>
    <string name="action_disconnect">"Desconnecta't"</string>
    <string name="title_activity_settings">"Configuració"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">L\'alçada de les targetes s\'ajustarà al seu contingut</string>
    <string name="card_height_off">L\'alçada de les targetes serà fixa</string>
    <string name="source_code">Codi font</string>
-    <string name="drawer_error_loading_tags">S\'ha produït un error en carregar les etiquetes</string>
-    <string name="drawer_item_filters">Filtres</string>
-    <string name="drawer_action_clear">Esborra</string>
-    <string name="drawer_item_tags">Etiquetes</string>
-    <string name="drawer_item_sources">Fonts</string>
-    <string name="drawer_action_edit">Edita</string>
-    <string name="drawer_loading">S\'està carregant…</string>
+    <string name="filter_item_tags">Etiquetes</string>
+    <string name="filter_item_sources">Fonts</string>
    <string name="menu_home_search">Cerca</string>
    <string name="can_delete_source">No es pot suprimir la font</string>
    <string name="base_url_error">S\'ha produït un error en comunicar-se amb la instància de Selfoss. Si el problema persisteix, posa\'t en contacte amb mi.</string>
    <string name="pref_header_theme">Temes</string>
-    <string name="default_theme">Predeterminat</string>
-    <string name="default_dark_theme">Predeterminat/Fosc</string>
    <string name="pref_selfoss_category">API de Selfoss</string>
    <string name="pref_api_items_number_title">Nombre d\'elements carregats</string>
    <string name="pref_hidden_tags">Etiquetes ocultes</string>
    <string name="pref_general_infinite_loading_title">Carrega articles en desplaçar</string>
    <string name="translation">Traducció</string>
    <string name="cant_open_invalid_url">L\'element URL no és vàlid. Estic intentant solucionar aquest problema perquè l\'aplicació no falli.</string>
-    <string name="drawer_report_bug">Informa d\'un error</string>
    <string name="items_number_should_be_number">El nombre d\'elements ha de ser enter.</string>
-    <string name="reader_action_more">Més informació</string>
    <string name="reader_action_open">Obre al navegador</string>
    <string name="reader_action_share">Comparteix</string>
    <string name="pref_switch_actions_pager_scroll_on">Es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">Aquesta acció marcarà els elements com a llegits.</string>
    <string name="pref_switch_actions_pager_scroll">Marca com a llegit en lliscar el dit</string>
    <string name="pref_switch_actions_pager_scroll_off">No es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
-    <string name="drawer_item_hidden_tags">Etiquetes ocultes</string>
+    <string name="filter_item_hidden_tags">Etiquetes ocultes</string>
    <string name="unmark">Marca com no llegit</string>
    <string name="pref_header_offline">Sense connexió i memòria clau</string>
    <string name="pref_switch_items_caching_off">Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-de-rDE/strings.xml
+++ b/androidApp/src/main/res/values-de-rDE/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Anmeldung erforderlich?"</string>
    <string name="login_url_problem">"Ups. Du musst eventuell ein \"/\" am Ende der URL anhängen."</string>
    <string name="prompt_login">"Benutzername"</string>
-    <string name="label_share">"Teilen"</string>
    <string name="readAll">"Alle gelesen"</string>
    <string name="action_disconnect">"Verbindung trennen"</string>
    <string name="title_activity_settings">"Einstellungen"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Kartenhöhe passt sich Inhalt an</string>
    <string name="card_height_off">Kartenhöhe ist fix</string>
    <string name="source_code">Quellcode</string>
-    <string name="drawer_error_loading_tags">Fehler beim Laden der Tags…</string>
-    <string name="drawer_item_filters">Filter</string>
-    <string name="drawer_action_clear">leeren</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Quellen</string>
-    <string name="drawer_action_edit">bearbeiten</string>
-    <string name="drawer_loading">Lade…</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Quellen</string>
    <string name="menu_home_search">Suche</string>
    <string name="can_delete_source">Can\'t delete the source…</string>
    <string name="base_url_error">Beim Versuch deine Selfoss-Instanz zu erreichen ist ein Fehler aufgetreten. Solltet dieser Fehler bestehen bleiben, trete bitte mit mir in Kontakt.</string>
    <string name="pref_header_theme">Designs</string>
-    <string name="default_theme">Standard</string>
-    <string name="default_dark_theme">Standard (Dunkel)</string>
    <string name="pref_selfoss_category">selfoss API</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Übersetzung</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Melde einen Fehler</string>
    <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
    <string name="reader_action_open">Im Browser öffnen</string>
    <string name="reader_action_share">Teilen</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">Dies wird alle Elemente als gelesen markieren.</string>
    <string name="pref_switch_actions_pager_scroll">Beim Wischen als gelesen markieren</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Eintrag als ungelesen markieren</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-es-rES/strings.xml
+++ b/androidApp/src/main/res/values-es-rES/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Inicio de sesión requerido ?"</string>
    <string name="login_url_problem">"Oops. Puede que necesite añadir un \"/\" al final de la url."</string>
    <string name="prompt_login">"Nombre de usuario"</string>
-    <string name="label_share">"Compartir"</string>
    <string name="readAll">"Leer todo"</string>
    <string name="action_disconnect">"Desconectar"</string>
    <string name="title_activity_settings">"Configuración"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Altura de tarjetas se ajustará a su contenido</string>
    <string name="card_height_off">Se fijará la altura de la tarjeta</string>
    <string name="source_code">Código fuente</string>
-    <string name="drawer_error_loading_tags">Error al cargar etiquetas…</string>
-    <string name="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpiar</string>
-    <string name="drawer_item_tags">Etiquetas</string>
-    <string name="drawer_item_sources">Fuentes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">Cargando…</string>
+    <string name="filter_item_tags">Etiquetas</string>
+    <string name="filter_item_sources">Fuentes</string>
    <string name="menu_home_search">Buscar</string>
    <string name="can_delete_source">No se puede eliminar la fuente…</string>
    <string name="base_url_error">Hubo un problema al intentar comunicarse con su instancia de Selfoss. Si el problema persiste, póngase en contacto conmigo.</string>
    <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Predeterminado</string>
-    <string name="default_dark_theme">Predeterminado/Oscuro</string>
    <string name="pref_selfoss_category">Api de Selfoss</string>
    <string name="pref_api_items_number_title">Número de artículos cargados</string>
    <string name="pref_hidden_tags">Etiquetas ocultas</string>
    <string name="pref_general_infinite_loading_title">Cargar más artículos en desplazamiento</string>
    <string name="translation">Traducción</string>
    <string name="cant_open_invalid_url">La url del elemento no es válida. Estoy buscando resolver este problema para que la aplicación no colapse.</string>
-    <string name="drawer_report_bug">Reportar un error</string>
    <string name="items_number_should_be_number">El número de artículos debe ser un número entero.</string>
-    <string name="reader_action_more">Leer más</string>
    <string name="reader_action_open">Abrir en el navegador</string>
    <string name="reader_action_share">Compartir</string>
    <string name="pref_switch_actions_pager_scroll_on">Marcar artículos como leidos al desplazarse entre ellos.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">Esto marcará todos los artículos como leídos.</string>
    <string name="pref_switch_actions_pager_scroll">Marcar artículos como leídos al deslizar con el dedo hacia los lados</string>
    <string name="pref_switch_actions_pager_scroll_off">No marcar artículos como leídos al deslizar con el dedo hacia los lados.</string>
-    <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
+    <string name="filter_item_hidden_tags">Etiquetas ocultas</string>
    <string name="unmark">Marcar artículo como no leído</string>
    <string name="pref_header_offline">Sin conexión y caché</string>
    <string name="pref_switch_items_caching_off">Los artículos no se guardarán en la memoria del dispositivo y la aplicación no se podrá utilizar sin conexión.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-fa-rIR/strings.xml
+++ b/androidApp/src/main/res/values-fa-rIR/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Login required ?"</string>
    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
    <string name="prompt_login">"Username"</string>
-    <string name="label_share">"Share"</string>
    <string name="readAll">"Read all"</string>
    <string name="action_disconnect">"Disconnect"</string>
    <string name="title_activity_settings">"Settings"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Cards height will adjust to its content</string>
    <string name="card_height_off">Card height will be fixed</string>
    <string name="source_code">Source code</string>
-    <string name="drawer_error_loading_tags">Error loading tags…</string>
-    <string name="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
    <string name="menu_home_search">Search</string>
    <string name="can_delete_source">Can\'t delete the source…</string>
    <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
    <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
    <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
    <string name="reader_action_open">Open in browser</string>
    <string name="reader_action_share">Share</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-fr-rFR/strings.xml
+++ b/androidApp/src/main/res/values-fr-rFR/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Avec login ?"</string>
    <string name="login_url_problem">"Petit souci. Il manque peut-être un / à la fin ?"</string>
    <string name="prompt_login">"Utilisateur"</string>
-    <string name="label_share">"Partager"</string>
    <string name="readAll">"Tout lire"</string>
    <string name="action_disconnect">"Déconnecter"</string>
    <string name="title_activity_settings">"Paramètres"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">La taille de la carte s\'adaptera au contenu</string>
    <string name="card_height_off">La taille de la carte sera fixe</string>
    <string name="source_code">Code source</string>
-    <string name="drawer_error_loading_tags">Erreur lors du chargement des tags…</string>
-    <string name="drawer_item_filters">Filtres</string>
-    <string name="drawer_action_clear">raz</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">éditer</string>
-    <string name="drawer_loading">Chargement …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
    <string name="menu_home_search">Rechercher</string>
    <string name="can_delete_source">Impossible de supprimer la source…</string>
    <string name="base_url_error">Il y a eu un souci lors de la communication avec votre instance Selfoss. Si le problèmes persiste, contactez-moi pour trouver une solution.</string>
    <string name="pref_header_theme">Thèmes</string>
-    <string name="default_theme">Par défaut</string>
-    <string name="default_dark_theme">Par défaut/Foncé</string>
    <string name="pref_selfoss_category">Api Selfoss</string>
    <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
    <string name="pref_hidden_tags">Tags Cachés</string>
    <string name="pref_general_infinite_loading_title">Charger plus d\'articles au scroll</string>
    <string name="translation">Traduction</string>
    <string name="cant_open_invalid_url">L’url de l’élément n’est pas valide. En attendant la résolution du problème, le lien ne s\'ouvrira pas.</string>
-    <string name="drawer_report_bug">Signaler un bug</string>
    <string name="items_number_should_be_number">Le nombre d\'articles doit être un entier.</string>
-    <string name="reader_action_more">Lire plus</string>
    <string name="reader_action_open">Ouvrir</string>
    <string name="reader_action_share">Partager</string>
    <string name="pref_switch_actions_pager_scroll_on">Marquer les articles comme lus à la navigation dans le lecteur d\'article.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">Marquer tous les éléments comme lus ?</string>
    <string name="pref_switch_actions_pager_scroll">Marquer comme lu à la navigation.</string>
    <string name="pref_switch_actions_pager_scroll_off">Ne pas marquer les articles comme lus à la navigation.</string>
-    <string name="drawer_item_hidden_tags">Tags Cachés</string>
+    <string name="filter_item_hidden_tags">Tags Cachés</string>
    <string name="unmark">Marquer l\'article comme non lu</string>
    <string name="pref_header_offline">Hors ligne et cache</string>
    <string name="pref_switch_items_caching_off">Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Thème sombre</string>
    <string name="mode_system">Utiliser les paramètres système</string>
    <string name="mode_light">Thème clair</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-gl-rES/strings.xml
+++ b/androidApp/src/main/res/values-gl-rES/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"É preciso iniciar sesión?"</string>
    <string name="login_url_problem">"Ups! Pode que precises engadir un \"/\" o final da URL."</string>
    <string name="prompt_login">"Nome de usuario"</string>
-    <string name="label_share">"Compartir"</string>
    <string name="readAll">"Ler todos"</string>
    <string name="action_disconnect">"Desconectar"</string>
    <string name="title_activity_settings">"Axustes"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">A altura das tarxetas axustarase ao seu contido</string>
    <string name="card_height_off">A altura das tarxetas será fixa</string>
    <string name="source_code">Código fonte</string>
-    <string name="drawer_error_loading_tags">Produciuse un erro ao cargar as etiquetas…</string>
-    <string name="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpar</string>
-    <string name="drawer_item_tags">Etiquetas</string>
-    <string name="drawer_item_sources">Fontes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">Cargando…</string>
+    <string name="filter_item_tags">Etiquetas</string>
+    <string name="filter_item_sources">Fontes</string>
    <string name="menu_home_search">Procurar</string>
    <string name="can_delete_source">Non se puido eliminar a fonte…</string>
    <string name="base_url_error">Houno unha incidencia ao tratar de comunicarse coa túa instancia de Selfoss. Se o problema persiste, prégolle que se poña en contacto conmigo.</string>
    <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Predeterminado</string>
-    <string name="default_dark_theme">Predeterminado/Escuro</string>
    <string name="pref_selfoss_category">API de Selfoss</string>
    <string name="pref_api_items_number_title">Número de elementos cargados</string>
    <string name="pref_hidden_tags">Etiquetas ocultas</string>
    <string name="pref_general_infinite_loading_title">Cargar máis artigos ao desprazarse</string>
    <string name="translation">Traducción</string>
    <string name="cant_open_invalid_url">A URL do elemento non é válida. Estou tratando de solucionar isto pra que a aplicación non falle.</string>
-    <string name="drawer_report_bug">Informar dun erro</string>
    <string name="items_number_should_be_number">O número de elementos debería ser un enteiro.</string>
-    <string name="reader_action_more">Ler máis</string>
    <string name="reader_action_open">Abrir no navegador</string>
    <string name="reader_action_share">Compartir</string>
    <string name="pref_switch_actions_pager_scroll_on">Marcar artigos como lidos cando se desliza o dedo dun a outro.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">Isto marcara todos os elementos como lidos.</string>
    <string name="pref_switch_actions_pager_scroll">Marcar artigos como lidos ao deslizar co dedo cara os lados</string>
    <string name="pref_switch_actions_pager_scroll_off">Non marcar artigos como lidos ao deslizar co dedo cara os lados.</string>
-    <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
+    <string name="filter_item_hidden_tags">Etiquetas ocultas</string>
    <string name="unmark">Marcar artículo como non lido</string>
    <string name="pref_header_offline">Sen conexión e caché</string>
    <string name="pref_switch_items_caching_off">Os artigos non se gardaran na memoria do dispositivo e non se poderá utilizar a aplicación sen conexión.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-in-rID/strings.xml
+++ b/androidApp/src/main/res/values-in-rID/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Harus masuk?"</string>
    <string name="login_url_problem">"Ups. Anda mungkin harus menambahkan \"/\" di akhir url."</string>
    <string name="prompt_login">"Nama pengguna"</string>
-    <string name="label_share">"Bagikan"</string>
    <string name="readAll">"Baca semua"</string>
    <string name="action_disconnect">"Putuskan sambungan"</string>
    <string name="title_activity_settings">"Pengaturan"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Tinggi kartu akan disesuaikan dengan konten</string>
    <string name="card_height_off">Ukuran kartu akan tetap</string>
    <string name="source_code">Kode sumber</string>
-    <string name="drawer_error_loading_tags">Kesalahan saat memuat tag…</string>
-    <string name="drawer_item_filters">Filter</string>
-    <string name="drawer_action_clear">kosongkan</string>
-    <string name="drawer_item_tags">Tag</string>
-    <string name="drawer_item_sources">Sumber</string>
-    <string name="drawer_action_edit">suntung</string>
-    <string name="drawer_loading">Memuat …</string>
+    <string name="filter_item_tags">Tag</string>
+    <string name="filter_item_sources">Sumber</string>
    <string name="menu_home_search">Cari</string>
    <string name="can_delete_source">Tidak dapat menghapus sumber…</string>
    <string name="base_url_error">Ada masalah saat berkomunikasi dengan Selfoss Anda. Jika masalah berlanjut, tolong hubungi saya.</string>
    <string name="pref_header_theme">Tema</string>
-    <string name="default_theme">Bawaan</string>
-    <string name="default_dark_theme">Bawaan/Gelap</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Item nomor dimuat</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Muat lebih banyak artikel saat membalik halaman</string>
    <string name="translation">Terjemahan</string>
    <string name="cant_open_invalid_url">Alamat tautan proyek tidak valid. Saya mencoba memecahkan masalah ini untuk menghindari aplikasi berhenti.</string>
-    <string name="drawer_report_bug">Laporkan bug</string>
    <string name="items_number_should_be_number">Jumlah item harus berupa bilangan bulat.</string>
-    <string name="reader_action_more">Baca lebih lanjut</string>
    <string name="reader_action_open">Buka di peramban</string>
    <string name="reader_action_share">Bagikan</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-it-rIT/strings.xml
+++ b/androidApp/src/main/res/values-it-rIT/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"È richiesto l'accesso?"</string>
    <string name="login_url_problem">"Oops. Potrebbe essere necessario aggiungere un \"/\" alla fine dell'url."</string>
    <string name="prompt_login">"Nome utente"</string>
-    <string name="label_share">"Condividi"</string>
    <string name="readAll">"Segna tutte come lette"</string>
    <string name="action_disconnect">"Scollegati"</string>
    <string name="title_activity_settings">"Impostazioni"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Cards height will adjust to its content</string>
    <string name="card_height_off">Card height will be fixed</string>
    <string name="source_code">Codice sorgente</string>
-    <string name="drawer_error_loading_tags">Errore nel caricamento dei tag…</string>
-    <string name="drawer_item_filters">Filtri</string>
-    <string name="drawer_action_clear">cancella</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Fonti</string>
-    <string name="drawer_action_edit">modifica</string>
-    <string name="drawer_loading">Caricamento…</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Fonti</string>
    <string name="menu_home_search">Cerca</string>
    <string name="can_delete_source">Non è possibile eliminare la fonte…</string>
    <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
    <string name="pref_header_theme">Temi</string>
-    <string name="default_theme">Predefinito</string>
-    <string name="default_dark_theme">Predefinito (Scuro)</string>
    <string name="pref_selfoss_category">Api di Selfoss</string>
    <string name="pref_api_items_number_title">Numero di elementi caricati</string>
    <string name="pref_hidden_tags">Tag nascosti</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Traduzioni</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Segnala un bug</string>
    <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
    <string name="reader_action_open">Open in browser</string>
    <string name="reader_action_share">Share</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Segna come non letto</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-ko-rKR/strings.xml
+++ b/androidApp/src/main/res/values-ko-rKR/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"로그인이 필요합니까?"</string>
    <string name="login_url_problem">"죄송합니다. Url의 끝에 \"/\"를 추가할 필요가 있습니다."</string>
    <string name="prompt_login">"사용자 이름"</string>
-    <string name="label_share">"공유"</string>
    <string name="readAll">"모두 읽기"</string>
    <string name="action_disconnect">"연결 해제"</string>
    <string name="title_activity_settings">"설정"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Cards height will adjust to its content</string>
    <string name="card_height_off">Card height will be fixed</string>
    <string name="source_code">Source code</string>
-    <string name="drawer_error_loading_tags">Error loading tags…</string>
-    <string name="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
    <string name="menu_home_search">Search</string>
    <string name="can_delete_source">Can\'t delete the source…</string>
    <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
    <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
    <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
    <string name="reader_action_open">Open in browser</string>
    <string name="reader_action_share">Share</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-night/strings.xml
+++ b/androidApp/src/main/res/values-night/strings.xml
@@ -2,7 +2,8 @@
 <resources>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-nl-rNL/strings.xml
+++ b/androidApp/src/main/res/values-nl-rNL/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Authenticatie vereist?"</string>
    <string name="login_url_problem">"Oeps, ben je soms de \"/\" vergeten aan het eind?"</string>
    <string name="prompt_login">"Gebruikersnaam"</string>
-    <string name="label_share">"Delen"</string>
    <string name="readAll">"Alles lezen"</string>
    <string name="action_disconnect">"Verbinding verbreken"</string>
    <string name="title_activity_settings">"Instellingen"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Hoogte aanpassen aan de hand van kaartinhoud</string>
    <string name="card_height_off">Vaste hoogte</string>
    <string name="source_code">Broncode</string>
-    <string name="drawer_error_loading_tags">Fout bij het laden van tags…</string>
-    <string name="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">wissen</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Bronnen</string>
-    <string name="drawer_action_edit">bewerken</string>
-    <string name="drawer_loading">Bezig met laden …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Bronnen</string>
    <string name="menu_home_search">Zoeken</string>
    <string name="can_delete_source">Kan de bron niet verwijderen…</string>
    <string name="base_url_error">Er was een probleem bij het communiceren met uw Selfoss Instance. Als het probleem blijft, neem dan contact met mij op.</string>
    <string name="pref_header_theme">Thema \'s</string>
-    <string name="default_theme">Standaard</string>
-    <string name="default_dark_theme">Standaard/Donker</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Geladen items nummer</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Laad meer artikelen door te bladeren</string>
    <string name="translation">Vertaling</string>
    <string name="cant_open_invalid_url">De URL is ongeldig. Ik probeer dit probleem op te lossen, zodat de toepassing niet wordt afgesloten.</string>
-    <string name="drawer_report_bug">Een fout melden</string>
    <string name="items_number_should_be_number">Het aantal items moet een geheel getal zijn.</string>
-    <string name="reader_action_more">Lees meer</string>
    <string name="reader_action_open">Openen in browser</string>
    <string name="reader_action_share">Delen</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-pt-rBR/strings.xml
+++ b/androidApp/src/main/res/values-pt-rBR/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"É necessário o login ?"</string>
    <string name="login_url_problem">"Oops. Talvez você precise adicionar uma \"/\" no final da url."</string>
    <string name="prompt_login">"Usuário"</string>
-    <string name="label_share">"Compartilhar"</string>
    <string name="readAll">"Ler todos"</string>
    <string name="action_disconnect">"Desconectar"</string>
    <string name="title_activity_settings">"Configurações"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Cards com altura ajustáveis de acordo com o conteúdo</string>
    <string name="card_height_off">Cards com altura de tamanho fixo</string>
    <string name="source_code">Código fonte</string>
-    <string name="drawer_error_loading_tags">Erro ao carregar as tags…</string>
-    <string name="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpar</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Fontes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">Carregando …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Fontes</string>
    <string name="menu_home_search">Procurar</string>
    <string name="can_delete_source">Não foi possível apagar a fonte…</string>
    <string name="base_url_error">Houve um problema ao tentar se comunicar com o seu Selfoss. Se o problema persistir, entre em contato comigo.</string>
    <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Padrão</string>
-    <string name="default_dark_theme">Padrão/Escuro</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Quantidade de itens carregados</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Carregar mais artigos ao realizar o scroll</string>
    <string name="translation">Traduções</string>
    <string name="cant_open_invalid_url">A url está inválida. Estou tentando resolver esse problema para que o aplicativo não encerre.</string>
-    <string name="drawer_report_bug">Reportar erro</string>
    <string name="items_number_should_be_number">O número dos itens deve ser um número inteiro.</string>
-    <string name="reader_action_more">Leia mais</string>
    <string name="reader_action_open">Abrir no navegador</string>
    <string name="reader_action_share">Compartilhar</string>
    <string name="pref_switch_actions_pager_scroll_on">Se esta configuração estiver ativada, os artigos serão marcados como lidos ao deslizar para a esquerda e para a direita no leitor do artigo.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">Isso marcará todos os itens como lidos.</string>
    <string name="pref_switch_actions_pager_scroll">Marcar Como Lida ao Abrir</string>
    <string name="pref_switch_actions_pager_scroll_off">Não marca artigos como lido quando abrir.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-pt-rPT/strings.xml
+++ b/androidApp/src/main/res/values-pt-rPT/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"É necessário fazer login?"</string>
    <string name="login_url_problem">"Uups. Você pode precisar adicionar uma \"/\" no final da url."</string>
    <string name="prompt_login">"Nome do usuário"</string>
-    <string name="label_share">"Compartilhar"</string>
    <string name="readAll">"Ler tudo"</string>
    <string name="action_disconnect">"Desligar"</string>
    <string name="title_activity_settings">"Configurações"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Altura de cartas irá ajustar ao seu conteúdo</string>
    <string name="card_height_off">Altura do cartão será corrigida</string>
    <string name="source_code">Código fonte</string>
-    <string name="drawer_error_loading_tags">Erro ao carregar etiquetas…</string>
-    <string name="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpar</string>
-    <string name="drawer_item_tags">Etiquetas</string>
-    <string name="drawer_item_sources">Fontes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">A carregar…</string>
+    <string name="filter_item_tags">Etiquetas</string>
+    <string name="filter_item_sources">Fontes</string>
    <string name="menu_home_search">Buscar</string>
    <string name="can_delete_source">Não é possível excluir a fonte…</string>
    <string name="base_url_error">Houve um problema ao tentar se comunicar com sua instância de Selfoss. Se o problema persistir, por favor entre em contato comigo.</string>
    <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Predefinição</string>
-    <string name="default_dark_theme">Padrão/escuro</string>
    <string name="pref_selfoss_category">Api de Selfoss</string>
    <string name="pref_api_items_number_title">Número de itens carregados</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Carregar mais artigos no pergaminho</string>
    <string name="translation">Tradução</string>
    <string name="cant_open_invalid_url">A url do item é inválido. Eu estou olhando para resolver esta questão, para que o app não vai falhar.</string>
-    <string name="drawer_report_bug">Reportar falha</string>
    <string name="items_number_should_be_number">O número de itens deve ser um número inteiro.</string>
-    <string name="reader_action_more">Ler mais</string>
    <string name="reader_action_open">Abrir no browser</string>
    <string name="reader_action_share">Compartilhar</string>
    <string name="pref_switch_actions_pager_scroll_on">Artigos de marca como lida quando passar entre artigos.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-si-rLK/strings.xml
+++ b/androidApp/src/main/res/values-si-rLK/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Login required ?"</string>
    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
    <string name="prompt_login">"පරිශීලක නාමය"</string>
-    <string name="label_share">"Share"</string>
    <string name="readAll">"Read all"</string>
    <string name="action_disconnect">"Disconnect"</string>
    <string name="title_activity_settings">"සැකසුම්"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Cards height will adjust to its content</string>
    <string name="card_height_off">Card height will be fixed</string>
    <string name="source_code">Source code</string>
-    <string name="drawer_error_loading_tags">Error loading tags…</string>
-    <string name="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
    <string name="menu_home_search">Search</string>
    <string name="can_delete_source">Can\'t delete the source…</string>
    <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
    <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
    <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
    <string name="reader_action_open">Open in browser</string>
    <string name="reader_action_share">Share</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-tr-rTR/strings.xml
+++ b/androidApp/src/main/res/values-tr-rTR/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"Kullanıcı Girişi Gerekli?"</string>
    <string name="login_url_problem">"Oops. Url'nin sonuna \"/\" eklemek gerekebilir."</string>
    <string name="prompt_login">"Kullanıcı adı"</string>
-    <string name="label_share">"Paylaş"</string>
    <string name="readAll">"Tümünü oku"</string>
    <string name="action_disconnect">"Bağlantıyı kes"</string>
    <string name="title_activity_settings">"Ayarlar"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">Kartların yüksekliği içeriğine göre ayarlanır</string>
    <string name="card_height_off">Kart yüksekliği sabit olacak</string>
    <string name="source_code">Kaynak kodu</string>
-    <string name="drawer_error_loading_tags">Etiketler yükleme hatası…</string>
-    <string name="drawer_item_filters">Filtreler</string>
-    <string name="drawer_action_clear">temizle</string>
-    <string name="drawer_item_tags">Etiketler</string>
-    <string name="drawer_item_sources">Kaynaklar</string>
-    <string name="drawer_action_edit">düzenle</string>
-    <string name="drawer_loading">Yükleniyor…</string>
+    <string name="filter_item_tags">Etiketler</string>
+    <string name="filter_item_sources">Kaynaklar</string>
    <string name="menu_home_search">Ara</string>
    <string name="can_delete_source">Kaynak silinemiyor…</string>
    <string name="base_url_error">Selfoss Örneğinizle iletişim kurmaya çalışırken bir sorun oluştu. Sorun devam ederse, lütfen benimle iletişime geçin.</string>
    <string name="pref_header_theme">Temalar</string>
-    <string name="default_theme">Varsayılan</string>
-    <string name="default_dark_theme">Varsayılan/koyu</string>
    <string name="pref_selfoss_category">Selfoss Uygulaması</string>
    <string name="pref_api_items_number_title">Yüklenen öğe numarası</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Kaydırma üzerine daha fazla makale yükleyin</string>
    <string name="translation">Çeviri</string>
    <string name="cant_open_invalid_url">Öğe url geçersiz. Uygulama çökmeyeceği için bu sorunu çözmeye çalışıyorum.</string>
-    <string name="drawer_report_bug">Hata bildir</string>
    <string name="items_number_should_be_number">Öğe sayısı bir tamsayı olmalıdır.</string>
-    <string name="reader_action_more">Daha fazlasını görüntüle</string>
    <string name="reader_action_open">Tarayıcıda aç</string>
    <string name="reader_action_share">Paylaş</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-zh-rCN/strings.xml
+++ b/androidApp/src/main/res/values-zh-rCN/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"需要登录？"</string>
    <string name="login_url_problem">"哎呀。您可能需要在网址的末尾添加一个 \"/\"。"</string>
    <string name="prompt_login">"用户名"</string>
-    <string name="label_share">"分享"</string>
    <string name="readAll">"全部阅读"</string>
    <string name="action_disconnect">"断开连接"</string>
    <string name="title_activity_settings">"设置"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">卡片高度将根据内容调整</string>
    <string name="card_height_off">卡片高度将被固定</string>
    <string name="source_code">源代码</string>
-    <string name="drawer_error_loading_tags">加载标记时出错..。</string>
-    <string name="drawer_item_filters">搜索条件</string>
-    <string name="drawer_action_clear">清空</string>
-    <string name="drawer_item_tags">标签</string>
-    <string name="drawer_item_sources">来源</string>
-    <string name="drawer_action_edit">编辑</string>
-    <string name="drawer_loading">正在载入…</string>
+    <string name="filter_item_tags">标签</string>
+    <string name="filter_item_sources">来源</string>
    <string name="menu_home_search">搜索</string>
    <string name="can_delete_source">无法删除数据源…</string>
    <string name="base_url_error">与您的 Selfoss 通信时出现问题。如果问题一直存在，请与我联系。</string>
    <string name="pref_header_theme">主题</string>
-    <string name="default_theme">默认</string>
-    <string name="default_dark_theme">默认值/暗</string>
    <string name="pref_selfoss_category">塞尔福斯 Api</string>
    <string name="pref_api_items_number_title">已加载项目编号</string>
    <string name="pref_hidden_tags">隐藏标签</string>
    <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
    <string name="translation">翻译</string>
    <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
-    <string name="drawer_report_bug">报告错误</string>
    <string name="items_number_should_be_number">项目数应为整数。</string>
-    <string name="reader_action_more">阅读更多</string>
    <string name="reader_action_open">在浏览器中打开</string>
    <string name="reader_action_share">分享</string>
    <string name="pref_switch_actions_pager_scroll_on">切换文章时将文章标记为已读。</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">这将标记所有项目为已读。</string>
    <string name="pref_switch_actions_pager_scroll">滑动时标为已读</string>
    <string name="pref_switch_actions_pager_scroll_off">滑动时不标记文章为已读</string>
-    <string name="drawer_item_hidden_tags">隐藏标签</string>
+    <string name="filter_item_hidden_tags">隐藏标签</string>
    <string name="unmark">标记条目为未读</string>
    <string name="pref_header_offline">离线和缓存</string>
    <string name="pref_switch_items_caching_off">文章不会被保存到设备内存，应用程序在离线时将无法阅读它们</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">深色模式</string>
    <string name="mode_system">遵循系统设置</string>
    <string name="mode_light">浅色模式</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values-zh-rTW/strings.xml
+++ b/androidApp/src/main/res/values-zh-rTW/strings.xml
@@ -10,7 +10,6 @@
    <string name="withLoginSwitch">"需要登入？"</string>
    <string name="login_url_problem">"哎呀。您可能需要在网址的末尾添加一个 \"/\"。"</string>
    <string name="prompt_login">"使用者名稱"</string>
-    <string name="label_share">"分享"</string>
    <string name="readAll">"全部阅读"</string>
    <string name="action_disconnect">"断开连接"</string>
    <string name="title_activity_settings">"设置"</string>
@@ -62,28 +61,19 @@
    <string name="card_height_on">卡片高度将根据内容调整</string>
    <string name="card_height_off">卡片高度将被固定</string>
    <string name="source_code">源代码</string>
-    <string name="drawer_error_loading_tags">加载标记时出错..。</string>
-    <string name="drawer_item_filters">搜索条件</string>
-    <string name="drawer_action_clear">清空</string>
-    <string name="drawer_item_tags">标签</string>
-    <string name="drawer_item_sources">来源</string>
-    <string name="drawer_action_edit">编辑</string>
-    <string name="drawer_loading">正在载入…</string>
+    <string name="filter_item_tags">标签</string>
+    <string name="filter_item_sources">来源</string>
    <string name="menu_home_search">搜索</string>
    <string name="can_delete_source">无法删除数据源…</string>
    <string name="base_url_error">与您的 Selfoss 通信时出现问题。如果问题一直存在，请与我联系。</string>
    <string name="pref_header_theme">主题</string>
-    <string name="default_theme">默认</string>
-    <string name="default_dark_theme">默认值/暗</string>
    <string name="pref_selfoss_category">塞尔福斯 Api</string>
    <string name="pref_api_items_number_title">已加载项目编号</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
    <string name="translation">翻译</string>
    <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
-    <string name="drawer_report_bug">报告错误</string>
    <string name="items_number_should_be_number">项目数应为整数。</string>
-    <string name="reader_action_more">阅读更多</string>
    <string name="reader_action_open">在浏览器中打开</string>
    <string name="reader_action_share">分享</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -132,10 +122,10 @@
    <string name="mode_dark">Dark mode</string>
    <string name="mode_system">Follow the system setting</string>
    <string name="mode_light">Light mode</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values/font_certs.xml
+++ b/androidApp/src/main/res/values/font_certs.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <array name="com_google_android_gms_fonts_certs">
-        <item>@array/com_google_android_gms_fonts_certs_dev</item>
-        <item>@array/com_google_android_gms_fonts_certs_prod</item>
-    </array>
-    <string-array name="com_google_android_gms_fonts_certs_dev">
-        <item>
-            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
-        </item>
-    </string-array>
-    <string-array name="com_google_android_gms_fonts_certs_prod">
-        <item>
-            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
-        </item>
-    </string-array>
-</resources>
--- a/androidApp/src/main/res/values/mode_settings.xml
+++ b/androidApp/src/main/res/values/mode_settings.xml
@@ -11,22 +11,4 @@
        <item>2</item> <!--MODE_NIGHT_YES-->
        <item>-1</item> <!--MODE_NIGHT_FOLLOW_SYSTEM-->
    </string-array>
-
-    <string-array name="Voice">
-        <item>Male</item>
-        <item>Female</item>
-    </string-array>
-
-    <string-array name="VoiceAlias">
-        <item>"usenglishmale"</item>
-        <item>"usenglishfemale"</item>
-        <item>"ukenglishmale"</item>
-        <item>"ukenglishfemale"</item>
-        <item>"eurfrenchmale"</item>
-        <item>"eurfrenchfemale"</item>
-        <item>"eurspanishmale"</item>
-        <item>"eurspanishfemale"</item>
-        <item>"euritalianmale"</item>
-        <item>"euritalianfemale"</item>
-    </string-array>
 </resources>
--- a/androidApp/src/main/res/values/preloaded_fonts.xml
+++ b/androidApp/src/main/res/values/preloaded_fonts.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <array name="preloaded_fonts" translatable="false">
-        <item>@font/open_sans</item>
-        <item>@font/roboto</item>
-        <item>@font/source_code_pro_medium</item>
-    </array>
-</resources>
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
    <string name="withLoginSwitch">"Login required ?"</string>
    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
    <string name="prompt_login">"Username"</string>
-    <string name="label_share">"Share"</string>
    <string name="readAll">"Read all"</string>
    <string name="action_disconnect">"Disconnect"</string>
    <string name="title_activity_settings">"Settings"</string>
@@ -62,29 +61,19 @@
    <string name="card_height_on">Cards height will adjust to its content</string>
    <string name="card_height_off">Card height will be fixed</string>
    <string name="source_code">Source code</string>
-    <string name="drawer_error_loading_tags">Error loading tags…</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
-    <string name="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
    <string name="menu_home_search">Search</string>
    <string name="can_delete_source">Can\'t delete the source…</string>
    <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
    <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
    <string name="pref_selfoss_category">Selfoss Api</string>
    <string name="pref_api_items_number_title">Loaded items number</string>
    <string name="pref_hidden_tags">Hidden Tags</string>
    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
    <string name="translation">Translation</string>
    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
    <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
    <string name="reader_action_open">Open in browser</string>
    <string name="reader_action_share">Share</string>
    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -95,7 +84,7 @@
    <string name="markall_dialog_message">This will mark all the items as read.</string>
    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
    <string name="unmark">Mark item as unread</string>
    <string name="pref_header_offline">Offline and cache</string>
    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -138,7 +127,8 @@
    <string name="mode_light">Light mode</string>
    <string name="pref_switch_enable_analytics">Enable analytics</string>
    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
 </resources>
--- a/androidApp/src/main/res/values/styles.xml
+++ b/androidApp/src/main/res/values/styles.xml
@@ -25,7 +25,5 @@
        <item name="android:textColorPrimary">@color/white</item>
        <item name="android:textColorSecondary">@color/white</item>
        <item name="actionMenuTextColor">@color/white</item>
-        <!--<item name="actionOverflowButtonStyle">@style/ActionButtonOverflowStyle</item>
-        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>-->
    </style>
 </resources>
--- a/androidApp/src/main/res/xml/pref_main.xml
+++ b/androidApp/src/main/res/xml/pref_main.xml
@@ -51,4 +51,11 @@
        android:title="@string/pref_switch_disable_acra"
        android:icon="@drawable/ic_baseline_bug_report_24"/>

+
+
+    <Preference
+        android:key="action_about"
+        android:title="@string/action_about"
+        android:icon="@drawable/ic_info_outline_white_24dp" />
+
 </PreferenceScreen>
--- a/androidApp/src/test/kotlin/RepositoryTest.kt
+++ b/androidApp/src/test/kotlin/RepositoryTest.kt
@@ -196,7 +196,7 @@ class RepositoryTest {
        every { appSettingsService.isItemCachingEnabled() } returns true

        initializeRepository(MutableStateFlow(false))
-        repository.tagFilter = SelfossModel.Tag("Test", "red", 3)
+        repository.setTagFilter(SelfossModel.Tag("Test", "red", 3))
        runBlocking {
            repository.getNewerItems()
        }
@@ -224,14 +224,14 @@ class RepositoryTest {
        every { appSettingsService.isItemCachingEnabled() } returns true

        initializeRepository(MutableStateFlow(false))
-        repository.sourceFilter = SelfossModel.Source(
+        repository.setSourceFilter(SelfossModel.Source(
            1,
            "Test",
            listOf("tags"),
            "spouts\\rss\\fulltextrss",
            "",
            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-        )
+        ))
        runBlocking {
            repository.getNewerItems()
        }
@@ -1302,15 +1302,15 @@ class RepositoryTest {
        )

        initializeRepository()
-        repository.tagFilter = SelfossModel.Tag("Tag", "read", 0)
-        repository.sourceFilter = SelfossModel.Source(
+        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
+        repository.setSourceFilter(SelfossModel.Source(
            1,
            "First source",
            listOf("Test", "second"),
            "spouts\\rss\\fulltextrss",
            "",
            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        )
+        ))
        repository.searchFilter = "search"
        runBlocking {
            repository.tryToCacheItemsAndGetNewOnes()
@@ -1325,15 +1325,15 @@ class RepositoryTest {
                StatusAndData(success = false, data = generateTestApiItem())

        initializeRepository()
-        repository.tagFilter = SelfossModel.Tag("Tag", "read", 0)
-        repository.sourceFilter = SelfossModel.Source(
+        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
+        repository.setSourceFilter(SelfossModel.Source(
            1,
            "First source",
            listOf("Test", "second"),
            "spouts\\rss\\fulltextrss",
            "",
            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        )
+        ))
        repository.searchFilter = "search"
        runBlocking {
            repository.tryToCacheItemsAndGetNewOnes()
@@ -1348,15 +1348,15 @@ class RepositoryTest {
                StatusAndData(success = false, data = generateTestApiItem())

        initializeRepository(MutableStateFlow(false))
-        repository.tagFilter = SelfossModel.Tag("Tag", "read", 0)
-        repository.sourceFilter = SelfossModel.Source(
+        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
+        repository.setSourceFilter(SelfossModel.Source(
            1,
            "First source",
            listOf("Test", "second"),
            "spouts\\rss\\fulltextrss",
            "",
            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        )
+        ))
        repository.searchFilter = "search"
        runBlocking {
            repository.tryToCacheItemsAndGetNewOnes()
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@@ -23,8 +23,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap

    var displayedItems = ItemType.UNREAD

-    var tagFilter: SelfossModel.Tag? = null
-    var sourceFilter: SelfossModel.Source? = null
+    private var _tagFilter = MutableStateFlow<SelfossModel.Tag?>(null)
+    var tagFilter = _tagFilter.asStateFlow()
+    private var _sourceFilter = MutableStateFlow<SelfossModel.Source?>(null)
+    var sourceFilter = _sourceFilter.asStateFlow()
    var searchFilter: String? = null

    var offlineOverride = false
@@ -47,8 +49,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
            fetchedItems = api.getItems(
                displayedItems.type,
                offset = 0,
-                tagFilter?.tag,
-                sourceFilter?.id?.toLong(),
+                tagFilter.value?.tag,
+                sourceFilter.value?.id?.toLong(),
                searchFilter,
                null
            )
@@ -60,11 +62,11 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                            (it.unread && displayedItems == ItemType.UNREAD) ||
                            (it.starred && displayedItems == ItemType.STARRED)
                }
-                if (tagFilter != null) {
-                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter!!.tag) }
+                if (tagFilter.value != null) {
+                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
                }
-                if (sourceFilter != null) {
-                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter!!.title }
+                if (sourceFilter.value != null) {
+                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
                }
                fetchedItems = StatusAndData.succes(
                    dbItems.map { it.toView() }
@@ -88,8 +90,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
            fetchedItems = api.getItems(
                displayedItems.type,
                offset,
-                tagFilter?.tag,
-                sourceFilter?.id?.toLong(),
+                tagFilter.value?.tag,
+                sourceFilter.value?.id?.toLong(),
                searchFilter,
                null
            )
@@ -505,4 +507,12 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
            deleteDBAction(action)
        }
    }
+
+    fun setTagFilter(tag: SelfossModel.Tag?) {
+        _tagFilter.value = tag
+    }
+
+    fun setSourceFilter(source: SelfossModel.Source?) {
+        _sourceFilter.value = source
+    }
 }
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
@@ -14,6 +14,9 @@ import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json

 class SelfossApi(private val appSettingsService: AppSettingsService) {
@@ -42,22 +45,21 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                requestTimeoutMillis = appSettingsService.getApiTimeout()
            }
            install(HttpCookies)
-            expectSuccess = false
-        }
-
-        client.plugin(HttpSend).intercept { request ->
-            val originalCall = execute(request)
-            if (originalCall.response.status == HttpStatusCode.Forbidden && shouldHavePostLogin() && hasLoginInfo()) {
-                Napier.i("Forbidden action, will try to login and retry", tag = "HttpSend")
-
-                if (login().isSuccess) {
-                    Napier.i("Logged in worked", tag = "HttpSend")
-                    execute(request)
+            install(HttpRequestRetry) {
+                maxRetries = 2
+                retryIf { _, response ->
+                    response.status == HttpStatusCode.Forbidden && shouldHavePostLogin() && hasLoginInfo()
+                }
+                modifyRequest { _ ->
+                    Napier.i("Will modify", tag = "HttpSend")
+                    CoroutineScope(Dispatchers.Main).launch {
+                        Napier.i("Will login", tag = "HttpSend")
+                        this@SelfossApi.login()
+                        Napier.i("Did login", tag = "HttpSend")
+                    }
                }
-                originalCall
-            } else {
-                originalCall
            }
+            expectSuccess = false
        }

        return client
@@ -76,10 +78,14 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
    private fun hasLoginInfo() = appSettingsService.getUserName() != null && appSettingsService.getPassword() != null

    suspend fun login(): SuccessResponse =
-        if (shouldHavePostLogin()) {
-            postLogin()
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
+            if (shouldHavePostLogin()) {
+                postLogin()
+            } else {
+                getLogin()
+            }
        } else {
-            getLogin()
+            SuccessResponse(true)
        }

    private suspend fun getLogin() = maybeResponse(client.get(url("/login")) {
Author	SHA1	Message	Date
aminecmi	9833a66a64	Cleaning tags duplications. All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	2022-12-08 14:02:30 +01:00
aminecmi	797bf06a9c	Retry to fix post login issues. All checks were successful continuous-integration/drone/push Build is passing Details	2022-12-08 13:09:02 +01:00
Amine Louveau	d98b00533d	Merge pull request 'filters' (#107 ) from filters into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/107	2022-12-07 19:13:46 +00:00
aminecmi	bf8f7d8667	Cleaning. All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2022-12-07 12:11:58 +01:00
aminecmi	89c570f34f	Fixing tests. Some checks failed continuous-integration/drone/pr Build is failing Details continuous-integration/drone/push Build is failing Details	2022-12-06 22:36:15 +01:00
aminecmi	d6a562863a	Big cleaning. Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone/pr Build is failing Details	2022-12-06 22:18:38 +01:00
aminecmi	a02f06fe2e	Big drawer cleaning.	2022-12-06 21:39:41 +01:00
aminecmi	7b088d7bb4	Hidden tags.	2022-12-06 21:39:41 +01:00
aminecmi	477883ed39	Tags sources reset.	2022-12-06 21:39:41 +01:00
aminecmi	748ed41096	Filters working.	2022-12-06 21:39:41 +01:00
aminecmi	86c50d4881	Loading sources and tags.	2022-12-06 21:39:41 +01:00
aminecmi	c4c92e6dd9	No need to login without password and username. All checks were successful continuous-integration/drone/push Build is passing Details	2022-12-06 21:39:32 +01:00
aminecmi	7f0ba193ec	Fonts are a pain in the a$$. All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	2022-12-05 21:04:32 +01:00
aminecmi	87ed5b0fa8	Cleaning, and fixing socket timeout log. All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	2022-12-04 20:46:43 +01:00
aminecmi	6947743ac0	More details for silent reports. All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	2022-12-03 21:39:46 +01:00
Amine Louveau	07e3710d44	Merge pull request 'acra' (#104 ) from acra into master All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/104	2022-12-01 21:01:18 +00:00
aminecmi	e68da7764f	Settings for acra and analytics. Closes #98 . All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2022-12-01 21:30:20 +01:00
aminecmi	c3ff894027	Initial integration.	2022-11-30 20:53:11 +01:00