Do not ignore git version.

Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/109

.drone.yml

@@ -3,27 +3,34 @@ type: docker
 name: test
 
 steps:
-  - name: AnylyseBuildTest
+  - name: BuildAndTest
     image: mingc/android-build-box:latest
     commands:
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nappLoginUrl=\"URL\"\nappLoginUsername=\"LOGIN\"\nappLoginPassword=\"PASS\"\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
-      - echo "---------------------------------------------------------"
-      - echo "Analysing..."
-      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
       - echo "---------------------------------------------------------"
       - echo "Building..."
-      - ./gradlew build
+      - ./gradlew build -x test
       - echo "---------------------------------------------------------"
       - echo "Testing..."
       - echo "---------------------------------------------------------"
-      - ./gradlew test
+      - ./gradlew koverMergedXmlReport
     environment:
       SONAR_HOST_URL:
         from_secret: sonarScannerHostUrl
       SONAR_LOGIN:
         from_secret: sonarScannerLogin
+  - name: Analyse
+    image: kytay/sonar-node-plugin
+    settings:
+      sonar_host:
+        from_secret: sonarScannerHostUrl
+      sonar_token:
+        from_secret: sonarScannerLogin
+      use_node_version: 16.18.1
+      sonar_debug: true
+      sonar_project_settings: ./sonar-project.properties
 trigger:
   event:
     - push
@@ -88,9 +95,12 @@ steps:
   - name: build
     image: mingc/android-build-box:latest
     commands:
+      - echo "---------------------------------------------------------"
+      - echo "Fetch tags..."
+      - git fetch --tags
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nappLoginUrl=\"URL\"\nappLoginUsername=\"LOGIN\"\nappLoginPassword=\"PASS\"\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
       - echo "---------------------------------------------------------"
       - echo "Generate APK"
       - ./gradlew :androidApp:assembleGithubConfigRelease  -P pushCache=false

.github/CONTRIBUTING.md

@@ -46,28 +46,3 @@ Always check if the web version of your instance is working.
 I won't provide any selfoss instance url. If you want to help, but to not have one, you'll have to install one, and use it.
 
 All the details to need are [here](https://selfoss.aditu.de/).
-
-# Build the project
-
-You can directly import this project into IntellIJ/Android Studio.
-
-You'll have to:
-
-- Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
-
-    - appLoginUrl, appLoginUsername and appLoginPassword: url, username and password of a selfoss instance. **These are only used for tests. They can be empty if you don't test API calls.**
-
-### Examples:
-#### Inside ~/.gradle/gradle.properties
-
-```
-appLoginUrl="URL" # It can be empty.
-appLoginUsername="LOGIN" # It can be empty.
-appLoginPassword="PASS" # It can be empty.
-```
-
-#### As gradle parameters
-
-```
-./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS"
-```

androidApp/build.gradle.kts

@@ -1,12 +1,14 @@
 import java.io.ByteArrayOutputStream
 
 val ignoreGitVersion: String by project
+val acraVersion = "5.9.7"
 
 plugins {
     id("com.android.application")
     kotlin("android")
     kotlin("kapt")
     id("com.mikepenz.aboutlibraries.plugin")
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
@@ -96,9 +98,6 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
-            buildConfigField("String", "LOGIN_URL", properties["appLoginUrl"] as String)
-            buildConfigField("String", "LOGIN_PASSWORD", properties["appLoginPassword"] as String)
-            buildConfigField("String", "LOGIN_USERNAME", properties["appLoginUsername"] as String)
         }
     }
     flavorDimensions.add("build")
@@ -150,9 +149,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")
 
@@ -189,6 +185,12 @@ dependencies {
     testImplementation("io.mockk:mockk:1.12.0")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-toast:$acraVersion")
+
+    // Matomo
+    implementation("com.github.matomo-org:matomo-sdk-android:4.1.4")
 }
 
 tasks.withType<Test> {

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>

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()
+}

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,46 +23,31 @@ 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
 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.*
+import bou.amine.apps.readerforselfossv2.utils.ItemType
 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.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.extra.TrackHelper
+import java.security.MessageDigest
 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
@@ -86,8 +65,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private var fromTabShortcut: Boolean = false
 
-    private lateinit var tagsBadge: Map<Long, Int>
-
     private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         appSettingsService.refreshUserSettings()
     }
@@ -95,12 +72,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override val di by closestDI()
     private val repository : Repository by instance()
     private val appSettingsService : AppSettingsService by instance()
+    private val tracker : Tracker by instance()
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeBinding.inflate(layoutInflater)
         val view = binding.root
 
+        TrackHelper.track().screen("/home").with(tracker)
+
         fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
         repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)
 
@@ -111,14 +92,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()
 
@@ -139,7 +114,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
@@ -179,16 +153,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
                         adapter.handleItemAtIndex(position)
 
-                        val tagHashes = i.tags.map { it.longHash() }
-                        tagsBadge = tagsBadge.map {
-                            if (tagHashes.contains(it.key)) {
-                                (it.key to (it.value - 1))
-                            } else {
-                                (it.key to it.value)
-                            }
-                        }.toMap()
-                        reloadTagsBadges()
-
                         // Just load everythin
                         if (items.size <= 0) {
                             getElementsAccordingToTab()
@@ -285,8 +249,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onResume() {
         super.onResume()
 
-        handleDrawerItems()
-
         reloadLayoutManager()
 
         if (appSettingsService.isInfiniteLoadingEnabled()) {
@@ -297,6 +259,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleBottomBarActions()
 
+        handleGDPRDialog(appSettingsService.settings.getBoolean("GDPR_shown", false))
+
         handleRecurringTask()
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -306,245 +270,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getElementsAccordingToTab()
     }
 
-    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) {
+    private fun handleGDPRDialog(GDPRShown: Boolean) {
-                Glide.with(this@HomeActivity).clear(imageView)
+        val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
+        messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
+        if (!GDPRShown) {
+            val alertDialog = AlertDialog.Builder(this).create()
+            alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
+            alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
+            alertDialog.setButton(
+                AlertDialog.BUTTON_NEUTRAL,
+                "OK"
+            ) { dialog, _ ->
+                appSettingsService.settings.putBoolean("GDPR_shown", true)
+                dialog.dismiss()
             }
-        })
+            alertDialog.show()
-
-        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) {
-            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)
         }
     }
 
@@ -629,7 +370,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)
@@ -670,7 +411,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) {
@@ -751,13 +492,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
@@ -803,6 +537,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()
@@ -842,8 +581,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 ).show()
                                 tabNewBadge.removeBadge()
 
-                                handleDrawerItems()
-
                                 getElementsAccordingToTab()
                             } else {
                                 Toast.makeText(
@@ -860,12 +597,18 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 return true
             }
             R.id.action_disconnect -> {
-                appSettingsService.clearAll()
+                CoroutineScope(Dispatchers.Main).launch {
+                    repository.logout()
+                }
                 val intent = Intent(this, LoginActivity::class.java)
                 this.startActivity(intent)
                 this@HomeActivity.finish()
                 return true
             }
+            R.id.action_settings -> {
+                settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
+                return true
+            }
             else -> return super.onOptionsItemSelected(item)
         }
     }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt

@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
@@ -24,6 +25,12 @@ import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.extra.DimensionQueue
+import org.matomo.sdk.extra.DownloadTracker
+import org.matomo.sdk.extra.TrackHelper
+import java.security.MessageDigest
+
 
 class LoginActivity : AppCompatActivity(), DIAware {
 
@@ -35,10 +42,17 @@ class LoginActivity : AppCompatActivity(), DIAware {
     override val di by closestDI()
     private val repository : Repository by instance()
     private val appSettingsService : AppSettingsService by instance()
+    private val tracker : Tracker by instance()
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+
+        TrackHelper.track().download().identifier(DownloadTracker.Extra.ApkChecksum(applicationContext))
+            .with(tracker)
+        TrackHelper.track().screen("/login").with(tracker)
+
+        handleTheme()
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
         val view = binding.root
@@ -56,6 +70,11 @@ class LoginActivity : AppCompatActivity(), DIAware {
         handleActions()
     }
 
+    @SuppressLint("WrongConstant") // Constant is fetched from the settings
+    private fun handleTheme() {
+        AppCompatDelegate.setDefaultNightMode(appSettingsService.getCurrentTheme())
+    }
+
     private fun handleActions() {
 
         binding.passwordView.setOnEditorActionListener(
@@ -95,6 +114,15 @@ class LoginActivity : AppCompatActivity(), DIAware {
     private fun goToMain() {
         CoroutineScope(Dispatchers.Main).launch {
             repository.updateApiVersion()
+
+            val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
+            messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
+            tracker.userId = String(messageDigest.digest())
+
+            val mDimensionQueue = DimensionQueue(tracker)
+            mDimensionQueue.add(1, appSettingsService.getApiVersion().toString())
+
+            tracker.isOptOut = !appSettingsService.isAnalyticsEnabled()
         }
         val intent = Intent(this, HomeActivity::class.java)
         startActivity(intent)

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt

@@ -3,21 +3,16 @@ package bou.amine.apps.readerforselfossv2.android
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
-import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.widget.ImageView
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.*
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
-import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.DI.networkModule
-import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
 import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
@@ -26,15 +21,23 @@ 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
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
+import org.acra.ACRA
+import org.acra.ReportField
+import org.acra.config.httpSender
+import org.acra.config.toast
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
 import org.kodein.di.*
+import org.matomo.sdk.Matomo
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.TrackerBuilder
 
 class MyApp : MultiDexApplication(), DIAware {
 
@@ -45,13 +48,14 @@ class MyApp : MultiDexApplication(), DIAware {
         bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
         bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
+        bind<Tracker>() with singleton { TrackerBuilder.createDefault("https://matomo.amine-louveau.fr/matomo.php", if (BuildConfig.DEBUG) 4 else 5).build(
+            Matomo.getInstance(applicationContext)) }
     }
 
     private val repository: Repository by instance()
     private val viewModel: AppViewModel by instance()
     private val connectivityStatus: ConnectivityStatus by instance()
     private val driverFactory: DriverFactory by instance()
-    private val appSettingsService : AppSettingsService by instance()
 
     // TODO: handle with the "previous" way
     private val isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(true)
@@ -60,8 +64,7 @@ class MyApp : MultiDexApplication(), DIAware {
         super.onCreate()
         Napier.base(DebugAntilog())
 
-        initDrawerImageLoader()
+        if (!ACRA.isACRASenderServiceProcess()) {
-
             tryToHandleBug()
 
             handleNotificationChannels()
@@ -85,6 +88,34 @@ class MyApp : MultiDexApplication(), DIAware {
                 }
             }
         }
+    }
+
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+
+        initAcra {
+            reportFormat = StringFormat.JSON
+            reportContent = listOf(
+                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
+                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
+                ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
+                ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
+                ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
+                ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
+                ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
+            toast {
+                //required
+                text = getString(R.string.crash_toast_text)
+                length = Toast.LENGTH_SHORT
+            }
+            httpSender {
+                uri = "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
+                basicAuthLogin = "LMTlLZuazADohTCm"
+                basicAuthPassword = "he6ghHp83F0PYPfh"
+                httpMethod = HttpSender.Method.POST
+            }
+        }
+    }
 
     private fun handleNotificationChannels() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -103,52 +134,19 @@ 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()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
+            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
                 }) {
-                Unit
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        if (appSettingsService.getCurrentTheme() == MODE_NIGHT_FOLLOW_SYSTEM) {
-            var mode = when (newConfig.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
-                Configuration.UI_MODE_NIGHT_YES -> MODE_NIGHT_YES
-                else -> MODE_NIGHT_NO
-            }
-            setDefaultNightMode(mode)
-        }
-
-
-    }
-
     class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
 
         override fun onResume(owner: LifecycleOwner) {

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
@@ -44,11 +45,14 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.acra.ktx.sendSilentlyWithAcra
+import org.acra.ktx.sendWithAcra
 import org.kodein.di.DI
 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
@@ -66,7 +70,7 @@ class ArticleFragment : Fragment(), DIAware {
     private lateinit var fab: FloatingActionButton
     private lateinit var textAlignment: String
     private var _binding: FragmentArticleBinding? = null
-    private val binding get() = _binding!!
+    private val binding get() = _binding
 
     override val di : DI by closestDI()
     private val repository: Repository by instance()
@@ -107,25 +111,15 @@ 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) {
-                    // Just to be sure
-                    null
-                }
-            }
-
             refreshAlignment()
 
-            fab = binding.fab
+            fab = binding!!.fab
 
             fab.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.colorAccent))
 
             fab.rippleColor = resources.getColor(R.color.colorAccentDark)
 
-            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+            val floatingToolbar: FloatingToolbar = binding!!.floatingToolbar
             floatingToolbar.attachFab(fab)
 
             floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
@@ -173,35 +167,35 @@ class ArticleFragment : Fragment(), DIAware {
                 floatingToolbar.show()
             }
 
-            binding.source.text = contentSource
+            binding!!.source.text = contentSource
             if (typeface != null) {
-                binding.source.typeface = typeface
+                binding!!.source.typeface = typeface
             }
 
             if (contentText.isEmptyOrNullOrNullString()) {
                 getContentFromMercury()
             } else {
-                binding.titleView.text = contentTitle
+                binding!!.titleView.text = contentTitle
                 if (typeface != null) {
-                    binding.titleView.typeface = typeface
+                    binding!!.titleView.typeface = typeface
                 }
 
                 htmlToWebview()
 
                 if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                    binding.imageView.visibility = View.VISIBLE
+                    binding!!.imageView.visibility = View.VISIBLE
                     Glide
                         .with(requireContext())
                         .asBitmap()
                         .load(contentImage)
                         .apply(RequestOptions.fitCenterTransform())
-                        .into(binding.imageView)
+                        .into(binding!!.imageView)
                 } else {
-                    binding.imageView.visibility = View.GONE
+                    binding!!.imageView.visibility = View.GONE
                 }
             }
 
-            binding.nestedScrollView.setOnScrollChangeListener(
+            binding!!.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
                         floatingToolbar.hide()
@@ -217,6 +211,7 @@ class ArticleFragment : Fragment(), DIAware {
             )
 
         } catch (e: InflateException) {
+            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))
@@ -229,7 +224,7 @@ class ArticleFragment : Fragment(), DIAware {
                 .show()
         }
 
-        return binding.root
+        return binding!!.root
     }
 
     override fun onDestroyView() {
@@ -247,37 +242,40 @@ class ArticleFragment : Fragment(), DIAware {
 
     private fun getContentFromMercury() {
         if (repository.isNetworkAvailable()) {
-            binding.progressBar.visibility = View.VISIBLE
+            binding!!.progressBar.visibility = View.VISIBLE
 
             CoroutineScope(Dispatchers.Main).launch {
+                try {
                     val response = mercuryApi.query(url)
-                if (response.success) {
+                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
+                        binding!!.titleView.text = response.data!!.title.orEmpty()
                         try {
-                        if (response.data != null && response.data!!.content != null && !response.data!!.content.isNullOrEmpty()) {
-                            try {
-                                binding.titleView.text = response.data!!.title
                             if (typeface != null) {
-                                    binding.titleView.typeface = typeface
+                                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. We do nothing.
+                            // Mercury returned a relative url
-                                }
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
-                            } catch (e: Exception) {
                         }
 
                         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 {
-                                if (response.data!!.lead_image_url != null && !response.data!!.lead_image_url.isNullOrEmpty() && context != null) {
+                                binding!!.imageView.visibility = View.VISIBLE
-                                    binding.imageView.visibility = View.VISIBLE
                                 try {
                                     Glide
                                         .with(requireContext())
@@ -286,38 +284,30 @@ class ArticleFragment : Fragment(), DIAware {
                                             response.data!!.lead_image_url.orEmpty()
                                         )
                                         .apply(RequestOptions.fitCenterTransform())
-                                            .into(binding.imageView)
+                                        .into(binding!!.imageView)
                                 } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
+                                }
+                            } catch (e: Exception) {
+                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
                             }
                         } else {
-                                    binding.imageView.visibility = View.GONE
+                            binding!!.imageView.visibility = View.GONE
-                                }
-                            } catch (e: Exception) {
-                                if (context != null) {
-                                }
                         }
 
                         try {
-                                binding.nestedScrollView.scrollTo(0, 0)
+                            binding!!.nestedScrollView.scrollTo(0, 0)
-
+                            binding!!.progressBar.visibility = View.GONE
-                                binding.progressBar.visibility = View.GONE
                         } catch (e: Exception) {
-                                if (context != null) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
-                                }
                         }
                     } else {
-                            try {
+                        openInBrowserAfterFailing()
+                    }
+                } catch (e: SocketTimeoutException) {
                     openInBrowserAfterFailing()
                 } catch (e: Exception) {
-                                if (context != null) {
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
-                                }
-                            }
-                        }
-                    } catch (e: Exception) {
-                        if (context != null) {
-                        }
-                    }
-                } else {
                     openInBrowserAfterFailing()
                 }
             }
@@ -330,8 +320,8 @@ class ArticleFragment : Fragment(), DIAware {
         val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
 
-        binding.webcontent.settings.standardFontFamily = a.getString(0)
+        binding!!.webcontent.settings.standardFontFamily = a.getString(0)
-        binding.webcontent.visibility = View.VISIBLE
+        binding!!.webcontent.visibility = View.VISIBLE
 
         val colorOnSurface = TypedValue()
         requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
@@ -339,14 +329,14 @@ class ArticleFragment : Fragment(), DIAware {
         val colorSurface = TypedValue()
         requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
 
-        binding.webcontent.settings.useWideViewPort = true
+        binding!!.webcontent.settings.useWideViewPort = true
-        binding.webcontent.settings.loadWithOverviewMode = true
+        binding!!.webcontent.settings.loadWithOverviewMode = true
-        binding.webcontent.settings.javaScriptEnabled = false
+        binding!!.webcontent.settings.javaScriptEnabled = false
 
-        binding.webcontent.webViewClient = object : WebViewClient() {
+        binding!!.webcontent.webViewClient = object : WebViewClient() {
             @Deprecated("Deprecated in Java")
             override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
-                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                if (binding!!.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
                     requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
                 }
                 return true
@@ -359,19 +349,25 @@ class ArticleFragment : Fragment(), DIAware {
                     try {
                         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) {}
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg")
+                    }
                 }
                 else if (url.lowercase(Locale.US).contains(".png")) {
                     try {
                         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) {}
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png")
+                    }
                 }
                 else if (url.lowercase(Locale.US).contains(".webp")) {
                     try {
                         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) {}
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp")
+                    }
                 }
 
                 return super.shouldInterceptRequest(view, url)
@@ -384,9 +380,9 @@ class ArticleFragment : Fragment(), DIAware {
             }
         })
 
-        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
+        binding!!.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
-        binding.webcontent.settings.layoutAlgorithm =
+        binding!!.webcontent.settings.layoutAlgorithm =
                 WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
         var baseUrl: String? = null
@@ -395,6 +391,7 @@ class ArticleFragment : Fragment(), DIAware {
             val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
+            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
         }
 
         val fontName =  when (font) {
@@ -416,7 +413,7 @@ class ArticleFragment : Fragment(), DIAware {
             ""
         }
 
-        binding.webcontent.loadDataWithBaseURL(
+        binding!!.webcontent.loadDataWithBaseURL(
             baseUrl,
             """<html>
                 |<head>
@@ -469,17 +466,17 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun scrollDown() {
-        val height = binding.nestedScrollView.measuredHeight
+        val height = binding!!.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, height/2)
+        binding!!.nestedScrollView.smoothScrollBy(0, height/2)
     }
 
     fun scrollUp() {
-        val height = binding.nestedScrollView.measuredHeight
+        val height = binding!!.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, -height/2)
+        binding!!.nestedScrollView.smoothScrollBy(0, -height/2)
     }
 
     private fun openInBrowserAfterFailing() {
-        binding.progressBar.visibility = View.GONE
+        binding!!.progressBar.visibility = View.GONE
         requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
     }
 
@@ -498,10 +495,10 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+        if (binding!!.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                binding!!.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
 
-            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
+            val position : Int = allImages.indexOf(binding!!.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
             intent.putExtra("allImages", allImages)

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt

@@ -0,0 +1,182 @@
+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 sourceGroup = binding.sourcesGroup
+
+        CoroutineScope(Dispatchers.Main).launch {
+            val tags = repository.getTags()
+
+            tags.forEach { tag ->
+                val c = chipForTag(tag)
+                tagGroup.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"
+    }
+
+
+}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/AndroidIModelUtils.kt

@@ -2,11 +2,13 @@ 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
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
+import org.acra.ktx.sendSilentlyWithAcra
 
 fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
     val imageUrls = this.getImages()
@@ -23,6 +25,7 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
             }
         }
     } catch (e : Error) {
+        e.sendSilentlyWithAcraWithName("preloadImages")
         return false
     }
 
@@ -35,7 +38,7 @@ fun String.toTextDrawableString(): String {
         try {
             textDrawable.append(s[0])
         } catch (e: StringIndexOutOfBoundsException) {
-            // We do nothing
+            e.sendSilentlyWithAcraWithName("toTextDrawableString")
         }
     }
     return textDrawable.toString()

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt

@@ -16,17 +16,31 @@ 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
+import org.kodein.di.android.closestDI
+import org.kodein.di.instance
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.extra.TrackHelper
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
 class SettingsActivity : AppCompatActivity(),
-        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
+    override val di by closestDI()
+
+    private val tracker : Tracker by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val binding = ActivitySettingsBinding.inflate(layoutInflater)
 
+        TrackHelper.track().screen("/settings").with(tracker)
+
         setContentView(binding.root)
         if (savedInstanceState == null) {
             supportFragmentManager
@@ -91,6 +105,21 @@ class SettingsActivity : AppCompatActivity(),
     class MainPreferenceFragment : PreferenceFragmentCompat() {
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
+
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                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
+            }
         }
     }
 
@@ -107,6 +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.sendSilentlyWithAcraWithName("GeneralPreferenceFragment")
                                 Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                             }
                             ""
@@ -130,6 +160,7 @@ class SettingsActivity : AppCompatActivity(),
                         try {
                             editText.textSize = editable.toString().toInt().toFloat()
                         } catch (e: NumberFormatException) {
+                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                         }
                     }
                 } }
@@ -139,6 +170,7 @@ class SettingsActivity : AppCompatActivity(),
                                 val input = (dest.toString() + source.toString()).toInt()
                                 if (input > 0) return@InputFilter null
                             } catch (nfe: NumberFormatException) {
+                                nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                             }
                             ""
                         }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/LinksUtils.kt

@@ -1,13 +1,9 @@
 package bou.amine.apps.readerforselfossv2.android.utils
 
 import android.app.Activity
-import android.app.PendingIntent
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.graphics.BitmapFactory
 import android.net.Uri
-import android.os.Build
 import android.text.Spannable
 import android.text.style.ClickableSpan
 import android.util.Patterns

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)
-}

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>

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>

androidApp/src/main/res/drawable/checkerboard.xml

@@ -0,0 +1,5 @@
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:dither="true"
+    android:src="@drawable/checktile"
+    android:tileMode="repeat"/>

androidApp/src/main/res/drawable/ic_baseline_bug_report_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    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="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>

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>

androidApp/src/main/res/drawable/ic_baseline_insights_24.xml

@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#000000"
+    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="M21,8c-1.45,0 -2.26,1.44 -1.93,2.51l-3.55,3.56c-0.3,-0.09 -0.74,-0.09 -1.04,0l-2.55,-2.55C12.27,10.45 11.46,9 10,9c-1.45,0 -2.27,1.44 -1.93,2.52l-4.56,4.55C2.44,15.74 1,16.55 1,18c0,1.1 0.9,2 2,2c1.45,0 2.26,-1.44 1.93,-2.51l4.55,-4.56c0.3,0.09 0.74,0.09 1.04,0l2.55,2.55C12.73,16.55 13.54,18 15,18c1.45,0 2.27,-1.44 1.93,-2.52l3.56,-3.55C21.56,12.26 23,11.45 23,10C23,8.9 22.1,8 21,8z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M15,9l0.94,-2.07l2.06,-0.93l-2.06,-0.93l-0.94,-2.07l-0.92,2.07l-2.08,0.93l2.08,0.93z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M3.5,11l0.5,-2l2,-0.5l-2,-0.5l-0.5,-2l-0.5,2l-2,0.5l2,0.5z"/>
+</vector>

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>

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>

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>

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>

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>

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>

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>

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>

androidApp/src/main/res/layout/filter_fragment.xml

@@ -0,0 +1,89 @@
+<?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/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/tagsGroup" />
+
+
+        <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>

androidApp/src/main/res/layout/fragment_image.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,8 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
+        android:adjustViewBounds="true"
-        android:background="@android:color/black"
+        android:background="@drawable/checkerboard"
         app:srcCompat="@android:drawable/screen_background_dark" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</RelativeLayout>

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"
+          android:orderInCategory="2"
-          app:showAsAction="always"/>
+          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"
+        app:showAsAction="never"
-        android:orderInCategory="99"
+        android:orderInCategory="101"
         android:title="@string/menu_home_refresh" />
 
     <item android:id="@+id/action_disconnect"

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,18 @@
     <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="filter_item_tags">Etiquetes</string>
-    <string name="drawer_item_filters">Filtres</string>
+    <string name="filter_item_sources">Fonts</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Els articles se sincronitzaran periòdicament</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Interval de sincronització ( >= 15 minuts)]]></string>
     <string name="pref_switch_refresh_when_charging">Sincronitza només quan el telèfon s\'està carregant</string>
-    <string name="loading_notification_title">S\'està carregant...</string>
+    <string name="loading_notification_title">S\'està carregant…</string>
     <string name="loading_notification_text">Selfoss està sincronitzant els articles</string>
     <string name="notification_channel_sync">Notificació de sincronització</string>
     <string name="new_items_channel_sync">Notificació d\'elements nous</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filter</string>
+    <string name="filter_item_sources">Quellen</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Die Artikel werden regelmäßig synchronisiert</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Nur aktualisieren, wenn das Telefon aufgeladen wird</string>
-    <string name="loading_notification_title">Lädt...</string>
+    <string name="loading_notification_title">Lädt…</string>
     <string name="loading_notification_text">Selfoss synchronisiert Ihre Artikel</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Etiquetas</string>
-    <string name="drawer_item_filters">Filtros</string>
+    <string name="filter_item_sources">Fuentes</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Los artículos se sincronizarán periódicamente</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
     <string name="pref_switch_refresh_when_charging">Sólo refrescar cuando el teléfono está cargando</string>
-    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_title">Cargando…</string>
     <string name="loading_notification_text">Selfoss está sincronizando tus artículos</string>
     <string name="notification_channel_sync">Notificación de sincronización</string>
     <string name="new_items_channel_sync">Notificación de elementos nuevos</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filters</string>
+    <string name="filter_item_sources">Sources</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filtres</string>
+    <string name="filter_item_sources">Sources</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles seront périodiquement synchronisées</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Interval de synchronisation ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Synchroniser uniquement lorsque le téléphone est en charge</string>
-    <string name="loading_notification_title">Chargement ...</string>
+    <string name="loading_notification_title">Chargement …</string>
     <string name="loading_notification_text">Selfoss synchronise vos articles</string>
     <string name="notification_channel_sync">Notification de synchronisation</string>
     <string name="new_items_channel_sync">Notification de nouveaux articles</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Etiquetas</string>
-    <string name="drawer_item_filters">Filtros</string>
+    <string name="filter_item_sources">Fontes</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Os artigos sincronizaranse periódicamente</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
     <string name="pref_switch_refresh_when_charging">Só refrescar cando o teléfono se está a cargar</string>
-    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_title">Cargando…</string>
     <string name="loading_notification_text">Selfoss está sincronizando os teus ar tigos</string>
     <string name="notification_channel_sync">Notificación de sincronización</string>
     <string name="new_items_channel_sync">Notificación de actualizacións</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tag</string>
-    <string name="drawer_item_filters">Filter</string>
+    <string name="filter_item_sources">Sumber</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filtri</string>
+    <string name="filter_item_sources">Fonti</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filters</string>
+    <string name="filter_item_sources">Sources</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

androidApp/src/main/res/values-night/strings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filters</string>
+    <string name="filter_item_sources">Bronnen</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filtros</string>
+    <string name="filter_item_sources">Fontes</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Etiquetas</string>
-    <string name="drawer_item_filters">Filtros</string>
+    <string name="filter_item_sources">Fontes</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_item_filters">Filters</string>
+    <string name="filter_item_sources">Sources</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">Etiketler</string>
-    <string name="drawer_item_filters">Filtreler</string>
+    <string name="filter_item_sources">Kaynaklar</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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,18 @@
     <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="filter_item_tags">标签</string>
-    <string name="drawer_item_filters">搜索条件</string>
+    <string name="filter_item_sources">来源</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="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 +83,6 @@
     <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="unmark">标记条目为未读</string>
     <string name="pref_header_offline">离线和缓存</string>
     <string name="pref_switch_items_caching_off">文章不会被保存到设备内存，应用程序在离线时将无法阅读它们</string>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">将定期同步文章</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[同步间隔 (>= 15分钟)]]></string>
     <string name="pref_switch_refresh_when_charging">仅在手机充电时刷新</string>
-    <string name="loading_notification_title">加载中...</string>
+    <string name="loading_notification_title">加载中…</string>
     <string name="loading_notification_text">Selfoss 正在同步您的文章</string>
     <string name="notification_channel_sync">同步通知</string>
     <string name="new_items_channel_sync">新条目通知</string>
@@ -132,5 +120,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">启用分析</string>
+    <string name="gdpr_dialog_title">该应用不分享任何关于您的个人数据。</string>
+    <string name="gdpr_dialog_message"><![CDATA[崩溃报告发送现已启用。 可以从设置页面禁用它。 请记住，崩溃报告对于应用程序开发是必需的。]]></string>
+    <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</string>
+    <string name="pref_switch_disable_acra">"禁用自动错误报告 "</string>
+    <string name="menu_home_filter">筛选器</string>
 </resources>

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,18 @@
     <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="filter_item_tags">标签</string>
-    <string name="drawer_item_filters">搜索条件</string>
+    <string name="filter_item_sources">来源</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="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 +83,6 @@
     <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="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>
@@ -109,7 +97,7 @@
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Loading …</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
@@ -132,5 +120,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. 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>

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>

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>

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>

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,18 @@
     <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="filter_item_tags">Tags</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
+    <string name="filter_item_sources">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="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 +83,6 @@
     <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="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>
@@ -118,7 +105,7 @@
     <string name="new_items_notification_text">%1$d new items loaded.</string>
     <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
     <string name="shortcut_offline">Offline</string>
-    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_api_timeout">Api Timeout (seconds)</string>
     <string name="pref_header_experimental">Experimental</string>
     <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
     <string name="webview_dialog_issue_title">Webview issue</string>
@@ -136,4 +123,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="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. 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>

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>

androidApp/src/main/res/xml/pref_experimental.xml

@@ -1,5 +1,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <EditTextPreference
         android:inputType="number"
         android:key="api_timeout"

androidApp/src/main/res/xml/pref_general.xml

@@ -14,15 +14,6 @@
         android:title="@string/pref_api_items_number_title"
         app:iconSpaceReserved="false"/>
 
-    <EditTextPreference
-        android:defaultValue=""
-        android:hint="@string/add_source_hint_tags"
-        android:key="hidden_tags"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
-        android:title="@string/pref_hidden_tags"
-        app:iconSpaceReserved="false"/>
-
     <SwitchPreference
         android:defaultValue="false"
         android:key="infinite_loading"

androidApp/src/main/res/xml/pref_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/title_activity_settings">
 
     <Preference
@@ -17,9 +18,13 @@
         android:title="@string/pref_header_offline"
         android:icon="@drawable/ic_signal_wifi_off_black_24dp" />
 
-    <Preference
+    <ListPreference
-        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$ThemePreferenceFragment"
+        android:defaultValue="0"
+        android:entries="@array/ModeTitles"
+        android:entryValues="@array/ModeValues"
+        android:key="currentMode"
         android:title="@string/pref_header_theme"
+        app:useSimpleSummaryProvider="false"
         android:icon="@drawable/ic_color_lens_black_24dp" />
 
     <Preference
@@ -32,4 +37,25 @@
         android:title="@string/pref_header_experimental"
         android:icon="@drawable/ic_widgets_black_24dp" />
 
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="enable_analytics"
+        android:title="@string/pref_switch_enable_analytics"
+        android:icon="@drawable/ic_baseline_insights_24"/>
+
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="acra.disable"
+        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>

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()
         }
@@ -369,14 +369,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags() {
-        val tags = listOf(
+        val (tags, tagsDB) = prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
 
         coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
         coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
@@ -396,17 +389,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags_with_sources_update_disabled() {
-        val tags = listOf(
+        val (tags, tagsDB) = prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns true
 
@@ -426,17 +409,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags_with_items_caching_disabled() {
-        val tags = listOf(
+        val (tags, _) = prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         every { appSettingsService.isItemCachingEnabled() } returns false
 
@@ -453,17 +426,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags_with_sources_update_and_items_caching_disabled() {
-        val tags = listOf(
+        val (tags, tagsDB) = prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns false
 
@@ -482,17 +445,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags_without_connection() {
-        val tags = listOf(
+        val (tags, tagsDB) = prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         every { appSettingsService.isItemCachingEnabled() } returns true
 
@@ -510,17 +463,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags_without_connection_and_items_caching_disabled() {
-        val tags = listOf(
+        prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
 
@@ -537,17 +480,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags_without_connection_and_sources_update_disabled() {
-        val tags = listOf(
+        val (tags, tagsDB) = prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns true
 
@@ -565,17 +498,7 @@ class RepositoryTest {
 
     @Test
     fun get_tags_without_connection_and_sources_update_and_items_caching_disabled() {
-        val tags = listOf(
+        val (_, tagsDB) = prepareTags()
-            SelfossModel.Tag("test", "red", 6),
-            SelfossModel.Tag("second", "yellow", 0)
-        )
-        val tagsDB = listOf(
-            TAG("test_DB", "red", 6),
-            TAG("second_DB", "yellow", 0)
-        )
-
-        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
-        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns false
 
@@ -590,8 +513,36 @@ class RepositoryTest {
         verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
     }
 
+    private fun prepareTags(): Pair<List<SelfossModel.Tag>, List<TAG>> {
+        val tags = listOf(
+            SelfossModel.Tag("test", "red", 6),
+            SelfossModel.Tag("second", "yellow", 0)
+        )
+        val tagsDB = listOf(
+            TAG("test_DB", "red", 6),
+            TAG("second_DB", "yellow", 0)
+        )
+
+        coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
+        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
+        return Pair(tags, tagsDB)
+    }
+
     @Test
     fun get_sources() {
+        val (sources, sourcesDB) = prepareSources()
+        initializeRepository()
+        var testSources: List<SelfossModel.Source>?
+        runBlocking {
+            testSources = repository.getSources()
+        }
+
+        assertSame(sources, testSources)
+        assertNotEquals(sourcesDB.map { it.toView() }, testSources)
+        coVerify(exactly = 1) { api.sources() }
+    }
+
+    private fun prepareSources(): Pair<ArrayList<SelfossModel.Source>, List<SOURCE>> {
         val sources = arrayListOf(
             SelfossModel.Source(
                 1,
@@ -631,60 +582,15 @@ class RepositoryTest {
 
         coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
         every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
-        initializeRepository()
+        return Pair(sources, sourcesDB)
-        var testSources: List<SelfossModel.Source>?
-        runBlocking {
-            testSources = repository.getSources()
-        }
-
-        assertSame(sources, testSources)
-        assertNotEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 1) { api.sources() }
     }
 
     @Test
     fun get_sources_with_sources_update_disabled() {
-        val sources = arrayListOf(
+        val (sources, sourcesDB) = prepareSources()
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second DB source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
 
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns true
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         initializeRepository()
         var testSources: List<SelfossModel.Source>?
         runBlocking {
@@ -701,47 +607,10 @@ class RepositoryTest {
 
     @Test
     fun get_sources_with_items_caching_disabled() {
-        val sources = arrayListOf(
+        val (sources, _) = prepareSources()
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
 
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         every { appSettingsService.isItemCachingEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         initializeRepository()
         var testSources: List<SelfossModel.Source>?
         runBlocking {
@@ -755,47 +624,10 @@ class RepositoryTest {
 
     @Test
     fun get_sources_with_sources_update_and_items_caching_disabled() {
-        val sources = arrayListOf(
+        val (sources, _) = prepareSources()
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
 
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         initializeRepository()
         var testSources: List<SelfossModel.Source>?
         runBlocking {
@@ -809,45 +641,7 @@ class RepositoryTest {
 
     @Test
     fun get_sources_without_connection() {
-        val sources = arrayListOf(
+        val (_, sourcesDB) = prepareSources()
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>?
         runBlocking {
@@ -861,47 +655,10 @@ class RepositoryTest {
 
     @Test
     fun get_sources_without_connection_and_items_caching_disabled() {
-        val sources = arrayListOf(
+        prepareSources()
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
 
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>?
         runBlocking {
@@ -915,47 +672,10 @@ class RepositoryTest {
 
     @Test
     fun get_sources_without_connection_and_sources_update_disabled() {
-        val sources = arrayListOf(
+        val (_, sourcesDB) = prepareSources()
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
 
         every { appSettingsService.isItemCachingEnabled() } returns true
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>?
         runBlocking {
@@ -969,47 +689,10 @@ class RepositoryTest {
 
     @Test
     fun get_sources_without_connection_and_items_caching_and_sources_update_disabled() {
-        val sources = arrayListOf(
+        val (_, sourcesDB) = prepareSources()
-            SelfossModel.Source(
-                1,
-                "First source",
-                listOf("Test", "second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SelfossModel.Source(
-                2,
-                "Second source",
-                listOf("second"),
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                "spouts\\rss\\fulltextrss",
-                "",
-                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-            )
-        )
 
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
-        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>?
         runBlocking {
@@ -1023,7 +706,7 @@ class RepositoryTest {
 
     @Test
     fun create_source() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
                 SuccessResponse(true)
 
         initializeRepository()
@@ -1045,7 +728,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any()
             )
         }
         assertSame(true, response)
@@ -1053,7 +735,7 @@ class RepositoryTest {
 
     @Test
     fun create_source_but_response_fails() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
                 SuccessResponse(false)
 
         initializeRepository()
@@ -1075,7 +757,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any()
             )
         }
         assertSame(false, response)
@@ -1083,7 +764,7 @@ class RepositoryTest {
 
     @Test
     fun create_source_without_connection() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
                 SuccessResponse(true)
 
         initializeRepository(MutableStateFlow(false))
@@ -1104,7 +785,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
                 any()
             )
         }
@@ -1305,16 +985,7 @@ class RepositoryTest {
         )
 
         initializeRepository()
-        repository.tagFilter = SelfossModel.Tag("Tag", "read", 0)
+        prepareSearch()
-        repository.sourceFilter = SelfossModel.Source(
-            1,
-            "First source",
-            listOf("Test", "second"),
-            "spouts\\rss\\fulltextrss",
-            "",
-            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        )
-        repository.searchFilter = "search"
         runBlocking {
             repository.tryToCacheItemsAndGetNewOnes()
         }
@@ -1328,16 +999,7 @@ class RepositoryTest {
                 StatusAndData(success = false, data = generateTestApiItem())
 
         initializeRepository()
-        repository.tagFilter = SelfossModel.Tag("Tag", "read", 0)
+        prepareSearch()
-        repository.sourceFilter = SelfossModel.Source(
-            1,
-            "First source",
-            listOf("Test", "second"),
-            "spouts\\rss\\fulltextrss",
-            "",
-            "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-        )
-        repository.searchFilter = "search"
         runBlocking {
             repository.tryToCacheItemsAndGetNewOnes()
         }
@@ -1351,8 +1013,18 @@ class RepositoryTest {
                 StatusAndData(success = false, data = generateTestApiItem())
 
         initializeRepository(MutableStateFlow(false))
-        repository.tagFilter = SelfossModel.Tag("Tag", "read", 0)
+        prepareSearch()
-        repository.sourceFilter = SelfossModel.Source(
+        runBlocking {
+            repository.tryToCacheItemsAndGetNewOnes()
+        }
+
+        coVerify(exactly = 0) { api.getItems(any(), 0, null, null, null, null, 200) }
+    }
+
+    private fun prepareSearch() {
+        repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
+        repository.setSourceFilter(
+            SelfossModel.Source(
                 1,
                 "First source",
                 listOf("Test", "second"),
@@ -1360,11 +1032,7 @@ class RepositoryTest {
                 "",
                 "d8c92cdb1ef119ea85c4b9205c879ca7.png"
             )
+        )
         repository.searchFilter = "search"
-        runBlocking {
-            repository.tryToCacheItemsAndGetNewOnes()
-        }
-
-        coVerify(exactly = 0) { api.getItems(any(), 0, null, null, null, null, 200) }
     }
 }

build.gradle.kts

@@ -11,12 +11,10 @@ plugins {
     id("com.android.library").version("7.3.1").apply(false)
     kotlin("android").version("1.7.20").apply(false)
     kotlin("multiplatform").version("1.7.20").apply(false)
-    id("org.sonarqube").version("3.4.0.2513").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
-apply(plugin = "org.sonarqube")
-
 allprojects {
     repositories {
         google()
@@ -30,3 +28,7 @@ allprojects {
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
+
+koverMerged {
+    enable()
+}

shared/build.gradle.kts

@@ -10,6 +10,7 @@ plugins {
     id("com.android.library")
     id("com.squareup.sqldelight")
     kotlin("plugin.serialization") version "1.4.10"
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 kotlin {

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt

@@ -1,15 +1,6 @@
 package bou.amine.apps.readerforselfossv2.model
 
-import bou.amine.apps.readerforselfossv2.utils.DateUtils
-import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.*
 
 class MercuryModel {
 
@@ -20,138 +11,4 @@ class MercuryModel {
         val lead_image_url: String?,
         val url: String
     )
-
-    @Serializable
-    data class Tag(
-        val tag: String,
-        val color: String,
-        val unread: Int
-    )
-
-    @Serializable
-    class Stats(
-        val total: Int,
-        val unread: Int,
-        val starred: Int
-    )
-
-    @Serializable
-    data class Spout(
-        val name: String,
-        val description: String
-    )
-
-    @Serializable
-    data class ApiVersion(
-        val version: String?,
-        val apiversion: String?
-    ) {
-        fun getApiMajorVersion() : Int {
-            var versionNumber = 0
-            if (apiversion != null) {
-                versionNumber = apiversion.substringBefore(".").toInt()
-            }
-            return versionNumber
-        }
-    }
-
-    @Serializable
-    data class Source(
-        val id: Int,
-        val title: String,
-        @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>,
-        val spout: String,
-        val error: String,
-        val icon: String?
-    )
-
-    @Serializable
-    data class Item(
-        val id: Int,
-        val datetime: String,
-        val title: String,
-        val content: String,
-        @Serializable(with = BooleanSerializer::class)
-        var unread: Boolean,
-        @Serializable(with = BooleanSerializer::class)
-        var starred: Boolean,
-        val thumbnail: String?,
-        val icon: String?,
-        val link: String,
-        val sourcetitle: String,
-        @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>
-    ) {
-        // TODO: maybe find a better way to handle these kind of urls
-        fun getLinkDecoded(): String {
-            var stringUrl: String
-            stringUrl =
-                if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
-                    if (link.contains("&amp;url=")) {
-                        link.substringAfter("&amp;url=")
-                    } else {
-                        this.link.replace("&amp;", "&")
-                    }
-                } else {
-                    this.link.replace("&amp;", "&")
-                }
-
-            // handle :443 => https
-            if (stringUrl.contains(":443")) {
-                stringUrl = stringUrl.replace(":443", "").replace("http://", "https://")
-            }
-
-            // handle url not starting with http
-            if (stringUrl.startsWith("//")) {
-                stringUrl = "http:$stringUrl"
-            }
-
-            return stringUrl
-        }
-
-        fun sourceAndDateText(): String =
-            this.sourcetitle.getHtmlDecoded() + DateUtils.parseRelativeDate(this.datetime)
-
-        fun toggleStar(): Item {
-            this.starred = !this.starred
-            return this
-        }
-    }
-
-    // TODO: this seems to be super slow.
-    object TagsListSerializer : KSerializer<List<String>> {
-        override fun deserialize(decoder: Decoder): List<String> {
-            return when(val json = ((decoder as JsonDecoder).decodeJsonElement())) {
-                is JsonArray -> json.toList().map { it.toString() }
-                else -> json.toString().split(",")
-            }
-
-        }
-
-        override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
-
-        override fun serialize(encoder: Encoder, value: List<String>) {
-            TODO("Not yet implemented")
-        }
-    }
-
-    object BooleanSerializer : KSerializer<Boolean> {
-        override fun deserialize(decoder: Decoder): Boolean {
-            val json = ((decoder as JsonDecoder).decodeJsonElement()).jsonPrimitive
-            return if (json.booleanOrNull != null) {
-                json.boolean
-            } else {
-                json.int == 1
-            }
-        }
-
-        override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN)
-
-        override fun serialize(encoder: Encoder, value: Boolean) {
-            TODO("Not yet implemented")
-        }
-    }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/ResultModel.kt

@@ -23,6 +23,14 @@ class StatusAndData<T>(val success: Boolean, val data: T? = null) {
     }
 }
 
+suspend fun responseOrSuccessIf404(r: HttpResponse): SuccessResponse {
+    return if (r.status === HttpStatusCode.NotFound) {
+        SuccessResponse(true)
+    } else {
+        maybeResponse(r)
+    }
+}
+
 suspend fun maybeResponse(r: HttpResponse): SuccessResponse {
     return if (r.status.isSuccess()) {
         r.body()

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
+    private var _tagFilter = MutableStateFlow<SelfossModel.Tag?>(null)
-    var sourceFilter: SelfossModel.Source? = 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,
+                tagFilter.value?.tag,
-                sourceFilter?.id?.toLong(),
+                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) {
+                if (tagFilter.value != null) {
-                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter!!.tag) }
+                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
                 }
-                if (sourceFilter != null) {
+                if (sourceFilter.value != null) {
-                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter!!.title }
+                    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,
+                tagFilter.value?.tag,
-                sourceFilter?.id?.toLong(),
+                sourceFilter.value?.id?.toLong(),
                 searchFilter,
                 null
             )
@@ -340,8 +342,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                 url,
                 spout,
                 tags,
-                filter,
+                filter
-                appSettingsService.getApiVersion()
             ).isSuccess == true
         }
 
@@ -373,12 +374,29 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                 val response = api.login()
                 result = response.isSuccess == true
             } catch (cause: Throwable) {
-                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.updateRemote")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.login")
             }
         }
         return result
     }
 
+    suspend fun logout() {
+        if (isNetworkAvailable()) {
+            try {
+                val response = api.logout()
+                if (response.isSuccess) {
+                    Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
+                }
+            } catch (cause: Throwable) {
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.logout")
+            } finally {
+                appSettingsService.clearAll()
+            }
+        } else {
+            appSettingsService.clearAll()
+        }
+    }
+
     fun refreshLoginInformation(url: String, login: String, password: String) {
         appSettingsService.refreshLoginInformation(url, login, password)
         baseUrl = url
@@ -489,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
+    }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt

@@ -2,17 +2,21 @@ package bou.amine.apps.readerforselfossv2.rest
 
 import bou.amine.apps.readerforselfossv2.model.*
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import io.github.aakira.napier.Napier
 import io.ktor.client.*
-import io.ktor.client.call.*
 import io.ktor.client.plugins.*
 import io.ktor.client.plugins.cache.*
 import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.plugins.cookies.*
 import io.ktor.client.plugins.logging.*
 import io.ktor.client.request.*
 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) {
@@ -20,7 +24,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     var client = createHttpClient()
 
     private fun createHttpClient(): HttpClient {
-        return HttpClient {
+        val client = HttpClient {
             install(ContentNegotiation) {
                 install(HttpCache)
                 json(Json {
@@ -32,7 +36,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             install(Logging) {
                 logger = object : Logger {
                     override fun log(message: String) {
-                        appSettingsService.logApiCalls(message)
+                        Napier.d(message, tag = "LogApiCalls")
                     }
                 }
                 level = LogLevel.INFO
@@ -40,22 +44,25 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             install(HttpTimeout) {
                 requestTimeoutMillis = appSettingsService.getApiTimeout()
             }
-            /* TODO: Auth as basic
+            install(HttpCookies)
-            if (apiDetailsService.getUserName().isNotEmpty() && apiDetailsService.getPassword().isNotEmpty()) {
+            install(HttpRequestRetry) {
-
+                maxRetries = 2
-                install(Auth) {
+                retryIf { _, response ->
-                    basic {
+                    response.status == HttpStatusCode.Forbidden && shouldHavePostLogin() && hasLoginInfo()
-                        credentials {
-                            BasicAuthCredentials(username = apiDetailsService.getUserName(), password = apiDetailsService.getPassword())
                 }
-                        sendWithoutRequest {
+                modifyRequest { _ ->
-                            true
+                    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")
                     }
                 }
             }
-            }*/
             expectSuccess = false
         }
+
+        return client
     }
 
     fun url(path: String) =
@@ -66,12 +73,43 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         client = createHttpClient()
     }
 
+    // Api version was introduces after the POST login, so when there is a version, it should be available
+    private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
+    private fun hasLoginInfo() = appSettingsService.getUserName() != null && appSettingsService.getPassword() != null
+
     suspend fun login(): SuccessResponse =
-        maybeResponse(client.get(url("/login")) {
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
+            if (shouldHavePostLogin()) {
+                postLogin()
+            } else {
+                getLogin()
+            }
+        } else {
+            SuccessResponse(true)
+        }
+
+    private suspend fun getLogin() = maybeResponse(client.get(url("/login")) {
         parameter("username", appSettingsService.getUserName())
         parameter("password", appSettingsService.getPassword())
     })
 
+    private suspend fun postLogin() = maybeResponse(client.post(url("/login")) {
+        parameter("username", appSettingsService.getUserName())
+        parameter("password", appSettingsService.getPassword())
+    })
+
+    private fun shouldHaveNewLogout() = appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
+    suspend fun logout(): SuccessResponse =
+        if (shouldHaveNewLogout()) {
+            doLogout()
+        } else {
+            maybeLogoutIfAvailable()
+        }
+
+    private suspend fun maybeLogoutIfAvailable() = responseOrSuccessIf404(client.get(url("/logout")))
+
+    private suspend fun doLogout() = maybeResponse(client.delete(url("/api/session/current")))
+
     suspend fun getItems(
         type: String,
         offset: Int,
@@ -82,8 +120,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         items: Int? = null
     ): StatusAndData<List<SelfossModel.Item>> =
         bodyOrFailure(client.get(url("/items")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
             parameter("type", type)
             parameter("tag", tag)
             parameter("source", source)
@@ -95,32 +135,42 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
 
     suspend fun stats(): StatusAndData<SelfossModel.Stats> =
         bodyOrFailure(client.get(url("/stats")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun tags(): StatusAndData<List<SelfossModel.Tag>> =
         bodyOrFailure(client.get(url("/tags")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun update(): StatusAndData<String> =
         bodyOrFailure(client.get(url("/update")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun spouts(): StatusAndData<Map<String, SelfossModel.Spout>> =
         bodyOrFailure(client.get(url("/sources/spouts")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun sources(): StatusAndData<ArrayList<SelfossModel.Source>> =
         bodyOrFailure(client.get(url("/sources/list")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun version(): StatusAndData<SelfossModel.ApiVersion> =
@@ -128,34 +178,44 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
 
     suspend fun markAsRead(id: String): SuccessResponse =
         maybeResponse(client.post(url("/mark/$id")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun unmarkAsRead(id: String): SuccessResponse =
         maybeResponse(client.post(url("/unmark/$id")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun starr(id: String): SuccessResponse =
         maybeResponse(client.post(url("/starr/$id")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun unstarr(id: String): SuccessResponse =
         maybeResponse(client.post(url("/unstarr/$id")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 
     suspend fun markAllAsRead(ids: List<String>): SuccessResponse =
         maybeResponse(client.submitForm(
             url = url("/mark"),
             formParameters = Parameters.build {
+                if (!shouldHavePostLogin()) {
                     append("username", appSettingsService.getUserName())
                     append("password", appSettingsService.getPassword())
+                }
                 ids.map { append("ids[]", it) }
             }
         ))
@@ -165,18 +225,18 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         url: String,
         spout: String,
         tags: String,
-        filter: String,
+        filter: String
-        version: Int
     ): SuccessResponse =
         maybeResponse(
-            if (version > 1) {
+            if (appSettingsService.getApiVersion() > 1) {
-                createSource2(title, url, spout, tags, filter)
+                createSource("tags[]", title, url, spout, tags, filter)
             } else {
-                createSource(title, url, spout, tags, filter)
+                createSource("tags", title, url, spout, tags, filter)
             }
         )
 
-    suspend fun createSource(
+    private suspend fun createSource(
+        tagsParamName: String,
         title: String,
         url: String,
         spout: String,
@@ -184,37 +244,25 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         filter: String
     ): HttpResponse =
         client.submitForm(
-            url = url("/source?username=${appSettingsService.getUserName()}&password=${appSettingsService.getPassword()}"),
+            url = url("/source"),
             formParameters = Parameters.build {
-                append("title", title)
+                if (!shouldHavePostLogin()) {
-                append("url", url)
+                    append("username", appSettingsService.getUserName())
-                append("spout", spout)
+                    append("password", appSettingsService.getPassword())
-                append("tags", tags)
-                append("filter", filter)
                 }
-        )
-
-    suspend fun createSource2(
-        title: String,
-        url: String,
-        spout: String,
-        tags: String,
-        filter: String
-    ): HttpResponse =
-        client.submitForm(
-            url = url("/source?username=${appSettingsService.getUserName()}&password=${appSettingsService.getPassword()}"),
-            formParameters = Parameters.build {
                 append("title", title)
                 append("url", url)
                 append("spout", spout)
-                append("tags[]", tags)
+                append(tagsParamName, tags)
                 append("filter", filter)
             }
         )
 
     suspend fun deleteSource(id: Int): SuccessResponse =
         maybeResponse(client.delete(url("/source/$id")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
+            }
         })
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt

@@ -27,7 +27,6 @@ class AppSettingsService {
     private var _notifyNewItems: Boolean? = null
     private var _itemsNumber: Int? = null
     private var _apiTimeout: Long? = null
-    private var _hiddenTags: List<String>? = null
     private var _refreshMinutes: Long = 360
     private var _markOnScroll: Boolean? = null
     private var _activeAlignment: Int? = null
@@ -36,6 +35,7 @@ class AppSettingsService {
     private var _staticBar: Boolean? = null
     private var _font: String = ""
     private var _theme: Int? = null
+    private var _enableAnalytics: Boolean? = null
 
 
     init {
@@ -43,10 +43,6 @@ class AppSettingsService {
         refreshUserSettings()
     }
 
-    fun logApiCalls(message: String) {
-        Napier.d(message, tag = "LogApiCalls")
-    }
-
     fun getApiVersion(): Int {
         if (_apiVersion == -1) {
             refreshApiVersion()
@@ -88,7 +84,13 @@ class AppSettingsService {
     }
 
     private fun refreshItemsNumber() {
-        _itemsNumber = settings.getString(API_ITEMS_NUMBER, "20").toInt()
+        _itemsNumber = try {
+            settings.getString(API_ITEMS_NUMBER, "20").toInt()
+        } catch (e: Exception) {
+            settings.remove(API_ITEMS_NUMBER)
+            20
+        }
+
     }
 
     fun getApiTimeout(): Long {
@@ -98,9 +100,21 @@ class AppSettingsService {
         return _apiTimeout!!
     }
 
+    private fun secToMs(n: Long) = n * 1000
+
     private fun refreshApiTimeout() {
-        val settingsTimeout = settings.getLong(API_TIMEOUT, HttpTimeout.INFINITE_TIMEOUT_MS)
+        _apiTimeout = secToMs(try {
-        _apiTimeout = if (settingsTimeout > 0) settingsTimeout else HttpTimeout.INFINITE_TIMEOUT_MS
+            val settingsTimeout = settings.getString(API_TIMEOUT, "60")
+            if (settingsTimeout.toLong() > 0) {
+                settingsTimeout.toLong()
+            } else {
+                settings.remove(API_TIMEOUT)
+                60
+            }
+        } catch (e: Exception) {
+            settings.remove(API_TIMEOUT)
+            60
+        })
     }
 
     private fun refreshBaseUrl() {
@@ -211,19 +225,6 @@ class AppSettingsService {
         return _refreshMinutes
     }
 
-    private fun refreshHiddenTags() {
-        if (settings.getString(HIDDEN_TAGS, "").isNotEmpty()) {
-            _hiddenTags = settings.getString(HIDDEN_TAGS, "").replace("\\s".toRegex(), "").split(",")
-        }
-    }
-
-    fun getHiddenTags(): List<String> {
-        if (_hiddenTags != null) {
-            refreshHiddenTags()
-        }
-        return _hiddenTags.orEmpty()
-    }
-
     private fun refreshInfiniteLoadingEnabled() {
         _infiniteLoading = settings.getBoolean(INFINITE_LOADING, false)
     }
@@ -308,6 +309,17 @@ class AppSettingsService {
         return _staticBar == true
     }
 
+    private fun refreshAnalyticsEnabled() {
+        _enableAnalytics = settings.getBoolean(ENABLE_ANALYTICS, true)
+    }
+
+    fun isAnalyticsEnabled(): Boolean {
+        if (_enableAnalytics != null) {
+            refreshAnalyticsEnabled()
+        }
+        return _enableAnalytics == true
+    }
+
     private fun refreshFont() {
         _font = settings.getString(READER_FONT, "")
     }
@@ -349,7 +361,6 @@ class AppSettingsService {
         refreshPeriodicRefreshEnabled()
         refreshRefreshWhenChargingOnlyEnabled()
         refreshRefreshMinutes()
-        refreshHiddenTags()
         refreshInfiniteLoadingEnabled()
         refreshItemCachingEnabled()
         refreshNotifyNewItemsEnabled()
@@ -359,6 +370,7 @@ class AppSettingsService {
         refreshFont()
         refreshStaticBarEnabled()
         refreshCurrentTheme()
+        refreshAnalyticsEnabled()
     }
 
     fun refreshLoginInformation(
@@ -452,12 +464,13 @@ class AppSettingsService {
 
         const val PERIODIC_REFRESH_MINUTES = "periodic_refresh_minutes"
 
-        const val HIDDEN_TAGS = "hidden_tags"
 
         const val INFINITE_LOADING = "infinite_loading"
 
         const val ITEMS_CACHING = "items_caching"
 
         const val CURRENT_THEME = "currentMode"
+
+        const val ENABLE_ANALYTICS = "enable_analytics"
     }
 }

sonar-project.properties

@@ -0,0 +1,5 @@
+sonar.projectKey=RFS2
+sonar.coverage.jacoco.xmlReportPaths=build/reports/kover/merged/xml/report.xml
+sonar.sourceEncoding=UTF-8
+sonar.sources=.
+sonar.exclusions=shared/src/iosArm64Main/**, shared/src/iosX64Main/**, docs/**