feat: Added confirmation dialog for disconnect item menu.

Co-authored-by: aminecmi <aminecmi@gmail.com>
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/143

.drone.yml

@@ -3,31 +3,35 @@ 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\npushCache=false\nmatomoUrl=\"$MATOMO_URL\"\nmatomoSite=\"$MATOMO_SITE\"\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
+      - 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 "Building..."
-      - ./gradlew build
+      - ./gradlew build -x test
       - echo "---------------------------------------------------------"
       - echo "Testing..."
       - echo "---------------------------------------------------------"
-      - ./gradlew test
+      - ./gradlew koverMergedXmlReport
     environment:
+      TZ: Europe/Paris
       SONAR_HOST_URL:
         from_secret: sonarScannerHostUrl
       SONAR_LOGIN:
         from_secret: sonarScannerLogin
-      MATOMO_URL:
-        from_secret: matomoUrl
-      MATOMO_SITE:
-        from_secret: matomoSite
+  - 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
@@ -39,14 +43,23 @@ type: docker
 name: Publish
 
 steps:
-  - name: createTag
+  - name: createTagAndChangelog
     image: ubuntu:latest
     commands:
       - apt-get update && apt-get install -y git
+      - git fetch --tags -p
+      - PREV=$(git describe --tags --abbrev=0)
       - ./build.sh --publish --from-ci
       - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
+      - VER=$(git describe --tags --abbrev=0)
+      - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+      - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+      - git add CHANGELOG.md
+      - git commit -m "Changelog for $VER [CI SKIP]"
+      - git push pushing master
       - git push pushing --tags
     environment:
+      TZ: Europe/Paris
       GITEA_USR:
         from_secret: giteaUsr
       GITEA_PASS:
@@ -72,10 +85,7 @@ steps:
         from_secret: privateKey
       command_timeout: 2m
       script:
-        - cd /home/ubuntu
-        - sudo rm -rf /var/www/amine/version.txt
-        - sudo chown www-data:www-data ./version.txt
-        - sudo mv version.txt /var/www/amine/
+        - cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
 
 trigger:
   event:
@@ -92,9 +102,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\nmatomoUrl=\"$MATOMO_URL\"\nmatomoSite=\"$MATOMO_SITE\"\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
@@ -111,14 +124,11 @@ steps:
       - echo "Verify"
       - $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
     environment:
+      TZ: Europe/Paris
       YOUR_KEYSTORE_PASSWORD:
         from_secret: keyPass
       YOUR_KEY_ALIAS:
         from_secret: keyAlias
-      MATOMO_URL:
-        from_secret: matomoUrl
-      MATOMO_SITE:
-        from_secret: matomoSite
 
   - name: gitea_release
     image: plugins/gitea-release
@@ -127,6 +137,27 @@ steps:
         from_secret: giteaAPI
       base_url: https://gitea.amine-louveau.fr
       files: signed.apk
+
+  - name: notify
+    image: drillster/drone-email
+    failure: ignore
+    settings:
+      host:
+        from_secret: smtpHOST
+      port:
+        from_secret: smtpPORT
+      username:
+        from_secret: smtpUSERNAME
+      password:
+        from_secret: smtpPASSWORD
+      from:
+        from_secret: smtpFROM
+      subject: Mapping file
+      recipients:
+        from_secret: smtpTO
+      recipients_only: true
+      skip_verify: true
+      attachment: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
 trigger:
   event:
     - tag

.github/CONTRIBUTING.md

@@ -46,27 +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)
-
-    - matomoUrl and matomoSite: url and siteId for a matomo instance
-
-### Examples:
-#### Inside ~/.gradle/gradle.properties
-
-```
-matomoUrl="URL" # It can be empty.
-matomoSite="1" # It can be empty, but needs to be an integer
-```
-
-#### As gradle parameters
-
-```
-./gradlew .... -P matomoUrl="URL" -P matomoSite="1"
-```

CHANGELOG.md

@@ -1,3 +1,195 @@
+**v123061651**
+
+- i18n: Translation update.
+- i18n: Translation update.
+- i18n: Translation update.
+- fix: avoid trying to open invalid image urls.
+- Changelog for v123051471 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123051471**
+
+- fix: images could be null.
+- fix: Check if color is not empty before parsing it.
+- chore: Removed unused log.
+- Changelog for v123051331 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123051331**
+
+- fix: illegal input.
+- Changelog for v123051321 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123051321**
+
+- debug: Debug null context.
+- Changelog for v123051301 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123051301**
+
+- feat: Basic auth from url. Fixes #142 (#143)
+- debug: Debug index out of bound exception.
+- Changelog for v123051211 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123051211**
+
+- fix: Sometimes url isn't even defined.
+- Changelog for v123041021 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123041021**
+
+- fix: 'Enable Core Library Desugaring to support older Android versions' (#138) from davidoskky/ReaderForSelfoss-multiplatform:desugaring into master
+- Enable Core Library Desugaring to support older Android versions
+- Changelog for v123030851 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123030851**
+
+- chore: replace textDrawable library (#136)
+- refactor: Remove slow login check. Closes #135.
+- ci: send the mapping file after a release.
+- Changelog for v123030751 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123030751**
+
+- debug: added a lot to pinpoint the url issue.
+- feat: Use /sources/stats in the home (#133)
+- Changelog for v123030681 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123030681**
+
+- fix: Unread and starred can be null.
+- Fixed version number issue.
+- Changelog for v123030621 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123030621**
+
+- fix: url required issue.
+- fix: Canvas reused issue.
+- Changelog for v123020572 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020572**
+
+- fix: requirecontext issues ?
+- debug: activity not found exception.
+- Changelog for v123020571 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020571**
+
+- chore: remove errors logging.
+- fix: quickfix for url param not provided for some sources.
+- Update 'CHANGELOG.md'
+- Changelog for v123020523 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020523**
+
+- fix: Git changelog.
+
+--------------------------------------------------------------------
+
+**v123020491**
+
+- fix: Fixed acra bug reporting.
+
+--------------------------------------------------------------------
+
+**v123010301**
+
+- Chore: acra config.
+
+--------------------------------------------------------------------
+
+**v123010281**
+
+- improvement: Improve right to left support (#130) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
+
+--------------------------------------------------------------------
+
+**v123010261**
+
+- feat: Handle public instances (#126) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
+- ci: Pull request should trigger ci.
+- fix: Complete the disconnection before redirecting to the login screen
+- Complete the disconnection before redirecting to the login screen
+
+--------------------------------------------------------------------
+
+**v123010241**
+
+- Merge pull request 'feat: swipe down to close images' (#122) from davidoskky/ReaderForSelfoss-multiplatform:swipe_down into master
+- Remove unnecessary definition
+- Remove unused import
+- Adjust the image closing animation
+- Add a dark hue to the underlying article when swiping to close images
+- Rename activity style to avoid interferences
+- Adapt the style of the image activity to the rest of the application
+- Resolve issues when swiping down to close images
+- Close the image fragment only if the image has been dragged down
+- Animate swipe down to close images
+- Swipe down to close images
+
+--------------------------------------------------------------------
+
+**v123010041**
+
+- Merge pull request 'scroll-tag-filters' (#124) from scroll-tag-filters into master
+- fix: added POST_NOTIFICATIONS to fix notifications issues.
+- fix: scrollable filter sheet.
+- enhancement: Ellipsize chips text.
+- Cleaning.
+
+--------------------------------------------------------------------
+
+**v122123641**
+
+- feat: Disable the failing source in the filter sheet.
+- feat: Display the source error in the sources list.
+
+--------------------------------------------------------------------
+
+**v122123631**
+
+- build: Added back maven repos (see https://gitlab.com/fdroid/fdroiddata/-/commit/1fb9d60dc58511abc2bb4eb321977922a0682c8b#note_1223925153)
+- build: Added back maven repos (see https://gitlab.com/fdroid/fdroiddata/-/commit/1fb9d60dc58511abc2bb4eb321977922a0682c8b#note_1223925153)
+- debug: trying to resolve `Canvas: trying to use a recycled bitmap`.
+- fix: NPE may be caused by the binding or the title that was null.
+- chore: Skip drone pipeline on changelog push.
+
+--------------------------------------------------------------------
+
+**v122123621**
+
+- fix: Automatic CHANGELOG generation.
+- Merge pull request 'Sources Upsert' (#119) from sources-edit into master
+- Source update screen.
+- Sources menu.
+- chore: Automatic CHANGELOG generation.
+
+--------------------------------------------------------------------
+
 # V2/Multiplatform rewrite
 
 **v1**

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 {
@@ -26,7 +28,7 @@ fun gitVersion(): String {
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
     process = if (maybeTagOfCurrentCommit.isEmpty()) {
         println("No tag on current commit. Will take the latest one.")
-        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
+        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
     } else {
         println("Tag found on current commit")
         execWithOutput("git -C ../ describe --contains HEAD")
@@ -54,6 +56,7 @@ fun versionNameFromGit(): String {
 
 android {
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         // Flag to enable support for the new language APIs
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
@@ -64,7 +67,7 @@ android {
         jvmTarget = "11"
     }
     compileSdk = 33
-    buildToolsVersion = "31.0.0"
+    buildToolsVersion = "33.0.0"
     buildFeatures {
         viewBinding = true
     }
@@ -83,9 +86,6 @@ android {
 
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField("String", "MATOMO_URL", properties["matomoUrl"] as String)
-        buildConfigField("String", "MATOMO_SITE", properties["matomoSite"] as String)
     }
     packagingOptions {
         resources {
@@ -113,10 +113,11 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
+
     implementation(project(":shared"))
     implementation("com.google.android.material:material:1.5.0")
     implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
 
     implementation("androidx.preference:preference-ktx:1.1.1")
@@ -132,7 +133,7 @@ dependencies {
     implementation("androidx.cardview:cardview:1.0.0")
     implementation("androidx.annotation:annotation:1.3.0")
     implementation("androidx.work:work-runtime-ktx:2.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("org.jsoup:jsoup:1.14.3")
 
     //multidex
@@ -144,14 +145,10 @@ dependencies {
 
     // Material-ish things
     implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
-    implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")
 
     // glide
-    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")
+    kapt("com.github.bumptech.glide:compiler:4.15.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.0")
 
     // Themes
     implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
@@ -179,7 +176,7 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
     // Network information
-     implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
+    implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
 
     // SQLDELIGHT
     implementation("com.squareup.sqldelight:android-driver:1.5.4")
@@ -190,8 +187,8 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
-    // Matomo
-    implementation("com.github.matomo-org:matomo-sdk-android:4.1.4")
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-toast:$acraVersion")
 }
 
 tasks.withType<Test> {

androidApp/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
@@ -52,7 +53,7 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity
-            android:name=".AddSourceActivity"
+            android:name=".UpsertSourceActivity"
             android:parentActivityName=".SourcesActivity"
             android:exported="true">
             <meta-data
@@ -69,7 +70,8 @@
             android:name=".ReaderActivity">
         </activity>
         <activity
-            android:name=".ImageActivity">
+            android:name=".ImageActivity"
+            android:theme="@style/Theme.AppCompat.ImageActivity">
         </activity>
 
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"
@@ -79,8 +81,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,16 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Intent
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.ImageView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.*
 import androidx.work.Constraints
@@ -29,6 +22,7 @@ import bou.amine.apps.readerforselfossv2.android.adapters.ItemListAdapter
 import bou.amine.apps.readerforselfossv2.android.adapters.ItemsAdapter
 import bou.amine.apps.readerforselfossv2.android.background.LoadingWorker
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityHomeBinding
+import bou.amine.apps.readerforselfossv2.android.fragments.FilterSheetFragment
 import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
@@ -36,45 +30,22 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.ItemType
-import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
-import bou.amine.apps.readerforselfossv2.utils.getIcon
-import bou.amine.apps.readerforselfossv2.utils.longHash
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
-import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.materialdrawer.holder.BadgeStyle
-import com.mikepenz.materialdrawer.holder.ColorHolder
-import com.mikepenz.materialdrawer.holder.StringHolder
-import com.mikepenz.materialdrawer.model.DividerDrawerItem
-import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
-import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.*
-import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import com.mikepenz.materialdrawer.util.addStickyFooterItem
-import com.mikepenz.materialdrawer.util.updateBadge
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 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.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
@@ -92,8 +63,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()
     }
@@ -101,7 +70,6 @@ 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?) {
@@ -109,8 +77,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         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)
 
@@ -121,14 +87,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()
 
@@ -149,17 +109,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
             lastFetchDone = false
-            handleDrawerItems()
             CoroutineScope(Dispatchers.Main).launch {
                 getElementsAccordingToTab()
                 binding.swipeRefreshLayout.isRefreshing = false
             }
         }
 
+        val swipeDirs = if (appSettingsService.getPublicAccess()) {
+            0
+        } else {
+            ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+        }
+
         val simpleItemTouchCallback =
             object : ItemTouchHelper.SimpleCallback(
                 0,
-                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+                swipeDirs
             ) {
                 override fun getSwipeDirs(
                     recyclerView: RecyclerView,
@@ -189,16 +154,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()
@@ -295,8 +250,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onResume() {
         super.onResume()
 
-        handleDrawerItems()
-
         reloadLayoutManager()
 
         if (appSettingsService.isInfiniteLoadingEnabled()) {
@@ -307,6 +260,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleBottomBarActions()
 
+        handleGDPRDialog(appSettingsService.settings.getBoolean("GDPR_shown", false))
+
         handleRecurringTask()
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -316,245 +271,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)
+
+    private fun handleGDPRDialog(GDPRShown: Boolean) {
+        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()
             }
-
-            override fun cancel(imageView: ImageView) {
-                Glide.with(this@HomeActivity).clear(imageView)
-            }
-        })
-
-        val drawerListener = object : DrawerLayout.DrawerListener {
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                // We do nothing
-            }
-
-            override fun onDrawerOpened(drawerView: View) {
-                binding.bottomBar.hide()
-            }
-
-            override fun onDrawerClosed(drawerView: View) {
-                binding.bottomBar.show()
-            }
-
-            override fun onDrawerStateChanged(newState: Int) {
-                // We do nothing
-            }
-
-        }
-
-        binding.drawerContainer.addDrawerListener(drawerListener)
-
-        // Sticky items
-        addStickyPrimaryItem(R.string.drawer_report_bug, R.drawable.ic_bug_report_black_24dp) { _, _, _ ->
-            val browserIntent =
-                Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-            startActivity(browserIntent)
-            false
-        }
-        addStickyPrimaryItem(R.string.title_activity_settings, R.drawable.ic_settings_black_24dp) { _, _, _ ->
-            settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
-            false
-        }
-    }
-
-    private fun addStickyPrimaryItem(name: Int, icon: Int, clickListener: ((v: View?, item: IDrawerItem<*>, position: Int) -> Boolean)?) {
-        binding.mainDrawer.addStickyFooterItem(
-            PrimaryDrawerItem().apply {
-                nameRes = name
-                iconRes = icon
-                isIconTinted = true
-                onDrawerItemClickListener = clickListener
-            })
-    }
-
-    private fun handleDrawerItems() {
-        tagsBadge = emptyMap()
-        binding.mainDrawer.itemAdapter.add(
-            PrimaryDrawerItem().apply {
-                nameRes = R.string.drawer_loading
-                isSelectable = false
-            }
-        )
-
-        CoroutineScope(Dispatchers.IO).launch {
-            val tags = repository.getTags()
-            val sources = repository.getSources()
-            runOnUiThread {
-                handleDrawerData(tags, sources)
-            }
-        }
-    }
-
-    private fun handleDrawerData(tags: List<SelfossModel.Tag>, sources: List<SelfossModel.Source>) {
-        binding.mainDrawer.itemAdapter.clear()
-
-        // Filters title with clear action
-        secondaryItem(withDivider = false, R.string.drawer_item_filters, DRAWER_ID_FILTERS, R.string.drawer_action_clear) { _,_,_ ->
-            repository.sourceFilter = null
-            repository.tagFilter = null
-            binding.mainDrawer.setSelectionAtPosition(-1)
-            getElementsAccordingToTab()
-            fetchOnEmptyList()
-            false
-        }
-
-        // Hidden tags
-        if (tags.isNotEmpty() && appSettingsService.getHiddenTags().isNotEmpty()) {
-            secondaryItem(
-                withDivider = true,
-                R.string.drawer_item_hidden_tags,
-                DRAWER_ID_HIDDEN_TAGS
-            )
-            handleHiddenTags(tags)
-        }
-
-        // Tags
-        secondaryItem(withDivider = true, R.string.drawer_item_tags, DRAWER_ID_TAGS)
-        if (tags.isEmpty()) {
-            binding.mainDrawer.itemAdapter.add(
-                SecondaryDrawerItem()
-                    .apply { nameRes = R.string.drawer_error_loading_tags; isSelectable = false }
-            )
-        } else {
-            handleTags(tags)
-        }
-
-        // Sources
-        secondaryItem(withDivider = true, R.string.drawer_item_sources, DRAWER_ID_SOURCES, R.string.drawer_action_edit) { v, _, _ ->
-            startActivity(Intent(v!!.context, SourcesActivity::class.java))
-            false
-        }
-        if (sources.isEmpty()) {
-            binding.mainDrawer.itemAdapter.add(
-                SecondaryDrawerItem().apply {
-                    nameRes = R.string.drawer_error_loading_sources
-                    isSelectable = false
-                }
-            )
-        } else {
-            handleSources(sources)
-        }
-
-        // About action
-        binding.mainDrawer.itemAdapter.add(
-            DividerDrawerItem(),
-            PrimaryDrawerItem().apply {
-                nameRes = R.string.action_about
-                isSelectable = false
-                iconRes = R.drawable.ic_info_outline_white_24dp
-                isIconTinted = true
-                onDrawerItemClickListener = { _,_,_ ->
-                    LibsBuilder()
-                        .withAboutIconShown(true)
-                        .withAboutVersionShown(true)
-                        .start(this@HomeActivity)
-                    false
-                }
-            }
-        )
-    }
-
-    private fun secondaryItem(withDivider: Boolean, name: Int, id: Long, badgeId: Int? = null, clickListener: ((v: View?, item: IDrawerItem<*>, position: Int) -> Boolean)? = null) {
-        if (withDivider) {
-            binding.mainDrawer.itemAdapter.add(DividerDrawerItem())
-        }
-
-        binding.mainDrawer.itemAdapter.add(
-            SecondaryDrawerItem().apply {
-                nameRes = name
-                identifier = id
-                isSelectable = false
-                if (badgeId != null) {
-                    badgeRes = badgeId
-                }
-                onDrawerItemClickListener = clickListener
-            }
-        )
-    }
-
-    private fun createDrawerItem(it: SelfossModel.Tag) {
-        val gd = GradientDrawable()
-        val gdColor = try {
-            Color.parseColor(it.color)
-        } catch (e: IllegalArgumentException) {
-            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)
+            alertDialog.show()
         }
     }
 
@@ -639,9 +371,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         })
     }
 
-    private fun fetchOnEmptyList() {
+    fun fetchOnEmptyList() {
         binding.recyclerView.doOnNextLayout {
-            // TODO: do if last element (or is empty ?)
             getElementsAccordingToTab(true)
         }
     }
@@ -680,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) {
@@ -761,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
@@ -793,6 +517,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.home_menu, menu)
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.readAll)
+            menu.removeItem(R.id.action_sources)
+        }
 
         val searchItem = menu.findItem(R.id.action_search)
         val searchView = searchItem.getActionView() as SearchView
@@ -813,14 +541,17 @@ 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()
-                    // TODO: Use Dispatchers.IO
                     CoroutineScope(Dispatchers.Main).launch {
                         val updatedRemote = repository.updateRemote()
                         if (updatedRemote) {
-                            // TODO: Send toast messages from the repository
                             Toast.makeText(
                                 this@HomeActivity,
                                 R.string.refresh_success_response, Toast.LENGTH_LONG
@@ -852,8 +583,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 ).show()
                                 tabNewBadge.removeBadge()
 
-                                handleDrawerItems()
-
                                 getElementsAccordingToTab()
                             } else {
                                 Toast.makeText(
@@ -870,10 +599,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 return true
             }
             R.id.action_disconnect -> {
-                appSettingsService.clearAll()
-                val intent = Intent(this, LoginActivity::class.java)
-                this.startActivity(intent)
-                this@HomeActivity.finish()
+                needsConfirmation(R.string.confirm_disconnect_title, R.string.confirm_disconnect_description) {
+                    runBlocking {
+                        repository.logout()
+                    }
+                    val intent = Intent(this, LoginActivity::class.java)
+                    this.startActivity(intent)
+                    finish()
+                }
+                return true
+            }
+            R.id.action_settings -> {
+                settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
+                return true
+            }
+            R.id.action_sources -> {
+                startActivity(Intent(this, SourcesActivity::class.java))
                 return true
             }
             else -> return super.onOptionsItemSelected(item)

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

@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -23,7 +24,6 @@ class ImageActivity : AppCompatActivity() {
         setContentView(view)
 
         setSupportActionBar(binding.toolBar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
@@ -31,12 +31,35 @@ class ImageActivity : AppCompatActivity() {
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(position, false)
+
+        val transitionListener = object : MotionLayout.TransitionListener {
+            override fun onTransitionStarted(motionLayout: MotionLayout?, startId: Int, endId: Int) {
+                // Nothing
+            }
+
+            override fun onTransitionChange(motionLayout: MotionLayout?, startId: Int, endId: Int, progress: Float
+            ) {
+                // Nothing
+            }
+
+            override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) {
+                if (motionLayout?.currentState == binding.root.endState) {
+                    onBackPressedDispatcher.onBackPressed()
+                    overridePendingTransition(0, 0)
+                }
+            }
+
+            override fun onTransitionTrigger(motionLayout: MotionLayout?, triggerId: Int, positive: Boolean, progress: Float) {
+                // Nothing
+            }
+        }
+        binding.root.setTransitionListener(transitionListener)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 return true
             }
         }

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

@@ -11,6 +11,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
@@ -22,14 +23,10 @@ import com.mikepenz.aboutlibraries.LibsBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.acra.ACRA
 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 {
@@ -40,18 +37,13 @@ class LoginActivity : AppCompatActivity(), DIAware {
     private lateinit var binding: ActivityLoginBinding
 
     override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
-    private val tracker : Tracker by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        TrackHelper.track().download().identifier(DownloadTracker.Extra.ApkChecksum(applicationContext))
-            .with(tracker)
-        TrackHelper.track().screen("/login").with(tracker)
-
         handleTheme()
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
@@ -64,6 +56,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
         handleBaseUrlFail()
 
         if (appSettingsService.getBaseUrl().isNotEmpty()) {
+            showProgress(true)
             goToMain()
         }
 
@@ -113,16 +106,8 @@ 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()
+            repository.updateApiInformation()
+            ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
         }
         val intent = Intent(this, HomeActivity::class.java)
         startActivity(intent)
@@ -149,13 +134,64 @@ class LoginActivity : AppCompatActivity(), DIAware {
         val login = binding.loginView.text.toString().trim()
         val password = binding.passwordView.text.toString().trim()
 
-        var cancel = false
-        var focusView: View? = null
+        failInvalidUrl(url)
+        failLoginDetails(password, login)
 
+        showProgress(true)
+
+        repository.refreshLoginInformation(url, login, password)
+
+        CoroutineScope(Dispatchers.Main).launch {
+            val result = repository.login()
+            if (result) {
+                val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                if (!errorFetching && !displaySelfossOnly) {
+                    goToMain()
+                } else {
+                    if (displaySelfossOnly) {
+                        Toast.makeText(
+                            applicationContext,
+                            R.string.application_selfoss_only,
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                    preferenceError()
+                }
+            } else {
+                preferenceError()
+            }
+            showProgress(false)
+        }
+    }
+
+    private fun failLoginDetails(
+        password: String,
+        login: String
+    ) {
+        var lastFocusedView: View? = null
+        var cancel = false
+        if (isWithLogin) {
+            if (TextUtils.isEmpty(password)) {
+                binding.passwordView.error = getString(R.string.error_invalid_password)
+                lastFocusedView = binding.passwordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(login)) {
+                binding.loginView.error = getString(R.string.error_field_required)
+                lastFocusedView = binding.loginView
+                cancel = true
+            }
+        }
+        maybeCancelAndFocusView(cancel, lastFocusedView)
+    }
+
+    private fun failInvalidUrl(url: String) {
+        val focusView = binding.urlView
+        var cancel = false
         if (url.isBaseUrlInvalid()) {
-            binding.urlView.error = getString(R.string.login_url_problem)
-            focusView = binding.urlView
             cancel = true
+            binding.urlView.error = getString(R.string.login_url_problem)
             inValidCount++
             if (inValidCount == 3) {
                 val alertDialog = AlertDialog.Builder(this).create()
@@ -169,39 +205,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
                 inValidCount = 0
             }
         }
+        maybeCancelAndFocusView(cancel, focusView)
+    }
 
-        if (isWithLogin) {
-            if (TextUtils.isEmpty(password)) {
-                binding.passwordView.error = getString(R.string.error_invalid_password)
-                focusView = binding.passwordView
-                cancel = true
-            }
-
-            if (TextUtils.isEmpty(login)) {
-                binding.loginView.error = getString(R.string.error_field_required)
-                focusView = binding.loginView
-                cancel = true
-            }
-        }
-
+    private fun maybeCancelAndFocusView(cancel: Boolean, focusView: View?) {
         if (cancel) {
             focusView?.requestFocus()
-        } else {
-            showProgress(true)
-
-            repository.refreshLoginInformation(url, login, password)
-
-            CoroutineScope(Dispatchers.IO).launch {
-                val result = repository.login()
-                if (result) {
-                    goToMain()
-                } else {
-                    CoroutineScope(Dispatchers.Main).launch {
-                        preferenceError()
-                    }
-                }
-            }
-            showProgress(false)
         }
     }
 
@@ -215,11 +224,11 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .alpha(
                 if (show) 0F else 1F
             ).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
+                }
             }
-        }
-        )
+            )
 
         binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
         binding.loginProgress
@@ -228,11 +237,11 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .alpha(
                 if (show) 1F else 0F
             ).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                }
             }
-        }
-        )
+            )
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {

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

@@ -3,10 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
-import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Build
-import android.widget.ImageView
 import android.widget.Toast
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -18,40 +15,45 @@ import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
 import bou.amine.apps.readerforselfossv2.repository.Repository
 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 {
 
     override val di by DI.lazy {
+        bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) }
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
+        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(BuildConfig.MATOMO_URL, BuildConfig.MATOMO_SITE.toInt()).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 tracker: Tracker by instance()
 
     // TODO: handle with the "previous" way
     private val isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(true)
@@ -60,28 +62,78 @@ class MyApp : MultiDexApplication(), DIAware {
         super.onCreate()
         Napier.base(DebugAntilog())
 
-        initDrawerImageLoader()
+        if (!ACRA.isACRASenderServiceProcess()) {
+            tryToHandleBug()
 
-        tryToHandleBug()
+            handleNotificationChannels()
 
-        handleNotificationChannels()
+            ProcessLifecycleOwner.get().lifecycle.addObserver(
+                AppLifeCycleObserver(
+                    connectivityStatus,
+                    repository
+                )
+            )
 
-        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
+            CoroutineScope(Dispatchers.Main).launch {
+                viewModel.networkAvailableProvider.collect { networkAvailable ->
+                    val toastMessage = if (networkAvailable) {
+                        repository.handleDBActions()
+                        R.string.network_connectivity_retrieved
+                    } else {
+                        R.string.network_connectivity_lost
+                    }
 
-        CoroutineScope(Dispatchers.Main).launch {
-            viewModel.networkAvailableProvider.collect { networkAvailable ->
-                val toastMessage = if (networkAvailable) {
-                    repository.handleDBActions()
-                    R.string.network_connectivity_retrieved
-                } else {
-                    R.string.network_connectivity_lost
+                    Toast.makeText(
+                        applicationContext,
+                        toastMessage,
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
+            }
+        }
 
-                Toast.makeText(
-                    applicationContext,
-                    toastMessage,
-                    Toast.LENGTH_SHORT
-                ).show()
+        repository.migrate(driverFactory)
+    }
+
+    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 = "qMEscjj89Gwt6cPR"
+                basicAuthPassword = "Yo58QFlGzFaWlBzP"
+                httpMethod = HttpSender.Method.POST
             }
         }
     }
@@ -96,32 +148,17 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel = NotificationChannel(AppSettingsService.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
+            val newItemsChannelmChannel = NotificationChannel(
+                AppSettingsService.newItemsChannelId,
+                newItemsChannelname,
+                newItemsChannelimportance
+            )
 
             notificationManager.createNotificationChannel(mChannel)
             notificationManager.createNotificationChannel(newItemsChannelmChannel)
         }
     }
 
-    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()
 
@@ -129,13 +166,17 @@ class MyApp : MultiDexApplication(), DIAware {
             if (e is NoClassDefFoundError && e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
                 }) {
+                // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
+    class AppLifeCycleObserver(
+        val connectivityStatus: ConnectivityStatus,
+        val repository: Repository
+    ) : DefaultLifecycleObserver {
 
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)

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

@@ -30,6 +30,8 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
     private lateinit var binding: ActivityReaderBinding
 
+    private var allItems: ArrayList<SelfossModel.Item> = ArrayList()
+
     override val di by closestDI()
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
@@ -61,13 +63,19 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        if (allItems.isEmpty()) {
+        currentItem = intent.getIntExtra("currentItem", 0)
+
+        allItems = repository.getReaderItems()
+
+        if (allItems.isEmpty() || currentItem > allItems.size) {
             finish()
         }
 
-        currentItem = intent.getIntExtra("currentItem", 0)
-
-        readItem(allItems[currentItem])
+        try {
+            readItem(allItems[currentItem])
+        } catch (e: IndexOutOfBoundsException) {
+            finish()
+        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
@@ -80,7 +88,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     }
 
     private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled()) {
+        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
@@ -133,28 +141,34 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
-        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
-            canRemoveFromFavorite()
-        } else {
-            canFavorite()
-        }
         alignmentMenu()
 
-        binding.pager.registerOnPageChangeCallback(
-            object : ViewPager2.OnPageChangeCallback() {
-
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-
-                    if (allItems[position].starred) {
-                        canRemoveFromFavorite()
-                    } else {
-                        canFavorite()
-                    }
-                    readItem(allItems[position])
-                }
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.star)
+        } else {
+            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+                canRemoveFromFavorite()
+            } else {
+                canFavorite()
             }
-        )
+
+
+            binding.pager.registerOnPageChangeCallback(
+                object : ViewPager2.OnPageChangeCallback() {
+
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+
+                        if (allItems[position].starred) {
+                            canRemoveFromFavorite()
+                        } else {
+                            canFavorite()
+                        }
+                        readItem(allItems[position])
+                    }
+                }
+            )
+        }
 
         return true
     }
@@ -173,20 +187,18 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 return true
             }
             R.id.star -> {
                 if (allItems[binding.pager.currentItem].starred) {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.unstarr(allItems[binding.pager.currentItem])
-                        // TODO: Handle failure
                     }
                     afterUnsave()
                 } else {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.starr(allItems[binding.pager.currentItem])
-                        // TODO: Handle failure
                     }
                     afterSave()
                 }
@@ -214,8 +226,4 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         startActivity(intent)
         overridePendingTransition(0, 0)
     }
-
-    companion object {
-        var allItems: ArrayList<SelfossModel.Item> = ArrayList()
-    }
 }

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

@@ -49,13 +49,13 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         super.onResume()
         val mLayoutManager = LinearLayoutManager(this)
 
-        var items: ArrayList<SelfossModel.Source>
+        var items: ArrayList<SelfossModel.SourceDetail>
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
         CoroutineScope(Dispatchers.Main).launch {
-            val response = repository.getSources()
+            val response = repository.getSourcesDetails()
             if (response.isNotEmpty()) {
                 items = response
                 val mAdapter = SourcesListAdapter(
@@ -73,7 +73,7 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         }
 
         binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
         }
     }
 }

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

@@ -3,12 +3,15 @@ package bou.amine.apps.readerforselfossv2.android
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.widget.ConstraintLayout
-import bou.amine.apps.readerforselfossv2.android.databinding.ActivityAddSourceBinding
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
 import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
 import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import kotlinx.coroutines.CoroutineScope
@@ -19,38 +22,59 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 
-class AddSourceActivity : AppCompatActivity(), DIAware {
+class UpsertSourceActivity : AppCompatActivity(), DIAware {
 
+    private var existingSource: SelfossModel.SourceDetail? = null
     private var mSpoutsValue: String? = null
 
-    private lateinit var binding: ActivityAddSourceBinding
+    private lateinit var binding: ActivityUpsertSourceBinding
 
     override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityAddSourceBinding.inflate(layoutInflater)
+        binding = ActivityUpsertSourceBinding.inflate(layoutInflater)
         val view = binding.root
 
+        existingSource = repository.getSelectedSource()
+        if (existingSource != null) {
+            binding.formContainer.visibility = View.GONE
+            binding.progress.visibility = View.VISIBLE
+        }
+        val title = if (existingSource == null) R.string.add_source else R.string.update_source
+
+        supportFragmentManager.addOnBackStackChangedListener {
+            if (supportFragmentManager.backStackEntryCount == 0) {
+                setTitle(title)
+            }
+        }
+
         setContentView(view)
 
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.title = resources.getString(title)
 
-        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
+
+        maybeGetDetailsFromIntentSharing(intent)
 
         binding.saveBtn.setOnClickListener {
-            handleSaveSource(
-                binding.tags,
-                binding.nameInput.text.toString(),
-                binding.sourceUri.text.toString()
-            )
+            handleSaveSource()
         }
     }
 
+    private fun initFields(items: Map<String, SelfossModel.Spout>) {
+        binding.nameInput.setText(existingSource!!.title)
+        binding.tags.setText(existingSource!!.tags?.joinToString(", "))
+        binding.sourceUri.setText(existingSource!!.params?.url)
+        binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout))
+        binding.progress.visibility = View.GONE
+        binding.formContainer.visibility = View.VISIBLE
+    }
+
     override fun onResume() {
         super.onResume()
 
@@ -58,17 +82,13 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
         if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
             mustLoginToAddSource()
         } else {
-            handleSpoutsSpinner(binding.spoutsSpinner, binding.progress, binding.formContainer)
+            handleSpoutsSpinner()
         }
     }
 
-    private fun handleSpoutsSpinner(
-        spoutsSpinner: Spinner,
-        mProgress: ProgressBar,
-        formContainer: ConstraintLayout
-    ) {
+    private fun handleSpoutsSpinner() {
         val spoutsKV = HashMap<String, String>()
-        spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        binding.spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
                 if (view != null) {
                     val spoutName = (view as TextView).text.toString()
@@ -84,11 +104,11 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
 
         fun handleSpoutFailure(networkIssue: Boolean = false) {
             Toast.makeText(
-                this@AddSourceActivity,
+                this@UpsertSourceActivity,
                 if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
                 Toast.LENGTH_SHORT
             ).show()
-            mProgress.visibility = View.GONE
+            binding.progress.visibility = View.GONE
         }
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -100,17 +120,21 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
                         spoutsKV[value.name] = key
                     }
 
-                    mProgress.visibility = View.GONE
-                    formContainer.visibility = View.VISIBLE
+                    binding.progress.visibility = View.GONE
+                    binding.formContainer.visibility = View.VISIBLE
 
                     val spinnerArrayAdapter =
                         ArrayAdapter(
-                            this@AddSourceActivity,
+                            this@UpsertSourceActivity,
                             android.R.layout.simple_spinner_item,
                             itemsStrings
                         )
                     spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                    spoutsSpinner.adapter = spinnerArrayAdapter
+                    binding.spoutsSpinner.adapter = spinnerArrayAdapter
+
+                    if (existingSource != null) {
+                        initFields(items)
+                    }
                 } else {
                     handleSpoutFailure()
                 }
@@ -121,13 +145,11 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
     }
 
     private fun maybeGetDetailsFromIntentSharing(
-        intent: Intent,
-        sourceUri: EditText,
-        nameInput: EditText
+        intent: Intent
     ) {
         if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
-            sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
-            nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+            binding.sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
+            binding.nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
         }
     }
 
@@ -138,7 +160,8 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
         finish()
     }
 
-    private fun handleSaveSource(tags: EditText, title: String, url: String) {
+    private fun handleSaveSource() {
+        val url = binding.sourceUri.text.toString()
 
         val sourceDetailsUnavailable =
             title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
@@ -149,18 +172,27 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
             }
             else -> {
                 CoroutineScope(Dispatchers.Main).launch {
-                    val successfullyAddedSource = repository.createSource(
-                        title,
-                        url,
-                        mSpoutsValue!!,
-                        tags.text.toString(),
-                        "",
-                    )
+                    val successfullyAddedSource = if (existingSource != null) {
+                        repository.updateSource(
+                            existingSource!!.id,
+                            binding.nameInput.text.toString(),
+                            url,
+                            mSpoutsValue!!,
+                            binding.tags.text.toString()
+                        )
+                    } else {
+                        repository.createSource(
+                            binding.nameInput.text.toString(),
+                            url,
+                            mSpoutsValue!!,
+                            binding.tags.text.toString(),
+                        )
+                    }
                     if (successfullyAddedSource) {
                         finish()
                     } else {
                         Toast.makeText(
-                            this@AddSourceActivity,
+                            this@UpsertSourceActivity,
                             R.string.cant_create_source,
                             Toast.LENGTH_SHORT
                         ).show()
@@ -169,4 +201,9 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
             }
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        repository.unsetSelectedSource()
+    }
 }

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

@@ -9,10 +9,9 @@ import android.widget.ImageView.ScaleType
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
-import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
@@ -22,8 +21,6 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
-import com.amulyakhare.textdrawable.TextDrawable
-import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -38,7 +35,6 @@ class ItemCardAdapter(
     override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
     private val c: Context = app.baseContext
-    private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val imageMaxHeight: Int =
         c.resources.getDimension(R.dimen.card_image_max_height).toInt()
 
@@ -56,13 +52,17 @@ class ItemCardAdapter(
             val itm = items[position]
 
             binding.favButton.isSelected = itm.starred
+            if (appSettingsService.getPublicAccess()) {
+                binding.favButton.visibility = View.GONE
+            }
+
             binding.title.text = itm.title.getHtmlDecoded()
 
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()
 
             if (!appSettingsService.isFullHeightCardsEnabled()) {
                 binding.itemImage.maxHeight = imageMaxHeight
@@ -79,16 +79,9 @@ class ItemCardAdapter(
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                val color = generator.getColor(itm.title.getHtmlDecoded())
-
-                val drawable =
-                    TextDrawable
-                        .builder()
-                        .round()
-                        .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-                binding.sourceImage.setImageDrawable(drawable)
+                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
             } else {
-                c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
+                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
             }
         }
     }
@@ -132,8 +125,8 @@ class ItemCardAdapter(
 
         private fun handleLinkOpening() {
             binding.root.setOnClickListener {
+                repository.setReaderItems(items)
                 c.openItemUrl(
-                    items,
                     bindingAdapterPosition,
                     items[bindingAdapterPosition].getLinkDecoded(),
                     appSettingsService.isArticleViewerEnabled(),

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

@@ -7,10 +7,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
-import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
-import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -18,8 +16,6 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
-import com.amulyakhare.textdrawable.TextDrawable
-import com.amulyakhare.textdrawable.util.ColorGenerator
 import org.kodein.di.DI
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
@@ -29,7 +25,6 @@ class ItemListAdapter(
     override var items: ArrayList<SelfossModel.Item>,
     override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
-    private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val c: Context = app.baseContext
 
     override val di: DI by closestDI(app)
@@ -51,25 +46,17 @@ class ItemListAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
 
                 if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                    val color = generator.getColor(itm.title.getHtmlDecoded())
-
-                    val drawable =
-                            TextDrawable
-                                    .builder()
-                                    .round()
-                                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-
-                    binding.itemImage.setImageDrawable(drawable)
+                    binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
                 } else {
-                    c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
                 }
             } else {
-                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage)
             }
         }
     }
@@ -84,8 +71,8 @@ class ItemListAdapter(
 
         private fun handleLinkOpening() {
             binding.root.setOnClickListener {
+                repository.setReaderItems(items)
                 c.openItemUrl(
-                    items,
                     bindingAdapterPosition,
                     items[bindingAdapterPosition].getLinkDecoded(),
                     appSettingsService.isArticleViewerEnabled(),

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

@@ -36,9 +36,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                 Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    unreadItemAtIndex(item, position, false)
-                }
+                unreadItemAtIndex(item, position, false)
             }
 
         val view = s.view

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

@@ -2,22 +2,22 @@ package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
-import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
-import com.amulyakhare.textdrawable.TextDrawable
-import com.amulyakhare.textdrawable.util.ColorGenerator
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -28,10 +28,9 @@ import org.kodein.di.instance
 
 class SourcesListAdapter(
     private val app: Activity,
-    private val items: ArrayList<SelfossModel.Source>
+    private val items: ArrayList<SelfossModel.SourceDetail>
 ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(), DIAware {
     private val c: Context = app.baseContext
-    private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private lateinit var binding: SourceListItemBinding
 
     override val di: DI by closestDI(app)
@@ -46,16 +45,16 @@ class SourcesListAdapter(
         val itm = items[position]
 
         if (itm.getIcon(repository.baseUrl).isEmpty()) {
-            val color = generator.getColor(itm.title.getHtmlDecoded())
-
-            val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-            binding.itemImage.setImageDrawable(drawable)
+            binding.itemImage.setBackgroundAndText(itm.title.getHtmlDecoded())
         } else {
-            c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+            c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+        }
+
+        if (!itm.error.isNullOrBlank()) {
+            binding.errorText.visibility = View.VISIBLE
+            binding.errorText.text = itm.error
+        } else {
+            binding.errorText.visibility = View.GONE
         }
 
         binding.sourceTitle.text = itm.title.getHtmlDecoded()
@@ -78,9 +77,9 @@ class SourcesListAdapter(
             val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
 
             deleteBtn.setOnClickListener {
-                val (id) = items[bindingAdapterPosition]
+                val (id, title) = items[bindingAdapterPosition]
                 CoroutineScope(Dispatchers.IO).launch {
-                    val successfullyDeletedSource = repository.deleteSource(id)
+                    val successfullyDeletedSource = repository.deleteSource(id, title)
                     if (successfullyDeletedSource) {
                         items.removeAt(bindingAdapterPosition)
                         notifyItemRemoved(bindingAdapterPosition)
@@ -94,6 +93,14 @@ class SourcesListAdapter(
                     }
                 }
             }
+
+            mView.setOnClickListener {
+                val source = items[bindingAdapterPosition]
+
+                repository.setSelectedSource(source)
+                app.startActivity(Intent(app, UpsertSourceActivity::class.java))
+
+            }
         }
     }
 }

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

@@ -26,85 +26,89 @@ import org.kodein.di.instance
 import java.util.*
 import kotlin.concurrent.schedule
 
-class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {
+class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params),
+    DIAware {
 
     override val di by lazy { (applicationContext as MyApp).di }
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
 
-override fun doWork(): Result {
-    if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+    override fun doWork(): Result {
+        if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
 
-        CoroutineScope(Dispatchers.IO).launch {
-            val notificationManager =
-                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            CoroutineScope(Dispatchers.IO).launch {
+                val notificationManager =
+                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-            val notification =
-                NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
-                    .setContentTitle(context.getString(R.string.loading_notification_title))
-                    .setContentText(context.getString(R.string.loading_notification_text))
-                    .setOngoing(true)
-                    .setPriority(PRIORITY_LOW)
-                    .setChannelId(AppSettingsService.syncChannelId)
-                    .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+                val notification =
+                    NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
+                        .setContentTitle(context.getString(R.string.loading_notification_title))
+                        .setContentText(context.getString(R.string.loading_notification_text))
+                        .setOngoing(true)
+                        .setPriority(PRIORITY_LOW)
+                        .setChannelId(AppSettingsService.syncChannelId)
+                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
-            notificationManager.notify(1, notification.build())
+                notificationManager.notify(1, notification.build())
 
-            repository.handleDBActions()
+                repository.handleDBActions()
 
-            val apiItems = repository.tryToCacheItemsAndGetNewOnes()
-            if (appSettingsService.isNotifyNewItemsEnabled()) {
-                launch {
-                    handleNewItemsNotification(apiItems, notificationManager)
+                val apiItems = repository.tryToCacheItemsAndGetNewOnes()
+                if (appSettingsService.isNotifyNewItemsEnabled()) {
+                    launch {
+                        handleNewItemsNotification(apiItems, notificationManager)
+                    }
                 }
+                apiItems.map { it.preloadImages(context) }
             }
-            apiItems.map { it.preloadImages(context) }
         }
+        return Result.success()
     }
-    return Result.success()
-}
 
     private fun handleNewItemsNotification(
         newItems: List<SelfossModel.Item>?,
         notificationManager: NotificationManager
     ) {
-        // TODO: Check if this coroutine is actually required
         CoroutineScope(Dispatchers.IO).launch {
-                val apiItems = newItems.orEmpty()
+            val apiItems = newItems.orEmpty()
 
 
-                val newSize = apiItems.filter { it.unread }.size
-                if (newSize > 0) {
+            val newSize = apiItems.filter { it.unread }.size
+            if (newSize > 0) {
 
-                    val intent = Intent(context, MainActivity::class.java).apply {
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                    }
-                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        PendingIntent.FLAG_IMMUTABLE
-                    } else {
-                        0
-                    }
-                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
-
-                    val newItemsNotification =
-                        NotificationCompat.Builder(applicationContext, AppSettingsService.newItemsChannelId)
-                            .setContentTitle(context.getString(R.string.new_items_notification_title))
-                            .setContentText(
-                                context.getString(
-                                    R.string.new_items_notification_text,
-                                    newSize
-                                )
-                            )
-                            .setPriority(PRIORITY_DEFAULT)
-                            .setChannelId(AppSettingsService.newItemsChannelId)
-                            .setContentIntent(pendingIntent)
-                            .setAutoCancel(true)
-                            .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
-
-                    Timer("", false).schedule(4000) {
-                        notificationManager.notify(2, newItemsNotification.build())
-                    }
+                val intent = Intent(context, MainActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                 }
+                val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    PendingIntent.FLAG_IMMUTABLE
+                } else {
+                    0
+                }
+                val pendingIntent: PendingIntent =
+                    PendingIntent.getActivity(context, 0, intent, pflags)
+
+                val newItemsNotification =
+                    NotificationCompat.Builder(
+                        applicationContext,
+                        AppSettingsService.newItemsChannelId
+                    )
+                        .setContentTitle(context.getString(R.string.new_items_notification_title))
+                        .setContentText(
+                            context.getString(
+                                R.string.new_items_notification_text,
+                                newSize
+                            )
+                        )
+                        .setPriority(PRIORITY_DEFAULT)
+                        .setChannelId(AppSettingsService.newItemsChannelId)
+                        .setContentIntent(pendingIntent)
+                        .setAutoCancel(true)
+                        .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
+
+                Timer("", false).schedule(4000) {
+                    notificationManager.notify(2, newItemsNotification.build())
+                }
+            }
             Timer("", false).schedule(4000) {
                 notificationManager.cancel(1)
             }

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

@@ -1,5 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
@@ -16,7 +17,6 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.res.ResourcesCompat
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.ImageActivity
@@ -25,9 +25,12 @@ 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.isUrlValid
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
+import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
@@ -49,11 +52,14 @@ 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
 
 
+private const val IMAGE_JPG = "image/jpg"
+
 class ArticleFragment : Fragment(), DIAware {
     private var fontSize: Int = 16
     private lateinit var item: SelfossModel.Item
@@ -62,13 +68,12 @@ class ArticleFragment : Fragment(), DIAware {
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
-    private lateinit var allImages : ArrayList<String>
+    private lateinit var allImages: ArrayList<String>
     private lateinit var fab: FloatingActionButton
     private lateinit var textAlignment: String
-    private var _binding: FragmentArticleBinding? = null
-    private val binding get() = _binding!!
+    private lateinit var binding: FragmentArticleBinding
 
-    override val di : DI by closestDI()
+    override val di: DI by closestDI()
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
@@ -77,7 +82,7 @@ class ArticleFragment : Fragment(), DIAware {
     private var font = ""
     private var staticBar = false
 
-    private val mercuryApi : MercuryApi by instance()
+    private val mercuryApi: MercuryApi by instance()
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -94,29 +99,19 @@ class ArticleFragment : Fragment(), DIAware {
         savedInstanceState: Bundle?
     ): View {
         try {
-            _binding = FragmentArticleBinding.inflate(inflater, container, false)
+            binding = FragmentArticleBinding.inflate(inflater, container, false)
 
             url = item.getLinkDecoded()
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = item.sourceAndDateText()
+            contentSource = item.sourceAuthorAndDate()
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()
             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
@@ -125,48 +120,7 @@ class ArticleFragment : Fragment(), DIAware {
 
             fab.rippleColor = resources.getColor(R.color.colorAccentDark)
 
-            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
-            floatingToolbar.attachFab(fab)
-
-            floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
-
-            floatingToolbar.setClickListener(
-                object : FloatingToolbar.ItemClickListener {
-                    override fun onItemClick(item: MenuItem) {
-                        when (item.itemId) {
-                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-                            R.id.unread_action -> if (context != null) {
-                                if (this@ArticleFragment.item.unread) {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.markAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = false
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_read,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                } else {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.unmarkAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = true
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                }
-                            }
-                            else -> Unit
-                        }
-                    }
-
-                    override fun onItemLongClick(item: MenuItem?) {
-                    }
-                }
-            )
+            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()
 
             if (staticBar) {
                 fab.hide()
@@ -178,28 +132,7 @@ class ArticleFragment : Fragment(), DIAware {
                 binding.source.typeface = typeface
             }
 
-            if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury()
-            } else {
-                binding.titleView.text = contentTitle
-                if (typeface != null) {
-                    binding.titleView.typeface = typeface
-                }
-
-                htmlToWebview()
-
-                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                    binding.imageView.visibility = View.VISIBLE
-                    Glide
-                        .with(requireContext())
-                        .asBitmap()
-                        .load(contentImage)
-                        .apply(RequestOptions.fitCenterTransform())
-                        .into(binding.imageView)
-                } else {
-                    binding.imageView.visibility = View.GONE
-                }
-            }
+            handleContent()
 
             binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
@@ -217,24 +150,100 @@ class ArticleFragment : Fragment(), DIAware {
             )
 
         } catch (e: InflateException) {
-            AlertDialog.Builder(requireContext())
-                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                .setPositiveButton(android.R.string.ok
-                ) { _, _ ->
-                    appSettingsService.disableArticleViewer()
-                    requireActivity().finish()
-                }
-                .create()
-                .show()
+            e.sendSilentlyWithAcraWithName("webview not available")
+            if (context != null) {
+                AlertDialog.Builder(requireContext())
+                    .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                    .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                    .setPositiveButton(
+                        android.R.string.ok
+                    ) { _, _ ->
+                        appSettingsService.disableArticleViewer()
+                        requireActivity().finish()
+                    }
+                    .create()
+                    .show()
+            }
         }
 
         return binding.root
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private fun handleContent() {
+        if (contentText.isEmptyOrNullOrNullString()) {
+            if (repository.isNetworkAvailable()) {
+                getContentFromMercury()
+            }
+        } else {
+            binding.titleView.text = contentTitle
+            if (typeface != null) {
+                binding.titleView.typeface = typeface
+            }
+
+            htmlToWebview()
+
+            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                binding.imageView.visibility = View.VISIBLE
+                Glide
+                    .with(requireContext())
+                    .asBitmap()
+                    .load(contentImage)
+                    .apply(RequestOptions.fitCenterTransform())
+                    .into(binding.imageView)
+            } else {
+                binding.imageView.visibility = View.GONE
+            }
+        }
+    }
+
+    private fun handleFloatingToolbar(): FloatingToolbar {
+        val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+        if (appSettingsService.getPublicAccess()) {
+            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
+        }
+        floatingToolbar.attachFab(fab)
+
+        floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
+
+        floatingToolbar.setClickListener(
+            object : FloatingToolbar.ItemClickListener {
+                override fun onItemClick(item: MenuItem) {
+                    when (item.itemId) {
+                        R.id.share_action -> requireActivity().shareLink(url, contentTitle)
+                        R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+                        R.id.unread_action -> if (context != null) {
+                            if (this@ArticleFragment.item.unread) {
+                                CoroutineScope(Dispatchers.IO).launch {
+                                    repository.markAsRead(this@ArticleFragment.item)
+                                }
+                                this@ArticleFragment.item.unread = false
+                                Toast.makeText(
+                                    context,
+                                    R.string.marked_as_read,
+                                    Toast.LENGTH_LONG
+                                ).show()
+                            } else {
+                                CoroutineScope(Dispatchers.IO).launch {
+                                    repository.unmarkAsRead(this@ArticleFragment.item)
+                                }
+                                this@ArticleFragment.item.unread = true
+                                Toast.makeText(
+                                    context,
+                                    R.string.marked_as_unread,
+                                    Toast.LENGTH_LONG
+                                ).show()
+                            }
+                        }
+                        else -> Unit
+                    }
+                }
+
+                override fun onItemLongClick(item: MenuItem?) {
+                    // We do nothing
+                }
+            }
+        )
+        return floatingToolbar
     }
 
     private fun refreshAlignment() {
@@ -246,179 +255,195 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury() {
-        if (repository.isNetworkAvailable()) {
-            binding.progressBar.visibility = View.VISIBLE
+        binding.progressBar.visibility = View.VISIBLE
 
-            CoroutineScope(Dispatchers.Main).launch {
-                 val response = mercuryApi.query(url)
-                if (response.success) {
-                    try {
-                        if (response.data != null && response.data!!.content != null && !response.data!!.content.isNullOrEmpty()) {
-                            try {
-                                binding.titleView.text = response.data!!.title
-                                if (typeface != null) {
-                                    binding.titleView.typeface = 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.
-                                }
-                            } catch (e: Exception) {
-                            }
-
-                            try {
-                                contentText = response.data!!.content.orEmpty()
-                                htmlToWebview()
-                            } catch (e: Exception) {
-                            }
-
-                            try {
-                                if (response.data!!.lead_image_url != null && !response.data!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                    binding.imageView.visibility = View.VISIBLE
-                                    try {
-                                        Glide
-                                            .with(requireContext())
-                                            .asBitmap()
-                                            .load(
-                                                response.data!!.lead_image_url.orEmpty()
-                                            )
-                                            .apply(RequestOptions.fitCenterTransform())
-                                            .into(binding.imageView)
-                                    } catch (e: Exception) {
-                                    }
-                                } else {
-                                    binding.imageView.visibility = View.GONE
-                                }
-                            } catch (e: Exception) {
-                                if (context != null) {
-                                }
-                            }
-
-                            try {
-                                binding.nestedScrollView.scrollTo(0, 0)
-
-                                binding.progressBar.visibility = View.GONE
-                            } catch (e: Exception) {
-                                if (context != null) {
-                                }
-                            }
-                        } else {
-                            try {
-                                openInBrowserAfterFailing()
-                            } catch (e: Exception) {
-                                if (context != null) {
-                                }
-                            }
-                        }
-                    } catch (e: Exception) {
-                        if (context != null) {
-                        }
-                    }
+        CoroutineScope(Dispatchers.Main).launch {
+            try {
+                val response = mercuryApi.query(url)
+                if (response.success && response.data != null) {
+                    handleMercuryData(response.data!!)
                 } else {
                     openInBrowserAfterFailing()
                 }
+            } catch (e: SocketTimeoutException) {
+                openInBrowserAfterFailing()
+            } catch (e: Exception) {
+                e.sendSilentlyWithAcraWithName("getContentFromMercury > $url")
+                openInBrowserAfterFailing()
             }
         }
     }
 
-    private fun htmlToWebview() {
+    private fun handleMercuryData(data: MercuryModel.ParsedContent) {
+        if (data.error == true || data.failed == true) {
+            openInBrowserAfterFailing()
+        } else {
+            binding.titleView.text = data.title.orEmpty()
+            if (typeface != null) {
+                binding.titleView.typeface = typeface
+            }
+            URL(data.url)
+            url = data.url!!
 
-        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
+            contentText = data.content.orEmpty()
+            htmlToWebview()
 
+            handleLeadImage(data?.lead_image_url)
 
-        binding.webcontent.settings.standardFontFamily = a.getString(0)
-        binding.webcontent.visibility = View.VISIBLE
+            binding.nestedScrollView.scrollTo(0, 0)
+            binding.progressBar.visibility = View.GONE
+        }
+    }
 
-        val colorOnSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
-
-        val colorSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
-
-        binding.webcontent.settings.useWideViewPort = true
-        binding.webcontent.settings.loadWithOverviewMode = true
-        binding.webcontent.settings.javaScriptEnabled = false
+    private fun handleLeadImage(lead_image_url: String?) {
+        if (!lead_image_url.isNullOrEmpty() && context != null) {
+            binding.imageView.visibility = View.VISIBLE
+            Glide
+                .with(requireContext())
+                .asBitmap()
+                .load(
+                    lead_image_url
+                )
+                .apply(RequestOptions.fitCenterTransform())
+                .into(binding.imageView)
+        } else {
+            binding.imageView.visibility = View.GONE
+        }
+    }
 
+    private fun handleImageLoading() {
         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) {
-                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+            override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean {
+                return if (context != null && url.isUrlValid() && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    try {
+                        requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                    } catch (e: ActivityNotFoundException) {
+                        e.sendSilentlyWithAcraWithName("activityNotFound > $url")
+                    }
+                    true
+                } else {
+                    false
                 }
-                return true
             }
 
             @Deprecated("Deprecated in Java")
-            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
+            override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? {
                 val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
+                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US)
+                        .contains(".jpeg")
+                ) {
                     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) {}
-                }
-                else if (url.lowercase(Locale.US).contains(".png")) {
+                        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) {
+                        // Do nothing
+                    }
+                } 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) {}
-                }
-                else if (url.lowercase(Locale.US).contains(".webp")) {
+                        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) {
+                        // Do nothing
+                    }
+                } 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) {}
+                        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) {
+                        // Do nothing
+                    }
                 }
 
                 return super.shouldInterceptRequest(view, url)
             }
         }
+    }
 
-        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onSingleTapUp(e: MotionEvent): Boolean {
-                return performClick()
-            }
-        })
+    private fun htmlToWebview() {
+        if (context != null) {
+            val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+            val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
-        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
-        binding.webcontent.settings.layoutAlgorithm =
+            binding.webcontent.settings.standardFontFamily = a.getString(0)
+            binding.webcontent.visibility = View.VISIBLE
+
+            val colorOnSurface = TypedValue()
+            requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
+
+            val colorSurface = TypedValue()
+            requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
+
+            binding.webcontent.settings.useWideViewPort = true
+            binding.webcontent.settings.loadWithOverviewMode = true
+            binding.webcontent.settings.javaScriptEnabled = false
+
+            handleImageLoading()
+
+            val gestureDetector =
+                GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+                    override fun onSingleTapUp(e: MotionEvent): Boolean {
+                        return performClick()
+                    }
+                })
+
+            binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+
+            binding.webcontent.settings.layoutAlgorithm =
                 WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
-        var baseUrl: String? = null
+            var baseUrl: String? = null
 
-        try {
-            val itemUrl = URL(url)
-            baseUrl = itemUrl.protocol + "://" + itemUrl.host
-        } catch (e: MalformedURLException) {
-        }
+            try {
+                val itemUrl = URL(url)
+                baseUrl = itemUrl.protocol + "://" + itemUrl.host
+            } catch (e: MalformedURLException) {
+                e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
+            }
 
-        val fontName =  when (font) {
-            getString(R.string.open_sans_font_id) -> "Open Sans"
-            getString(R.string.roboto_font_id) -> "Roboto"
-            getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
-            else -> ""
-        }
+            val fontName = when (font) {
+                getString(R.string.open_sans_font_id) -> "Open Sans"
+                getString(R.string.roboto_font_id) -> "Roboto"
+                getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+                else -> ""
+            }
 
-        val fontLinkAndStyle = if (font.isNotEmpty()) {
-            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
+            val fontLinkAndStyle = if (font.isNotEmpty()) {
+                """<link href="https://fonts.googleapis.com/css?family=${
+                    fontName.replace(
+                        " ",
+                        "+"
+                    )
+                }" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
                 |   }
                 |</style>
             """.trimMargin()
-        } else {
-            ""
-        }
+            } else {
+                ""
+            }
 
-        binding.webcontent.loadDataWithBaseURL(
-            baseUrl,
-            """<html>
+            binding.webcontent.loadDataWithBaseURL(
+                baseUrl,
+                """<html>
                 |<head>
                 |   <meta name="viewport" content="width=device-width, initial-scale=1">
                 |   <style>
@@ -429,7 +454,12 @@ class ArticleFragment : Fragment(), DIAware {
                 |        max-width: 100%;
                 |      }
                 |      a {
-                |        color: ${String.format("#%06X", 0xFFFFFF and resources.getColor(R.color.colorAccent))} !important;
+                |        color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and resources.getColor(R.color.colorAccent)
+                    )
+                } !important;
                 |      }
                 |      *:not(a) {
                 |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
@@ -440,11 +470,26 @@ class ArticleFragment : Fragment(), DIAware {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
+                |        background-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data
+                    )
+                };
                 |      }
                 |      body, html {
-                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)} !important;
-                |        border-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)}  !important;
+                |        background-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data
+                    )
+                } !important;
+                |        border-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data
+                    )
+                }  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -454,7 +499,12 @@ class ArticleFragment : Fragment(), DIAware {
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
+                |        background-color: ${
+                    String.format(
+                        "#%06X",
+                        0xFFFFFF and colorSurface.data
+                    )
+                };
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
@@ -462,32 +512,38 @@ class ArticleFragment : Fragment(), DIAware {
                 |<body>
                 |   $contentText
                 |</body>""".trimMargin(),
-            "text/html",
-            "utf-8",
-            null
-        )
+                "text/html",
+                "utf-8",
+                null
+            )
+        }
     }
 
     fun scrollDown() {
         val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, height/2)
+        binding.nestedScrollView.smoothScrollBy(0, height / 2)
     }
 
     fun scrollUp() {
         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
-        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+        if (context != null) {
+            requireContext().openInBrowserAsNewTask(this@ArticleFragment.item)
+        } else {
+            Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context")
+
+        }
     }
 
     companion object {
         private const val ARG_ITEMS = "items"
 
         fun newInstance(
-                item: SelfossModel.Item
+            item: SelfossModel.Item
         ): ArticleFragment {
             val fragment = ArticleFragment()
             val args = Bundle()
@@ -498,10 +554,11 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+        if (allImages != null && (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_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,202 @@
+package bou.amine.apps.readerforselfossv2.android.fragments
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import android.os.Build
+import android.os.Bundle
+import android.text.TextUtils
+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.databinding.FilterFragmentBinding
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
+import bou.amine.apps.readerforselfossv2.utils.getIcon
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.ViewTarget
+import com.bumptech.glide.request.transition.Transition
+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 {
+
+    private lateinit var binding: FilterFragmentBinding
+    override val di: DI by closestDI()
+    private val repository: Repository by instance()
+
+    private var selectedChip: Chip? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding =
+            FilterFragmentBinding.inflate(
+                inflater,
+                container,
+                false
+            )
+
+        val context: Context? = context
+
+
+        if (context == null) {
+            dismiss()
+            Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
+        } else {
+            CoroutineScope(Dispatchers.Main).launch {
+                handleTagChips(context)
+                handleSourceChips(context)
+
+                binding.progressBar2.visibility = GONE
+                binding.filterView.visibility = VISIBLE
+            }
+        }
+
+        binding.floatingActionButton2.setOnClickListener {
+            (activity as HomeActivity).getElementsAccordingToTab()
+            (activity as HomeActivity).fetchOnEmptyList()
+            dismiss()
+        }
+        return binding.root
+    }
+
+    private suspend fun handleSourceChips(
+        context: Context
+    ) {
+        val sourceGroup = binding.sourcesGroup
+
+        repository.getSourcesDetailsOrStats().forEach { source ->
+            val c = Chip(context)
+            c.ellipsize = TextUtils.TruncateAt.END
+
+            Glide.with(context)
+                .load(source.getIcon(repository.baseUrl))
+                .into(object : ViewTarget<Chip?, Drawable?>(c) {
+                    override fun onResourceReady(
+                        resource: Drawable,
+                        transition: Transition<in Drawable?>?
+                    ) {
+                        try {
+                            c.chipIcon = resource
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("sources > onResourceReady")
+                        }
+                    }
+
+                })
+
+            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
+            }
+
+            c.isEnabled = source.error.isNullOrBlank()
+
+            if (!source.error.isNullOrBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                c.tooltipText = source.error
+            }
+
+            sourceGroup.addView(c)
+        }
+    }
+
+    private suspend fun handleTagChips(
+        context: Context,
+    ) {
+        val tagGroup = binding.tagsGroup
+
+        val tags = repository.getTags()
+
+        tags.forEach { tag ->
+            val c = Chip(context)
+            c.ellipsize = TextUtils.TruncateAt.END
+            c.text = tag.tag
+
+            if (tag.color.isNotEmpty()) {
+                try {
+                    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
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
+                }
+            }
+
+            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
+            }
+
+            tagGroup.addView(c)
+        }
+    }
+
+    companion object {
+        const val TAG = "FilterModalBottomSheet"
+    }
+
+
+}

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

@@ -28,7 +28,7 @@ class ImageFragment : Fragment() {
         val view = binding?.root
 
         binding!!.photoView.visibility = View.VISIBLE
-        Glide.with(activity)
+        Glide.with(requireActivity())
                 .asBitmap()
                 .apply(glideOptions)
                 .load(imageUrl)

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

@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android.model
 
 import android.content.Context
 import android.webkit.URLUtil
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
@@ -23,6 +24,7 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
             }
         }
     } catch (e : Error) {
+        e.sendSilentlyWithAcraWithName("preloadImages")
         return false
     }
 
@@ -35,7 +37,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/model/ParecelableItem.kt

@@ -16,7 +16,8 @@ fun SelfossModel.Item.toParcelable() : ParecelableItem =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags.joinToString(",")
+        this.tags.joinToString(","),
+        this.author
     )
 fun ParecelableItem.toModel() : SelfossModel.Item =
     SelfossModel.Item(
@@ -30,7 +31,8 @@ fun ParecelableItem.toModel() : SelfossModel.Item =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags.split(",")
+        this.tags.split(","),
+        this.author
     )
 data class ParecelableItem(
     val id: Int,
@@ -43,7 +45,8 @@ data class ParecelableItem(
     val icon: String?,
     val link: String,
     val sourcetitle: String,
-    val tags: String
+    val tags: String,
+    val author: String?
 ) : Parcelable {
 
     companion object {
@@ -65,7 +68,8 @@ data class ParecelableItem(
         icon = source.readString(),
         link = source.readString().orEmpty(),
         sourcetitle = source.readString().orEmpty(),
-        tags = source.readString().orEmpty()
+        tags = source.readString().orEmpty(),
+        author = source.readString().orEmpty()
     )
 
     override fun describeContents() = 0
@@ -82,5 +86,6 @@ data class ParecelableItem(
         dest.writeString(link)
         dest.writeString(sourcetitle)
         dest.writeString(tags)
+        dest.writeString(author)
     }
 }

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

@@ -16,12 +16,11 @@ 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.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"
 
@@ -29,14 +28,10 @@ class SettingsActivity : AppCompatActivity(),
         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
@@ -101,6 +96,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
+            }
         }
     }
 
@@ -117,6 +127,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()
                             }
                             ""
@@ -134,12 +145,17 @@ class SettingsActivity : AppCompatActivity(),
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
                 editText.addTextChangedListener { object : TextWatcher {
-                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                        // We do nothing
+                    }
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                        // We do nothing
+                    }
                     override fun afterTextChanged(editable: Editable) {
                         try {
                             editText.textSize = editable.toString().toInt().toFloat()
                         } catch (e: NumberFormatException) {
+                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                         }
                     }
                 } }
@@ -149,6 +165,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/CircleImageView.kt

@@ -0,0 +1,62 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.content.Context
+import android.graphics.drawable.GradientDrawable
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.RelativeLayout
+import android.widget.TextView
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
+import com.google.android.material.imageview.ShapeableImageView
+import kotlin.math.abs
+
+class CircleImageView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : RelativeLayout(context, attrs, defStyleAttr) {
+    val view: View
+    val imageView: ShapeableImageView
+    val textView: TextView
+
+    private val colorScheme = listOf(
+    -0x1a8c8d,
+    -0xf9d6e,
+    -0x459738,
+    -0x6a8a33,
+    -0x867935,
+    -0x9b4a0a,
+    -0xb03c09,
+    -0xb22f1f,
+    -0xb24954,
+    -0x7e387c,
+    -0x512a7f,
+    -0x759b,
+    -0x2b1ea9,
+    -0x2ab1,
+    -0x48b3,
+    -0x5e7781,
+    -0x6f5b52
+    )
+
+    init {
+        view = LayoutInflater.from(context).inflate(R.layout.circle_image_view, this, true)
+        imageView = view.findViewById(R.id.circleImage)
+        textView = view.findViewById(R.id.circleText)
+    }
+
+    fun setBackgroundAndText(text: String) {
+        val circleDrawable = GradientDrawable()
+        val color = colorFromIdentifier(text)
+        circleDrawable.setColor(color)
+        imageView.setImageDrawable(circleDrawable)
+
+        textView.text = text.toTextDrawableString()
+    }
+
+    private fun colorFromIdentifier(key: String): Int {
+        return colorScheme[abs(key.hashCode()) % colorScheme.size]
+    }
+}

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
@@ -22,7 +18,6 @@ import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 fun Context.openItemUrl(
-    allItems: ArrayList<SelfossModel.Item>,
     currentItem: Int,
     linkDecoded: String,
     articleViewer: Boolean,
@@ -37,7 +32,6 @@ fun Context.openItemUrl(
         ).show()
     } else {
         if (articleViewer) {
-            ReaderActivity.allItems = allItems
             val intent = Intent(this, ReaderActivity::class.java)
             intent.putExtra("currentItem", currentItem)
             app.startActivity(intent)

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/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt

@@ -3,10 +3,9 @@ package bou.amine.apps.readerforselfossv2.android.utils.glide
 import android.content.Context
 import android.graphics.Bitmap
 import android.widget.ImageView
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
+import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
-import com.bumptech.glide.request.target.BitmapImageViewTarget
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
@@ -18,21 +17,13 @@ fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
         .apply(RequestOptions.centerCropTransform())
         .into(iv)
 
-fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
+fun Context.circularDrawable(url: String, view: CircleImageView) {
+    view.textView.text =""
+
     Glide.with(this)
-        .asBitmap()
         .load(url)
-        .apply(RequestOptions.centerCropTransform())
-        .into(object : BitmapImageViewTarget(iv) {
-            override fun setResource(resource: Bitmap?) {
-                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(
-                    resources,
-                    resource
-                )
-                circularBitmapDrawable.isCircular = true
-                iv.setImageDrawable(circularBitmapDrawable)
-            }
-        })
+        .into(view.imageView)
+}
 
 fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
     val byteArrayOutputStream = ByteArrayOutputStream()

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/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_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

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawerContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity"
     android:fitsSystemWindows="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
@@ -28,12 +27,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
+                        android:theme="@style/ToolBarStyle"
+                        app:popupTheme="?attr/toolbarPopupTheme"
 
-                         />
+                        />
 
                 </com.google.android.material.appbar.AppBarLayout>
 
@@ -45,19 +46,19 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:background="?android:attr/windowBackground">
+                        android:background="?android:attr/windowBackground"
+                        android:orientation="vertical">
 
                         <TextView
                             android:id="@+id/emptyText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:background="@android:color/transparent"
                             android:gravity="center_horizontal"
                             android:paddingTop="100dp"
                             android:text="@string/nothing_here"
                             android:textAlignment="center"
                             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                            android:background="@android:color/transparent"
                             android:visibility="gone" />
 
                         <androidx.recyclerview.widget.RecyclerView
@@ -69,7 +70,7 @@
                             android:paddingBottom="60dp"
                             android:scrollbars="vertical"
                             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                            tools:listitem="@layout/list_item"/>
+                            tools:listitem="@layout/list_item" />
                     </LinearLayout>
 
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -77,6 +78,7 @@
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
         <com.ashokvarma.bottomnavigation.BottomNavigationBar
             android:id="@+id/bottomBar"
             android:layout_width="match_parent"
@@ -85,11 +87,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/activity_image.xml

@@ -1,33 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:layoutDescription="@xml/image_close_scene">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar android:theme="@style/ToolBarStyle"
             android:id="@+id/toolBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
 
-             />
+            />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.core.widget.NestedScrollView>
+
+
+</androidx.constraintlayout.motion.widget.MotionLayout>

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

@@ -1,31 +1,30 @@
 <LinearLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center_horizontal"
     android:orientation="vertical"
     tools:context="bou.amine.apps.readerforselfossv2.android.LoginActivity">
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-
-             />
+            android:theme="@style/ToolBarStyle"
+            app:popupTheme="?attr/toolbarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin">
+        android:padding="@dimen/activity_horizontal_margin">
         <!-- Login progress -->
         <ProgressBar
             android:id="@+id/loginProgress"
@@ -33,67 +32,65 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
-        <ScrollView
+        <LinearLayout
             android:id="@+id/loginForm"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <EditText
+                android:id="@+id/urlView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:hint="@string/prompt_url"
+                android:imeOptions="actionUnspecified"
+                android:importantForAutofill="no"
+                android:inputType="textUri"
+                android:maxLines="1"
+                android:minHeight="48dp" />
 
-                <EditText
-                    android:id="@+id/urlView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/prompt_url"
-                    android:imeOptions="actionUnspecified"
-                    android:importantForAutofill="no"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/withLogin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/withLoginSwitch"
+                android:textAlignment="viewStart" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:text="@string/withLoginSwitch"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:id="@+id/withLogin"
-                    android:layout_weight="1"/>
+            <EditText
+                android:id="@+id/loginView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="username"
+                android:hint="@string/prompt_login"
+                android:inputType="text"
+                android:maxLines="1"
+                android:minHeight="48dp"
+                android:visibility="gone" />
 
-                <EditText
-                    android:id="@+id/loginView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="username"
-                    android:hint="@string/prompt_login"
-                    android:inputType="text"
-                    android:maxLines="1"
-                    android:visibility="gone" />
+            <EditText
+                android:id="@+id/passwordView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="password"
+                android:hint="@string/prompt_password"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:minHeight="48dp"
+                android:visibility="gone" />
 
-                <EditText
-                    android:id="@+id/passwordView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="password"
-                    android:hint="@string/prompt_password"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:visibility="gone" />
+            <Button
+                android:id="@+id/signInButton"
+                style="?android:textAppearanceSmall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/action_sign_in"
+                android:textStyle="bold" />
 
-                <Button
-                    android:id="@+id/signInButton"
-                    style="?android:textAppearanceSmall"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp"
-                    android:text="@string/action_sign_in"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-        </ScrollView>
+        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -24,7 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/source_list_item">
     </androidx.recyclerview.widget.RecyclerView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="bou.amine.apps.readerforselfossv2.android.AddSourceActivity">
+    tools:context="bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,116 +17,83 @@
             <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-
-                 />
+                android:layout_height="?attr/actionBarSize" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:id="@+id/formContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="16dp"
             android:visibility="gone"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintVertical_bias="0.0">
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:text="@string/add_source"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/textView2"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                android:textAlignment="center"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"
-                android:gravity="center_horizontal" />
 
             <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
                 android:id="@+id/nameInput"
-                android:layout_marginTop="32dp"
-                app:layout_constraintTop_toBottomOf="@+id/textView2"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                android:inputType="text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
                 android:hint="@string/add_source_hint_name"
-                android:textColorHint="?android:textColorPrimary"
-                android:autofillHints="false" />
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textUri"
-                android:ems="10"
-                android:id="@+id/sourceUri"
-                android:hint="@string/add_source_hint_url"
-                android:textColorHint="?android:textColorPrimary"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/nameInput"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:autofillHints="false" />
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:id="@+id/tags"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/sourceUri"
-                android:hint="@string/add_source_hint_tags"
-                android:textColorHint="?android:textColorPrimary"
                 android:inputType="text"
-                android:autofillHints="false" />
+                android:textColorHint="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <EditText
+                android:id="@+id/sourceUri"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
+                android:hint="@string/add_source_hint_url"
+                android:inputType="textUri"
+                android:textColorHint="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/nameInput" />
+
+            <EditText
+                android:id="@+id/tags"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:layout_marginTop="16dp"
+                android:autofillHints="false"
+                android:hint="@string/add_source_hint_tags"
+                android:inputType="text"
+                android:textColorHint="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/sourceUri" />
 
             <Spinner
-                android:layout_width="match_parent"
                 android:id="@+id/spoutsSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
                 android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/tags"
-                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_height="40dp"/>
+                app:layout_constraintTop_toBottomOf="@+id/tags" />
 
             <Button
-                android:text="@string/add_source_save"
+                android:id="@+id/saveBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/saveBtn"
-                android:elevation="5dp"
-                android:textColor="?android:textColorPrimary"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"
                 android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner"
+                android:elevation="5dp"
+                android:text="@string/add_source_save"
+                android:textColor="?android:textColorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginBottom="16dp"
-                app:layout_constraintVertical_bias="0.0"/>
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -135,8 +102,6 @@
             style="?android:attr/progressBarStyleLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"

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

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
-    android:layout_marginTop="8dp"
-    app:layout_constraintHorizontal_bias="0.62"
-    app:layout_constraintLeft_toLeftOf="parent"
-    app:layout_constraintRight_toRightOf="parent"
+    android:layout_margin="8dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     card_view:cardElevation="2dp"
     card_view:cardUseCompatPadding="true"
@@ -28,8 +24,8 @@
             android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:cropToPadding="true"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/background_splash"
             card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" />
@@ -39,18 +35,17 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/itemImage">
 
-            <ImageView
+            <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
                 android:id="@+id/sourceImage"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_marginLeft="8dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/background_splash" />
 
@@ -58,70 +53,58 @@
                 android:id="@+id/title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginStart="8dp"
-                android:gravity="start"
+                android:layout_margin="8dp"
                 android:textAlignment="viewStart"
-                android:textStyle="bold"
                 android:textColor="?android:textColorPrimary"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toRightOf="@+id/sourceImage"
-                app:layout_constraintRight_toRightOf="parent"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/sourceImage"
                 app:layout_constraintTop_toTopOf="@+id/sourceImage"
                 tools:text="Titre" />
 
             <TextView
                 android:id="@+id/sourceTitleAndDate"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:gravity="start"
                 android:textAlignment="viewStart"
-                android:textSize="14sp"
                 android:textColor="?android:textColorPrimary"
-                app:layout_constraintLeft_toLeftOf="@+id/title"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/title"
                 app:layout_constraintTop_toBottomOf="@+id/title"
                 tools:text="Google Actualité Il y a 5h" />
 
-            <RelativeLayout
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
                 <ImageButton
-                    android:id="@+id/favButton"
+                    android:id="@+id/browserBtn"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/reader_action_open"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_menu_heart_60dp"
-                    app:tint="@color/ic_menu_heart_color" />
+                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    app:tint="?android:attr/textColorPrimary" />
 
                 <ImageButton
                     android:id="@+id/shareBtn"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/favButton"
-                    android:layout_toStartOf="@+id/favButton"
+                    android:layout_marginStart="16dp"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/share"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
@@ -129,23 +112,21 @@
                     app:tint="?android:attr/textColorPrimary" />
 
                 <ImageButton
-                    android:id="@+id/browserBtn"
+                    android:id="@+id/favButton"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_toLeftOf="@+id/shareBtn"
-                    android:layout_toStartOf="@+id/shareBtn"
+                    android:layout_marginStart="16dp"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/add_to_favs_reader"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
-                    app:tint="?android:attr/textColorPrimary" />
+                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:tint="@color/ic_menu_heart_color" />
 
-            </RelativeLayout>
+
+            </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/circleImage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        app:shapeAppearanceOverlay="@style/circleImageView"
+        app:srcCompat="@drawable/background_splash" />
+
+    <TextView
+        android:id="@+id/circleText"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="none"
+        android:gravity="center"
+        android:singleLine="true"
+        android:textColor="@color/white"
+        android:textIsSelectable="false"
+        android:textSize="20sp"
+        android:typeface="normal" />
+</RelativeLayout>

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

@@ -0,0 +1,96 @@
+<?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.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/filterView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <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" />
+
+            <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/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>
+
+            <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>
+
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/floatingActionButton2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                android:clickable="true"
+                android:contentDescription="@string/menu_home_search"
+                android:focusable="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" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,4 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -22,10 +21,22 @@
                 android:layout_width="0dp"
                 android:layout_height="200dp"
                 android:scaleType="centerCrop"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/titleView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginRight="16dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
             <TextView
                 android:id="@+id/source"
@@ -36,40 +47,23 @@
                 android:layout_marginRight="16dp"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="12sp"
-                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/titleView" />
 
-            <TextView
-                android:id="@+id/titleView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="8dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:textStyle="bold"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-
             <WebView
                 android:id="@+id/webcontent"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginRight="16dp"
+                android:background="?attr/webviewBackground"
+                android:paddingBottom="48dp"
                 android:textColorLink="?attr/colorAccent"
                 android:visibility="gone"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="24dp"
-                android:paddingBottom="48dp"
-                android:background="?attr/webviewBackground"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/source"
                 tools:visibility="visible" />
 
@@ -80,10 +74,10 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="start|bottom|end"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_gravity="end|bottom|right">
+        app:layout_constraintStart_toStartOf="parent">
 
         <com.github.rubensousa.floatingtoolbar.FloatingToolbar
             android:id="@+id/floatingToolbar"
@@ -96,12 +90,11 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom|right"
-            android:layout_marginBottom="16dp"
+            android:layout_gravity="end|bottom"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="16dp"
             android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             android:src="@drawable/ic_add_white_24dp"
             app:backgroundTint="?attr/colorAccent"
             app:fabSize="mini"
@@ -112,11 +105,11 @@
         android:id="@+id/progressBar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        android:animateLayoutChanges="true"
         android:alpha="0.8"
+        android:animateLayoutChanges="true"
         android:background="@color/black"
-        android:clickable="false">
+        android:clickable="false"
+        android:visibility="gone">
 
         <ProgressBar
             style="?android:attr/progressBarStyleLarge"

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
-    <com.github.chrisbanes.photoview.PhotoView
-        android:id="@+id/photoView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:adjustViewBounds="true"
-        android:background="@drawable/checkerboard"
-        app:srcCompat="@android:drawable/screen_background_dark" />
+        <com.github.chrisbanes.photoview.PhotoView
+            android:id="@+id/photoView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:adjustViewBounds="true"
+            android:background="@drawable/checkerboard"
+            app:srcCompat="@android:drawable/screen_background_dark" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -3,17 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="88dp">
+    android:layout_height="wrap_content">
 
-    <ImageView
+    <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
         android:id="@+id/itemImage"
         android:layout_width="46dp"
         android:layout_height="46dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="21dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginLeft="8dp" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/title"
@@ -24,39 +23,30 @@
         android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif"
-        android:gravity="start"
         android:maxLines="3"
         android:textAlignment="viewStart"
-        android:textAllCaps="false"
+        android:textColor="?android:textColorPrimary"
         android:textSize="16sp"
         android:textStyle="bold"
-        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Titre"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
+        tools:text="Titre" />
 
     <TextView
         android:id="@+id/sourceTitleAndDate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="66dp"
         android:layout_marginEnd="16dp"
         android:gravity="start"
         android:maxLines="1"
         android:textAlignment="viewStart"
-        android:textSize="14sp"
         android:textColor="?android:textColorPrimary"
+        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Google Actualité Il y a 5h"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
+        app:layout_constraintTop_toBottomOf="@+id/itemImage"
+        tools:text="Google Actualité Il y a 5h" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -3,48 +3,74 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
 
-    <ImageView
-        android:id="@+id/itemImage"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:importantForAccessibility="no"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/sourceTitle"
-        android:layout_width="0dp"
-        android:layout_height="17dp"
-        android:layout_marginStart="8dp"
-        android:ellipsize="end"
-        android:gravity="start"
-        android:maxLines="1"
-        android:textAlignment="textStart"
-        android:textSize="13sp"
-        android:textColor="?android:textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
-        app:layout_constraintStart_toEndOf="@+id/itemImage"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="source title" />
-
     <Button
         android:id="@+id/deleteBtn"
         style="@style/Widget.AppCompat.Button.Borderless"
-        android:layout_width="34dp"
-        android:layout_height="34dp"
+        android:layout_width="48dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@drawable/ic_remove_circle_outline_black_24dp"
         android:backgroundTint="?android:textColorSecondary"
-        android:elevation="4dp"
         android:contentDescription="@string/remove_source"
+        android:elevation="4dp"
+        app:iconSize="34dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+        android:id="@+id/itemImage"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <TextView
+        android:id="@+id/sourceTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/errorText"
+        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Source title" />
+
+    <TextView
+        android:id="@+id/errorText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10sp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="@color/red"
+        android:textStyle="italic"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/itemImage"
+        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

androidApp/src/main/res/menu/home_menu.xml

@@ -8,16 +8,32 @@
         app:showAsAction="ifRoom|collapseActionView"
         app:actionViewClass="androidx.appcompat.widget.SearchView" />
 
+    <item android:id="@+id/action_filter"
+        android:title="@string/menu_home_filter"
+        android:icon="@drawable/ic_baseline_filter_alt_24"
+        android:orderInCategory="1"
+        app:showAsAction="always" />
+
     <item android:id="@+id/readAll"
           android:icon="@drawable/ic_menu_done_all_white_24dp"
           android:title="@string/readAll"
-          android:orderInCategory="1"
-          app:showAsAction="always"/>
+          android:orderInCategory="2"
+          app:showAsAction="ifRoom"/>
+
+    <item android:id="@+id/action_sources"
+        android:title="@string/menu_home_sources"
+        android:orderInCategory="97"
+        app:showAsAction="never"/>
+
+    <item android:id="@+id/action_settings"
+        android:title="@string/title_activity_settings"
+        android:orderInCategory="98"
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/refresh"
-        android:icon="@drawable/ic_menu_refresh_white_24dp"
-        android:orderInCategory="99"
+        app:showAsAction="never"
+        android:orderInCategory="101"
         android:title="@string/menu_home_refresh" />
 
     <item android:id="@+id/action_disconnect"

androidApp/src/main/res/menu/reader_toolbar_no_read.xml

@@ -0,0 +1,16 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/open_action"
+        android:icon="@drawable/ic_open_in_browser_white_24dp"
+        android:title="@string/reader_action_open"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/share_action"
+        android:icon="@drawable/ic_share_white_24dp"
+        android:title="@string/reader_action_share"
+        app:showAsAction="ifRoom" />
+
+</menu>

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="drawer_item_filters">Filtres</string>
-    <string name="drawer_action_clear">Esborra</string>
-    <string name="drawer_item_tags">Etiquetes</string>
-    <string name="drawer_item_sources">Fonts</string>
-    <string name="drawer_action_edit">Edita</string>
-    <string name="drawer_loading">S\'està carregant…</string>
+    <string name="filter_item_tags">Etiquetes</string>
+    <string name="filter_item_sources">Fonts</string>
     <string name="menu_home_search">Cerca</string>
     <string name="can_delete_source">No es pot suprimir la font</string>
     <string name="base_url_error">S\'ha produït un error en comunicar-se amb la instància de Selfoss. Si el problema persisteix, posa\'t en contacte amb mi.</string>
     <string name="pref_header_theme">Temes</string>
-    <string name="default_theme">Predeterminat</string>
-    <string name="default_dark_theme">Predeterminat/Fosc</string>
     <string name="pref_selfoss_category">API de Selfoss</string>
     <string name="pref_api_items_number_title">Nombre d\'elements carregats</string>
-    <string name="pref_hidden_tags">Etiquetes ocultes</string>
     <string name="pref_general_infinite_loading_title">Carrega articles en desplaçar</string>
     <string name="translation">Traducció</string>
     <string name="cant_open_invalid_url">L\'element URL no és vàlid. Estic intentant solucionar aquest problema perquè l\'aplicació no falli.</string>
-    <string name="drawer_report_bug">Informa d\'un error</string>
     <string name="items_number_should_be_number">El nombre d\'elements ha de ser enter.</string>
-    <string name="reader_action_more">Més informació</string>
     <string name="reader_action_open">Obre al navegador</string>
     <string name="reader_action_share">Comparteix</string>
     <string name="pref_switch_actions_pager_scroll_on">Es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filter</string>
-    <string name="drawer_action_clear">leeren</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Quellen</string>
-    <string name="drawer_action_edit">bearbeiten</string>
-    <string name="drawer_loading">Lade…</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Quellen</string>
     <string name="menu_home_search">Suche</string>
     <string name="can_delete_source">Can\'t delete the source…</string>
     <string name="base_url_error">Beim Versuch deine Selfoss-Instanz zu erreichen ist ein Fehler aufgetreten. Solltet dieser Fehler bestehen bleiben, trete bitte mit mir in Kontakt.</string>
     <string name="pref_header_theme">Designs</string>
-    <string name="default_theme">Standard</string>
-    <string name="default_dark_theme">Standard (Dunkel)</string>
     <string name="pref_selfoss_category">selfoss API</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Übersetzung</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Melde einen Fehler</string>
     <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
     <string name="reader_action_open">Im Browser öffnen</string>
     <string name="reader_action_share">Teilen</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpiar</string>
-    <string name="drawer_item_tags">Etiquetas</string>
-    <string name="drawer_item_sources">Fuentes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">Cargando…</string>
+    <string name="filter_item_tags">Etiquetas</string>
+    <string name="filter_item_sources">Fuentes</string>
     <string name="menu_home_search">Buscar</string>
     <string name="can_delete_source">No se puede eliminar la fuente…</string>
     <string name="base_url_error">Hubo un problema al intentar comunicarse con su instancia de Selfoss. Si el problema persiste, póngase en contacto conmigo.</string>
     <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Predeterminado</string>
-    <string name="default_dark_theme">Predeterminado/Oscuro</string>
     <string name="pref_selfoss_category">Api de Selfoss</string>
     <string name="pref_api_items_number_title">Número de artículos cargados</string>
-    <string name="pref_hidden_tags">Etiquetas ocultas</string>
     <string name="pref_general_infinite_loading_title">Cargar más artículos en desplazamiento</string>
     <string name="translation">Traducción</string>
     <string name="cant_open_invalid_url">La url del elemento no es válida. Estoy buscando resolver este problema para que la aplicación no colapse.</string>
-    <string name="drawer_report_bug">Reportar un error</string>
     <string name="items_number_should_be_number">El número de artículos debe ser un número entero.</string>
-    <string name="reader_action_more">Leer más</string>
     <string name="reader_action_open">Abrir en el navegador</string>
     <string name="reader_action_share">Compartir</string>
     <string name="pref_switch_actions_pager_scroll_on">Marcar artículos como leidos al desplazarse entre ellos.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
     <string name="menu_home_search">Search</string>
     <string name="can_delete_source">Can\'t delete the source…</string>
     <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
     <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Translation</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
     <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
     <string name="reader_action_open">Open in browser</string>
     <string name="reader_action_share">Share</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filtres</string>
-    <string name="drawer_action_clear">raz</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">éditer</string>
-    <string name="drawer_loading">Chargement …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
     <string name="menu_home_search">Rechercher</string>
     <string name="can_delete_source">Impossible de supprimer la source…</string>
     <string name="base_url_error">Il y a eu un souci lors de la communication avec votre instance Selfoss. Si le problèmes persiste, contactez-moi pour trouver une solution.</string>
     <string name="pref_header_theme">Thèmes</string>
-    <string name="default_theme">Par défaut</string>
-    <string name="default_dark_theme">Par défaut/Foncé</string>
     <string name="pref_selfoss_category">Api Selfoss</string>
     <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
-    <string name="pref_hidden_tags">Tags Cachés</string>
     <string name="pref_general_infinite_loading_title">Charger plus d\'articles au scroll</string>
     <string name="translation">Traduction</string>
     <string name="cant_open_invalid_url">L’url de l’élément n’est pas valide. En attendant la résolution du problème, le lien ne s\'ouvrira pas.</string>
-    <string name="drawer_report_bug">Signaler un bug</string>
     <string name="items_number_should_be_number">Le nombre d\'articles doit être un entier.</string>
-    <string name="reader_action_more">Lire plus</string>
     <string name="reader_action_open">Ouvrir</string>
     <string name="reader_action_share">Partager</string>
     <string name="pref_switch_actions_pager_scroll_on">Marquer les articles comme lus à la navigation dans le lecteur d\'article.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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>
@@ -34,8 +33,8 @@
     <string name="addStringNoUrl">"Accede pra engadir fontes."</string>
     <string name="cant_get_sources">"Non se pode obter a lista de fontes."</string>
     <string name="cant_create_source">"Non se pode crear unha fonte."</string>
-    <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
-    <string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
+    <string name="cant_get_spouts_no_network">"Non se pode obter a lista de spouts por mor dun erro de rede."</string>
+    <string name="cant_get_spouts">"Non se pode obter a lista de spoits. Pode que haxa algún problema coa api."</string>
     <string name="form_not_complete">"O formulario non está completo"</string>
     <string name="pref_header_links">"Ligazóns"</string>
     <string name="issue_tracker_link">"Rastrexador de Incidencias"</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="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpar</string>
-    <string name="drawer_item_tags">Etiquetas</string>
-    <string name="drawer_item_sources">Fontes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">Cargando…</string>
+    <string name="filter_item_tags">Etiquetas</string>
+    <string name="filter_item_sources">Fontes</string>
     <string name="menu_home_search">Procurar</string>
     <string name="can_delete_source">Non se puido eliminar a fonte…</string>
     <string name="base_url_error">Houno unha incidencia ao tratar de comunicarse coa túa instancia de Selfoss. Se o problema persiste, prégolle que se poña en contacto conmigo.</string>
     <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Predeterminado</string>
-    <string name="default_dark_theme">Predeterminado/Escuro</string>
     <string name="pref_selfoss_category">API de Selfoss</string>
     <string name="pref_api_items_number_title">Número de elementos cargados</string>
-    <string name="pref_hidden_tags">Etiquetas ocultas</string>
     <string name="pref_general_infinite_loading_title">Cargar máis artigos ao desprazarse</string>
     <string name="translation">Traducción</string>
     <string name="cant_open_invalid_url">A URL do elemento non é válida. Estou tratando de solucionar isto pra que a aplicación non falle.</string>
-    <string name="drawer_report_bug">Informar dun erro</string>
     <string name="items_number_should_be_number">O número de elementos debería ser un enteiro.</string>
-    <string name="reader_action_more">Ler máis</string>
     <string name="reader_action_open">Abrir no navegador</string>
     <string name="reader_action_share">Compartir</string>
     <string name="pref_switch_actions_pager_scroll_on">Marcar artigos como lidos cando se desliza o dedo dun a outro.</string>
@@ -94,7 +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>
@@ -128,10 +116,18 @@
     <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
     <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
     <string name="remove_source">Eliminar fonte</string>
-    <string name="pref_theme_title">Light/Dark mode</string>
-    <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="pref_theme_title">Modo Claro/Escuro</string>
+    <string name="mode_dark">Modo escuro</string>
+    <string name="mode_system">Seguir axustes do sistema</string>
+    <string name="mode_light">Modo claro</string>
+    <string name="gdpr_dialog_title">A aplicación non comparte ningún dato persoal seu.</string>
+    <string name="gdpr_dialog_message"><![CDATA[O envío de informes de erros está habilitado. Pode deshabilitarse dende a páxina de axustes. Ten en conta que os informes de erros son esenciais para o desenvolvemento da aplicación.]]></string>
+    <string name="crash_toast_text">Ocurriu un erro. Enviando os detalles o desenvolvedor.</string>
+    <string name="pref_switch_disable_acra">"Deshabilitar o reporte automático de erros. "</string>
+    <string name="menu_home_filter">Filtros</string>
+    <string name="application_selfoss_only">Esta aplicación só funciona cunha instancia de Selfoss, e con ningún outro filtro RSS.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filter</string>
-    <string name="drawer_action_clear">kosongkan</string>
-    <string name="drawer_item_tags">Tag</string>
-    <string name="drawer_item_sources">Sumber</string>
-    <string name="drawer_action_edit">suntung</string>
-    <string name="drawer_loading">Memuat …</string>
+    <string name="filter_item_tags">Tag</string>
+    <string name="filter_item_sources">Sumber</string>
     <string name="menu_home_search">Cari</string>
     <string name="can_delete_source">Tidak dapat menghapus sumber…</string>
     <string name="base_url_error">Ada masalah saat berkomunikasi dengan Selfoss Anda. Jika masalah berlanjut, tolong hubungi saya.</string>
     <string name="pref_header_theme">Tema</string>
-    <string name="default_theme">Bawaan</string>
-    <string name="default_dark_theme">Bawaan/Gelap</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Item nomor dimuat</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Muat lebih banyak artikel saat membalik halaman</string>
     <string name="translation">Terjemahan</string>
     <string name="cant_open_invalid_url">Alamat tautan proyek tidak valid. Saya mencoba memecahkan masalah ini untuk menghindari aplikasi berhenti.</string>
-    <string name="drawer_report_bug">Laporkan bug</string>
     <string name="items_number_should_be_number">Jumlah item harus berupa bilangan bulat.</string>
-    <string name="reader_action_more">Baca lebih lanjut</string>
     <string name="reader_action_open">Buka di peramban</string>
     <string name="reader_action_share">Bagikan</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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>
@@ -102,14 +90,14 @@
     <string name="pref_switch_items_caching">Save items for offline use</string>
     <string name="pref_switch_update_sources">Check for new sources and tags</string>
     <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
-    <string name="network_connectivity_lost">"Network connection lost"</string>
+    <string name="network_connectivity_lost">"Koneksi jaringan hilang"</string>
     <string name="network_connectivity_retrieved">"Network connection is now available"</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
     <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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filtri</string>
-    <string name="drawer_action_clear">cancella</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Fonti</string>
-    <string name="drawer_action_edit">modifica</string>
-    <string name="drawer_loading">Caricamento…</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Fonti</string>
     <string name="menu_home_search">Cerca</string>
     <string name="can_delete_source">Non è possibile eliminare la fonte…</string>
     <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
     <string name="pref_header_theme">Temi</string>
-    <string name="default_theme">Predefinito</string>
-    <string name="default_dark_theme">Predefinito (Scuro)</string>
     <string name="pref_selfoss_category">Api di Selfoss</string>
     <string name="pref_api_items_number_title">Numero di elementi caricati</string>
-    <string name="pref_hidden_tags">Tag nascosti</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Traduzioni</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Segnala un bug</string>
     <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
     <string name="reader_action_open">Open in browser</string>
     <string name="reader_action_share">Share</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
     <string name="menu_home_search">Search</string>
     <string name="can_delete_source">Can\'t delete the source…</string>
     <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
     <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Translation</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
     <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
     <string name="reader_action_open">Open in browser</string>
     <string name="reader_action_share">Share</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>

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

@@ -1,4 +1,11 @@
 <?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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</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="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">wissen</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Bronnen</string>
-    <string name="drawer_action_edit">bewerken</string>
-    <string name="drawer_loading">Bezig met laden …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Bronnen</string>
     <string name="menu_home_search">Zoeken</string>
     <string name="can_delete_source">Kan de bron niet verwijderen…</string>
     <string name="base_url_error">Er was een probleem bij het communiceren met uw Selfoss Instance. Als het probleem blijft, neem dan contact met mij op.</string>
     <string name="pref_header_theme">Thema \'s</string>
-    <string name="default_theme">Standaard</string>
-    <string name="default_dark_theme">Standaard/Donker</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Geladen items nummer</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Laad meer artikelen door te bladeren</string>
     <string name="translation">Vertaling</string>
     <string name="cant_open_invalid_url">De URL is ongeldig. Ik probeer dit probleem op te lossen, zodat de toepassing niet wordt afgesloten.</string>
-    <string name="drawer_report_bug">Een fout melden</string>
     <string name="items_number_should_be_number">Het aantal items moet een geheel getal zijn.</string>
-    <string name="reader_action_more">Lees meer</string>
     <string name="reader_action_open">Openen in browser</string>
     <string name="reader_action_share">Delen</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpar</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Fontes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">Carregando …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Fontes</string>
     <string name="menu_home_search">Procurar</string>
     <string name="can_delete_source">Não foi possível apagar a fonte…</string>
     <string name="base_url_error">Houve um problema ao tentar se comunicar com o seu Selfoss. Se o problema persistir, entre em contato comigo.</string>
     <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Padrão</string>
-    <string name="default_dark_theme">Padrão/Escuro</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Quantidade de itens carregados</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Carregar mais artigos ao realizar o scroll</string>
     <string name="translation">Traduções</string>
     <string name="cant_open_invalid_url">A url está inválida. Estou tentando resolver esse problema para que o aplicativo não encerre.</string>
-    <string name="drawer_report_bug">Reportar erro</string>
     <string name="items_number_should_be_number">O número dos itens deve ser um número inteiro.</string>
-    <string name="reader_action_more">Leia mais</string>
     <string name="reader_action_open">Abrir no navegador</string>
     <string name="reader_action_share">Compartilhar</string>
     <string name="pref_switch_actions_pager_scroll_on">Se esta configuração estiver ativada, os artigos serão marcados como lidos ao deslizar para a esquerda e para a direita no leitor do artigo.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filtros</string>
-    <string name="drawer_action_clear">limpar</string>
-    <string name="drawer_item_tags">Etiquetas</string>
-    <string name="drawer_item_sources">Fontes</string>
-    <string name="drawer_action_edit">editar</string>
-    <string name="drawer_loading">A carregar…</string>
+    <string name="filter_item_tags">Etiquetas</string>
+    <string name="filter_item_sources">Fontes</string>
     <string name="menu_home_search">Buscar</string>
     <string name="can_delete_source">Não é possível excluir a fonte…</string>
     <string name="base_url_error">Houve um problema ao tentar se comunicar com sua instância de Selfoss. Se o problema persistir, por favor entre em contato comigo.</string>
     <string name="pref_header_theme">Temas</string>
-    <string name="default_theme">Predefinição</string>
-    <string name="default_dark_theme">Padrão/escuro</string>
     <string name="pref_selfoss_category">Api de Selfoss</string>
     <string name="pref_api_items_number_title">Número de itens carregados</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Carregar mais artigos no pergaminho</string>
     <string name="translation">Tradução</string>
     <string name="cant_open_invalid_url">A url do item é inválido. Eu estou olhando para resolver esta questão, para que o app não vai falhar.</string>
-    <string name="drawer_report_bug">Reportar falha</string>
     <string name="items_number_should_be_number">O número de itens deve ser um número inteiro.</string>
-    <string name="reader_action_more">Ler mais</string>
     <string name="reader_action_open">Abrir no browser</string>
     <string name="reader_action_share">Compartilhar</string>
     <string name="pref_switch_actions_pager_scroll_on">Artigos de marca como lida quando passar entre artigos.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
     <string name="menu_home_search">Search</string>
     <string name="can_delete_source">Can\'t delete the source…</string>
     <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
     <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Translation</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
     <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
     <string name="reader_action_open">Open in browser</string>
     <string name="reader_action_share">Share</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">Filtreler</string>
-    <string name="drawer_action_clear">temizle</string>
-    <string name="drawer_item_tags">Etiketler</string>
-    <string name="drawer_item_sources">Kaynaklar</string>
-    <string name="drawer_action_edit">düzenle</string>
-    <string name="drawer_loading">Yükleniyor…</string>
+    <string name="filter_item_tags">Etiketler</string>
+    <string name="filter_item_sources">Kaynaklar</string>
     <string name="menu_home_search">Ara</string>
     <string name="can_delete_source">Kaynak silinemiyor…</string>
     <string name="base_url_error">Selfoss Örneğinizle iletişim kurmaya çalışırken bir sorun oluştu. Sorun devam ederse, lütfen benimle iletişime geçin.</string>
     <string name="pref_header_theme">Temalar</string>
-    <string name="default_theme">Varsayılan</string>
-    <string name="default_dark_theme">Varsayılan/koyu</string>
     <string name="pref_selfoss_category">Selfoss Uygulaması</string>
     <string name="pref_api_items_number_title">Yüklenen öğe numarası</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Kaydırma üzerine daha fazla makale yükleyin</string>
     <string name="translation">Çeviri</string>
     <string name="cant_open_invalid_url">Öğe url geçersiz. Uygulama çökmeyeceği için bu sorunu çözmeye çalışıyorum.</string>
-    <string name="drawer_report_bug">Hata bildir</string>
     <string name="items_number_should_be_number">Öğe sayısı bir tamsayı olmalıdır.</string>
-    <string name="reader_action_more">Daha fazlasını görüntüle</string>
     <string name="reader_action_open">Tarayıcıda aç</string>
     <string name="reader_action_share">Paylaş</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">搜索条件</string>
-    <string name="drawer_action_clear">清空</string>
-    <string name="drawer_item_tags">标签</string>
-    <string name="drawer_item_sources">来源</string>
-    <string name="drawer_action_edit">编辑</string>
-    <string name="drawer_loading">正在载入…</string>
+    <string name="filter_item_tags">标签</string>
+    <string name="filter_item_sources">来源</string>
     <string name="menu_home_search">搜索</string>
     <string name="can_delete_source">无法删除数据源…</string>
     <string name="base_url_error">与您的 Selfoss 通信时出现问题。如果问题一直存在，请与我联系。</string>
     <string name="pref_header_theme">主题</string>
-    <string name="default_theme">默认​​​​​</string>
-    <string name="default_dark_theme">默认值/暗</string>
     <string name="pref_selfoss_category">塞尔福斯 Api</string>
     <string name="pref_api_items_number_title">已加载项目编号</string>
-    <string name="pref_hidden_tags">隐藏标签</string>
     <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
     <string name="translation">翻译</string>
     <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
-    <string name="drawer_report_bug">报告错误</string>
     <string name="items_number_should_be_number">项目数应为整数。</string>
-    <string name="reader_action_more">阅读更多</string>
     <string name="reader_action_open">在浏览器中打开</string>
     <string name="reader_action_share">分享</string>
     <string name="pref_switch_actions_pager_scroll_on">切换文章时将文章标记为已读。</string>
@@ -94,7 +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,6 +120,14 @@
     <string name="mode_dark">深色模式</string>
     <string name="mode_system">遵循系统设置</string>
     <string name="mode_light">浅色模式</string>
-    <string name="drawer_error_loading_sources">Error loading sources…</string>
-    <string name="pref_switch_enable_analytics">Enable analytics</string>
+    <string name="gdpr_dialog_title">该应用不分享任何关于您的个人数据。</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>
+    <string name="application_selfoss_only">此应用只适用于 Selfoss 实例，不适用于其他 RSS 。</string>
+    <string name="menu_home_sources">源</string>
+    <string name="update_source">更新源</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</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="drawer_item_filters">搜索条件</string>
-    <string name="drawer_action_clear">清空</string>
-    <string name="drawer_item_tags">标签</string>
-    <string name="drawer_item_sources">来源</string>
-    <string name="drawer_action_edit">编辑</string>
-    <string name="drawer_loading">正在载入…</string>
+    <string name="filter_item_tags">标签</string>
+    <string name="filter_item_sources">来源</string>
     <string name="menu_home_search">搜索</string>
     <string name="can_delete_source">无法删除数据源…</string>
     <string name="base_url_error">与您的 Selfoss 通信时出现问题。如果问题一直存在，请与我联系。</string>
     <string name="pref_header_theme">主题</string>
-    <string name="default_theme">默认​​​​​</string>
-    <string name="default_dark_theme">默认值/暗</string>
     <string name="pref_selfoss_category">塞尔福斯 Api</string>
     <string name="pref_api_items_number_title">已加载项目编号</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
     <string name="translation">翻译</string>
     <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
-    <string name="drawer_report_bug">报告错误</string>
     <string name="items_number_should_be_number">项目数应为整数。</string>
-    <string name="reader_action_more">阅读更多</string>
     <string name="reader_action_open">在浏览器中打开</string>
     <string name="reader_action_share">分享</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -94,7 +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,6 +120,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>

androidApp/src/main/res/values/colors.xml

@@ -12,4 +12,5 @@
     <color name="refresh_progress_2">@color/colorAccent</color>
     <color name="refresh_progress_3">@color/pink</color>
     <color name="dark">#FF282828</color>
+    <color name="transparent_dark_background">#33000000</color>
 </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="drawer_error_loading_sources">Error loading sources…</string>
-    <string name="drawer_item_filters">Filters</string>
-    <string name="drawer_action_clear">clear</string>
-    <string name="drawer_item_tags">Tags</string>
-    <string name="drawer_item_sources">Sources</string>
-    <string name="drawer_action_edit">edit</string>
-    <string name="drawer_loading">Loading …</string>
+    <string name="filter_item_tags">Tags</string>
+    <string name="filter_item_sources">Sources</string>
     <string name="menu_home_search">Search</string>
     <string name="can_delete_source">Can\'t delete the source…</string>
     <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
     <string name="pref_header_theme">Themes</string>
-    <string name="default_theme">Default</string>
-    <string name="default_dark_theme">Default/Dark</string>
     <string name="pref_selfoss_category">Selfoss Api</string>
     <string name="pref_api_items_number_title">Loaded items number</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
     <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
     <string name="translation">Translation</string>
     <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-    <string name="drawer_report_bug">Report a bug</string>
     <string name="items_number_should_be_number">The items number should be an integer.</string>
-    <string name="reader_action_more">Read more</string>
     <string name="reader_action_open">Open in browser</string>
     <string name="reader_action_share">Share</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
@@ -95,7 +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,5 +123,14 @@
     <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>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
+    <string name="menu_home_sources">Sources</string>
+    <string name="update_source">Update source</string>
+    <string name="confirm_disconnect_title">Disconnect ?</string>
+    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>

androidApp/src/main/res/values/styles.xml

@@ -25,7 +25,17 @@
         <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>
+
+    <style name="Theme.AppCompat.ImageActivity" parent="NoBar">
+        <item name="android:windowBackground">@color/transparent_dark_background</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
+    <style name="circleImageView" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+
 </resources>

androidApp/src/main/res/xml/image_close_scene.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:motion="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/motionLayout">
+
+    <Transition
+        motion:constraintSetStart="@+id/start"
+        motion:constraintSetEnd="@+id/end"
+        motion:duration="500"
+        motion:motionInterpolator="linear">
+
+        <OnSwipe
+            motion:touchAnchorId="@+id/scrollView"
+            motion:touchAnchorSide="top"
+            motion:onTouchUp="autoCompleteToStart" />
+    </Transition>
+
+    <ConstraintSet android:id="@+id/start">
+
+        <Constraint
+            android:id="@id/scrollView"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent">
+        </Constraint>
+    </ConstraintSet>
+
+    <ConstraintSet android:id="@+id/end">
+
+        <Constraint
+            android:id="@+id/scrollView"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="0dp"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent">
+        </Constraint>
+    </ConstraintSet>
+</MotionScene>

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

@@ -1,12 +1,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreference
-        android:defaultValue="true"
-        app:iconSpaceReserved="false"
-        android:key="enable_analytics"
-        android:title="@string/pref_switch_enable_analytics" />
-
     <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
-        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$ThemePreferenceFragment"
+    <ListPreference
+        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,18 @@
         android:title="@string/pref_header_experimental"
         android:icon="@drawable/ic_widgets_black_24dp" />
 
+
+    <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/DatesTest.kt

@@ -11,11 +11,14 @@ class DatesTest {
 
     private val v3Date = "2013-04-07T13:43:00+01:00"
     private val v4Date = "2013-04-07 13:43:00"
+    private val bug1Date = "2022-12-24T17:00:08+00"
 
     @Test
     fun v3_date_should_be_parsed() {
         val date = DateUtils.parseDate(v3Date)
-        val expected = LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.of("UTC+1")) .toEpochMilliseconds()
+        val expected =
+            LocalDateTime(2013, 4, 7, 14, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
+                .toEpochMilliseconds()
 
         assertEquals(date, expected)
     }
@@ -30,4 +33,14 @@ class DatesTest {
         assertEquals(date, expected)
     }
 
+    @Test
+    fun bug1_date_should_be_parsed() {
+        val date = DateUtils.parseDate(bug1Date)
+        val expected =
+            LocalDateTime(2022, 12, 24, 18, 0, 8, 0).toInstant(TimeZone.currentSystemDefault())
+                .toEpochMilliseconds()
+
+        assertEquals(date, expected)
+    }
+
 }

androidApp/src/test/kotlin/TestUtils.kt

@@ -17,7 +17,8 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I
             icon = item.icon,
             link = item.link,
             sourcetitle = item.sourcetitle,
-            tags = item.tags
+            tags = item.tags,
+            author = item.author
         )
     )
 }
@@ -35,7 +36,8 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S
             icon = item.icon,
             link = item.link,
             sourcetitle = item.sourcetitle,
-            tags = item.tags.split(',')
+            tags = item.tags.split(','),
+            author = item.author
         )
     )
 }
@@ -54,4 +56,5 @@ class FakeItemParameters {
         "https://ilblogdellasci.wordpress.com/2022/09/09/etica-della-ricerca-sotto-i-riflettori/"
     var sourcetitle = "La Chimica e la Società"
     var tags = "Chimica, Testing"
+    var author = "Someone important"
 }

build.gradle.kts

@@ -7,18 +7,17 @@ buildscript {
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("7.3.1").apply(false)
-    id("com.android.library").version("7.3.1").apply(false)
+    id("com.android.application").version("7.4.0").apply(false)
+    id("com.android.library").version("7.4.0").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 {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         mavenCentral()
         jcenter()
@@ -30,3 +29,7 @@ allprojects {
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
+
+koverMerged {
+    enable()
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Feb 09 17:05:19 CET 2022
+#Mon Jan 23 20:47:46 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -2,6 +2,7 @@ val pushCache: String by settings
 
 pluginManagement {
     repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         gradlePluginPortal()
         mavenCentral()
@@ -10,6 +11,7 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
+        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         mavenCentral()
     }

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/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt

@@ -10,7 +10,11 @@ actual class DateUtils {
             return try {
                 Instant.parse(dateString).toEpochMilliseconds()
             } catch (e: Exception) {
-                LocalDateTime.parse(dateString.replace(" ", "T")).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
+                var str = dateString.replace(" ", "T")
+                if (str.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+\\d{2}".toRegex())) {
+                    str = str.split("+")[0]
+                }
+                LocalDateTime.parse(str).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
             }
         }
 

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/DI/modules.kt

@@ -9,7 +9,6 @@ import org.kodein.di.instance
 import org.kodein.di.singleton
 
 val networkModule by DI.Module {
-    bind<AppSettingsService>() with singleton { AppSettingsService() }
     bind<SelfossApi>() with singleton { SelfossApi(instance()) }
     bind<MercuryApi>() with singleton { MercuryApi() }
 }

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

@@ -1,157 +1,17 @@
 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 {
 
     @Serializable
     class ParsedContent(
-        val title: String,
-        val content: String?,
-        val lead_image_url: String?,
-        val url: String
+        val title: String? = null,
+        val content: String? = null,
+        val lead_image_url: String? = null, // NOSONAR
+        val url: String? = null,
+        val error: Boolean? = null,
+        val message: String? = null,
+        val failed: Boolean? = null
     )
-
-    @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

@@ -1,8 +1,5 @@
 package bou.amine.apps.readerforselfossv2.model
 
-import io.ktor.client.call.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -21,20 +18,4 @@ class StatusAndData<T>(val success: Boolean, val data: T? = null) {
             return StatusAndData(false)
         }
     }
-}
-
-suspend fun maybeResponse(r: HttpResponse): SuccessResponse {
-    return if (r.status.isSuccess()) {
-        r.body()
-    } else {
-        SuccessResponse(false)
-    }
-}
-
-suspend inline fun <reified T> bodyOrFailure(r: HttpResponse): StatusAndData<T> {
-    return if (r.status.isSuccess()) {
-        StatusAndData.succes(r.body())
-    } else {
-        StatusAndData.error()
-    }
 }

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

@@ -9,6 +9,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.encoding.encodeCollection
 import kotlinx.serialization.json.*
 
 class SelfossModel {
@@ -23,8 +24,8 @@ class SelfossModel {
     @Serializable
     class Stats(
         val total: Int,
-        val unread: Int,
-        val starred: Int
+        val unread: Int? = null,
+        val starred: Int? = null
     )
 
     @Serializable
@@ -34,30 +35,68 @@ class SelfossModel {
     )
 
     @Serializable
-    data class ApiVersion(
-        val version: String?,
-        val apiversion: String?
+    data class ApiInformation(
+        val version: String? = null,
+        val apiversion: String? = null,
+        val configuration: ApiConfiguration? = null
     ) {
-        fun getApiMajorVersion() : Int {
+        fun getApiMajorVersion(): Int {
             var versionNumber = 0
             if (apiversion != null) {
                 versionNumber = apiversion.substringBefore(".").toInt()
             }
             return versionNumber
         }
+
+        fun getApiConfiguration() = configuration ?: ApiConfiguration(null, null)
     }
 
     @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?
-    )
+    data class ApiConfiguration(
+        @Serializable(with = BooleanSerializer::class)
+        val publicMode: Boolean? = null,
+        @Serializable(with = BooleanSerializer::class)
+        val authEnabled: Boolean? = null
+    ) {
+        fun isAuthEnabled() = authEnabled ?: true
 
+        fun isPublicModeEnabled() = publicMode ?: false
+    }
+
+    interface Source {
+        val id: Int
+        var title: String
+        var unread: Int?
+        var error: String?
+        var icon: String?
+    }
+
+    @Serializable
+    data class SourceStats(
+        override val id: Int,
+        override var title: String,
+        override var unread: Int? = null,
+        override var error: String? = null,
+        override var icon: String? = null
+        ) : Source
+
+    @Serializable
+    data class SourceDetail(
+        override val id: Int,
+        override var title: String,
+        override var unread: Int? = null,
+        @Serializable(with = TagsListSerializer::class)
+        var tags: List<String>? = null,
+        var spout: String? = null,
+        override var error: String? = null,
+        override var icon: String? = null,
+        var params: SourceParams? = null
+    ) : Source
+
+    @Serializable
+    data class SourceParams(
+        val url: String? = null
+    )
     @Serializable
     data class Item(
         val id: Int,
@@ -68,26 +107,21 @@ class SelfossModel {
         var unread: Boolean,
         @Serializable(with = BooleanSerializer::class)
         var starred: Boolean,
-        val thumbnail: String?,
-        val icon: String?,
+        val thumbnail: String? = null,
+        val icon: String? = null,
         val link: String,
         val sourcetitle: String,
         @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>
+        val tags: List<String>,
+        val author: String? = null
     ) {
-        // 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;", "&")
-                }
+            stringUrl = if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
+                link.substringAfter("&amp;url=")
+            } else {
+                this.link.replace("&amp;", "&")
+            }
 
             // handle :443 => https
             if (stringUrl.contains(":443")) {
@@ -102,8 +136,14 @@ class SelfossModel {
             return stringUrl
         }
 
-        fun sourceAndDateText(): String =
-            this.sourcetitle.getHtmlDecoded() + DateUtils.parseRelativeDate(this.datetime)
+        fun sourceAuthorAndDate(): String {
+            var txt = this.sourcetitle.getHtmlDecoded()
+            if (!this.author.isNullOrBlank()) {
+                txt += " (by ${this.author}) "
+            }
+            txt += DateUtils.parseRelativeDate(this.datetime)
+            return txt
+        }
 
         fun toggleStar(): Item {
             this.starred = !this.starred
@@ -111,11 +151,12 @@ class SelfossModel {
         }
     }
 
+
     // 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() }
+                is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") }
                 else -> json.toString().split(",")
             }
 
@@ -125,7 +166,7 @@ class SelfossModel {
             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
 
         override fun serialize(encoder: Encoder, value: List<String>) {
-            TODO("Not yet implemented")
+            encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
         }
     }
 

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -8,13 +8,19 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.*
 import io.github.aakira.napier.Napier
+import io.ktor.client.call.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, val isConnectionAvailable: MutableStateFlow<Boolean>, private val db: ReaderForSelfossDB) {
+class Repository(
+    private val api: SelfossApi,
+    private val appSettingsService: AppSettingsService,
+    val isConnectionAvailable: MutableStateFlow<Boolean>,
+    private val db: ReaderForSelfossDB
+) {
 
     var items = ArrayList<SelfossModel.Item>()
     var connectionMonitored = false
@@ -23,8 +29,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     var displayedItems = ItemType.UNREAD
 
-    var tagFilter: SelfossModel.Tag? = null
-    var sourceFilter: SelfossModel.Source? = null
+    private var _tagFilter = MutableStateFlow<SelfossModel.Tag?>(null)
+    var tagFilter = _tagFilter.asStateFlow()
+    private var _sourceFilter = MutableStateFlow<SelfossModel.Source?>(null)
+    var sourceFilter = _sourceFilter.asStateFlow()
     var searchFilter: String? = null
 
     var offlineOverride = false
@@ -36,47 +44,44 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     private val _badgeStarred = MutableStateFlow(0)
     val badgeStarred = _badgeStarred.asStateFlow()
 
-    private var fetchedSources = false
     private var fetchedTags = false
+    private var fetchedSources = false
+
+    private var _readerItems = ArrayList<SelfossModel.Item>()
+    private var _selectedSource: SelfossModel.SourceDetail? = null
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
-        // TODO: Use the updatedSince parameter
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
-        var fromDB = false
         if (isNetworkAvailable()) {
             fetchedItems = api.getItems(
                 displayedItems.type,
                 offset = 0,
-                tagFilter?.tag,
-                sourceFilter?.id?.toLong(),
+                tagFilter.value?.tag,
+                sourceFilter.value?.id?.toLong(),
                 searchFilter,
                 null
             )
-        } else {
-            if (appSettingsService.isItemCachingEnabled()) {
-                fromDB = true
-                var dbItems = getDBItems().filter {
-                    displayedItems == ItemType.ALL ||
-                            (it.unread && displayedItems == ItemType.UNREAD) ||
-                            (it.starred && displayedItems == ItemType.STARRED)
-                }
-                if (tagFilter != null) {
-                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter!!.tag) }
-                }
-                if (sourceFilter != null) {
-                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter!!.title }
-                }
-                fetchedItems = StatusAndData.succes(
-                    dbItems.map { it.toView() }
-                )
+        } else if (appSettingsService.isItemCachingEnabled()) {
+            var dbItems = getDBItems().filter {
+                displayedItems == ItemType.ALL ||
+                        (it.unread && displayedItems == ItemType.UNREAD) ||
+                        (it.starred && displayedItems == ItemType.STARRED)
             }
+            if (tagFilter.value != null) {
+                dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
+            }
+            if (sourceFilter.value != null) {
+                dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
+            }
+            val itemsList = ArrayList(dbItems.map { it.toView() })
+            itemsList.sortByDescending { DateUtils.parseDate(it.datetime) }
+            fetchedItems = StatusAndData.succes(
+                itemsList
+            )
         }
 
         if (fetchedItems.success && fetchedItems.data != null) {
             items = ArrayList(fetchedItems.data!!)
-            if (fromDB) {
-                items.sortByDescending { DateUtils.parseDate(it.datetime) }
-            }
         }
         return items
     }
@@ -88,8 +93,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
             fetchedItems = api.getItems(
                 displayedItems.type,
                 offset,
-                tagFilter?.tag,
-                sourceFilter?.id?.toLong(),
+                tagFilter.value?.tag,
+                sourceFilter.value?.id?.toLong(),
                 searchFilter,
                 null
             )
@@ -127,9 +132,9 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         if (isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
-                _badgeUnread.value = response.data.unread
+                _badgeUnread.value = response.data.unread ?: 0
                 _badgeAll.value = response.data.total
-                _badgeStarred.value = response.data.starred
+                _badgeStarred.value = response.data.starred ?: 0
                 success = true
             }
         } else if (appSettingsService.isItemCachingEnabled()) {
@@ -144,7 +149,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     }
 
     suspend fun getTags(): List<SelfossModel.Tag> {
-        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         return if (isNetworkAvailable() && !fetchedTags) {
             val apiTags = api.tags()
             if (apiTags.success && apiTags.data != null && isDatabaseEnabled) {
@@ -161,39 +167,61 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    // TODO: Add tests
     suspend fun getSpouts(): Map<String, SelfossModel.Spout> {
         return if (isNetworkAvailable()) {
             val spouts = api.spouts()
             if (spouts.success && spouts.data != null) {
                 spouts.data
             } else {
-                emptyMap() // TODO: do something here
+                emptyMap()
             }
         } else {
             throw NetworkUnavailableException()
         }
     }
 
-    suspend fun getSources(): ArrayList<SelfossModel.Source> {
-        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-        return if (isNetworkAvailable() && !fetchedSources) {
-            val apiSources = api.sources()
-            if (apiSources.success && apiSources.data != null && isDatabaseEnabled) {
-                resetDBSourcesWithData(apiSources.data)
-                if (!appSettingsService.isUpdateSourcesEnabled()) {
+    suspend fun getSourcesDetailsOrStats(): ArrayList<SelfossModel.Source> {
+        var sources = ArrayList<SelfossModel.Source>()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
+        if (shouldFetch && isNetworkAvailable()) {
+            if (appSettingsService.getPublicAccess()) {
+                val apiSources = api.sourcesStats()
+                if (apiSources.success && apiSources.data != null) {
                     fetchedSources = true
+                    sources = apiSources.data as ArrayList<SelfossModel.Source>
                 }
+            } else {
+                sources = getSourcesDetails() as ArrayList<SelfossModel.Source>
             }
-            apiSources.data ?: ArrayList()
         } else if (isDatabaseEnabled) {
-            ArrayList(getDBSources().map { it.toView() })
-        } else {
-            ArrayList()
+            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.Source>
         }
+
+        return sources
+    }
+
+    suspend fun getSourcesDetails(): ArrayList<SelfossModel.SourceDetail> {
+        var sources = ArrayList<SelfossModel.SourceDetail>()
+        val isDatabaseEnabled =
+            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
+        if (shouldFetch && isNetworkAvailable()) {
+            val apiSources = api.sourcesDetailed()
+            if (apiSources.success && apiSources.data != null) {
+                fetchedSources = true
+                sources = apiSources.data
+                if (isDatabaseEnabled) {
+                    resetDBSourcesWithData(sources)
+                }
+            }
+        } else if (isDatabaseEnabled) {
+            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.SourceDetail>
+        }
+        return sources
     }
 
-    // TODO: Add tests
     suspend fun markAsRead(item: SelfossModel.Item): Boolean {
         val success = markAsReadById(item.id)
 
@@ -212,7 +240,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    // TODO: Add tests
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
         val success = unmarkAsReadById(item.id)
 
@@ -231,7 +258,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    // TODO: Add tests
     suspend fun starr(item: SelfossModel.Item): Boolean {
         val success = starrById(item.id)
 
@@ -250,7 +276,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    // TODO: Add tests
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
         val success = unstarrById(item.id)
 
@@ -269,7 +294,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    // TODO: Add tests
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
@@ -331,7 +355,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         url: String,
         spout: String,
         tags: String,
-        filter: String
     ): Boolean {
         var response = false
         if (isNetworkAvailable()) {
@@ -340,21 +363,41 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                 url,
                 spout,
                 tags,
-                filter,
-                appSettingsService.getApiVersion()
             ).isSuccess == true
         }
 
         return response
     }
 
-    suspend fun deleteSource(id: Int): Boolean {
+    suspend fun updateSource(
+        id: Int,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String
+    ): Boolean {
+        var response = false
+        if (isNetworkAvailable()) {
+            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
+        }
+
+        return response
+    }
+
+    suspend fun deleteSource(id: Int, title: String): Boolean {
         var success = false
         if (isNetworkAvailable()) {
             val response = api.deleteSource(id)
             success = response.isSuccess
         }
 
+        // We filter on success or if the network isn't available
+        if (success || !isNetworkAvailable()) {
+            items = ArrayList(items.filter { it.sourcetitle != title })
+            setReaderItems(items)
+            db.itemsQueries.deleteItemsWhereSource(title)
+        }
+
         return success
     }
 
@@ -373,25 +416,69 @@ 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 shouldBeSelfossInstance(): Pair<Boolean, Boolean> {
+        var fetchFailed = true
+        var showSelfossOnlyModal = false
+        if (isNetworkAvailable()) {
+            try {
+                // Trying to fetch one item, and check someone is trying to use the app with
+                // a random rss feed, that would throw a NoTransformationFoundException
+                fetchFailed = !api.getItemsWithoutCatch().success
+            } catch (e: NoTransformationFoundException) {
+                showSelfossOnlyModal = true
+            } catch (e: Throwable) {
+                Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance")
+            }
+        }
+
+        return Pair(fetchFailed, showSelfossOnlyModal)
+    }
+
+    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")
+            }
+            appSettingsService.clearAll()
+        } else {
+            appSettingsService.clearAll()
+        }
+    }
+
     fun refreshLoginInformation(url: String, login: String, password: String) {
         appSettingsService.refreshLoginInformation(url, login, password)
         baseUrl = url
         api.refreshLoginInformation()
     }
 
-    suspend fun updateApiVersion() {
+    suspend fun updateApiInformation() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
         if (isNetworkAvailable()) {
-            val fetchedVersion = api.version()
-            if (fetchedVersion.success && fetchedVersion.data != null && fetchedVersion.data.getApiMajorVersion() != apiMajorVersion) {
-                appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
+            val fetchedInformation = api.apiInformation()
+            if (fetchedInformation.success && fetchedInformation.data != null) {
+                if (fetchedInformation.data.getApiMajorVersion() != apiMajorVersion) {
+                    appSettingsService.updateApiVersion(fetchedInformation.data.getApiMajorVersion())
+                }
+                // Check if we're accessing the instance in public mode
+                // This happens when auth and public mode are enabled but
+                // no credentials are provided to login
+                if (appSettingsService.getUserName().isEmpty()
+                    && fetchedInformation.data.getApiConfiguration().isAuthEnabled()
+                    && fetchedInformation.data.getApiConfiguration().isPublicModeEnabled()) {
+                    appSettingsService.updatePublicAccess(true)
+                }
             }
         }
     }
@@ -418,7 +505,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    private fun resetDBSourcesWithData(sources: List<SelfossModel.Source>) {
+    private fun resetDBSourcesWithData(sources: List<SelfossModel.SourceDetail>) {
         db.sourcesQueries.deleteAllSources()
 
         db.sourcesQueries.transaction {
@@ -438,11 +525,30 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     private fun getDBItems(): List<ITEM> = db.itemsQueries.items().executeAsList()
 
-    private fun insertDBAction(articleid: String, read: Boolean = false, unread: Boolean = false, starred: Boolean = false, unstarred: Boolean = false) =
+    private fun insertDBAction(
+        articleid: String,
+        read: Boolean = false,
+        unread: Boolean = false,
+        starred: Boolean = false,
+        unstarred: Boolean = false
+    ) =
         db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
 
     private fun updateDBItem(item: SelfossModel.Item) =
-        db.itemsQueries.updateItem(item.datetime, item.title.getHtmlDecoded(), item.content, item.unread, item.starred, item.thumbnail, item.icon, item.link, item.sourcetitle, item.tags.joinToString(","), item.id.toString())
+        db.itemsQueries.updateItem(
+            item.datetime,
+            item.title.getHtmlDecoded(),
+            item.content,
+            item.unread,
+            item.starred,
+            item.thumbnail,
+            item.icon,
+            item.link,
+            item.sourcetitle,
+            item.tags.joinToString(","),
+            item.author,
+            item.id.toString()
+        )
 
     suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> {
         try {
@@ -457,7 +563,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         return emptyList()
     }
 
-    // TODO: Add tests
     suspend fun handleDBActions() {
 
         val actions: List<ACTION> = getDBActions()
@@ -489,4 +594,36 @@ 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
+    }
+
+    fun setReaderItems(readerItems: ArrayList<SelfossModel.Item>) {
+        _readerItems = readerItems
+    }
+
+    fun getReaderItems(): ArrayList<SelfossModel.Item> {
+        return _readerItems
+    }
+
+    fun migrate(driverFactory: DriverFactory) {
+        ReaderForSelfossDB.Schema.migrate(driverFactory.createDriver(), 0, 1)
+    }
+
+    fun setSelectedSource(source: SelfossModel.SourceDetail) {
+        _selectedSource = source
+    }
+
+    fun unsetSelectedSource() {
+        _selectedSource = null
+    }
+
+    fun getSelectedSource(): SelfossModel.SourceDetail? {
+        return _selectedSource
+    }
 }

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

@@ -0,0 +1,82 @@
+package bou.amine.apps.readerforselfossv2.rest
+
+import bou.amine.apps.readerforselfossv2.model.StatusAndData
+import bou.amine.apps.readerforselfossv2.model.SuccessResponse
+import io.github.aakira.napier.Napier
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.request.*
+import io.ktor.client.request.forms.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+
+
+suspend fun responseOrSuccessIf404(r: HttpResponse?): SuccessResponse {
+    return if (r != null && r.status === HttpStatusCode.NotFound) {
+        SuccessResponse(true)
+    } else {
+        maybeResponse(r)
+    }
+}
+
+suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
+    return if (r != null && r.status.isSuccess()) {
+        r.body()
+    } else {
+        if (r != null) {
+            Napier.i("Error ${r.status}", tag = "maybeResponse")
+        }
+        SuccessResponse(false)
+    }
+}
+
+suspend inline fun <reified T> bodyOrFailure(r: HttpResponse?): StatusAndData<T> {
+    return if (r != null && r.status.isSuccess()) {
+        StatusAndData.succes(r.body())
+    } else {
+        StatusAndData.error()
+    }
+}
+
+inline fun tryToRequest(
+    requestType: String,
+    fn: () -> HttpResponse
+): HttpResponse? {
+    var response: HttpResponse? = null
+    try {
+        response = fn()
+    } catch (ex: Exception) {
+        Napier.e("Couldn't execute $requestType request", ex, "tryTo$requestType")
+    }
+    return response
+}
+
+suspend inline fun HttpClient.tryToGet(
+    urlString: String,
+    crossinline block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? = tryToRequest("Get") { return this.get { url(urlString); block() } }
+
+
+suspend inline fun HttpClient.tryToPost(
+    urlString: String,
+    block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? = tryToRequest("Post") { return this.post { url(urlString); block() } }
+
+suspend inline fun HttpClient.tryToDelete(
+    urlString: String,
+    block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? = tryToRequest("Delete") { return this.delete { url(urlString); block() } }
+
+
+suspend fun HttpClient.tryToSubmitForm(
+    url: String,
+    formParameters: Parameters = Parameters.Empty,
+    encodeInQuery: Boolean = false,
+    block: HttpRequestBuilder.() -> Unit = {}
+): HttpResponse? =
+    tryToRequest("SubmitForm") {
+        return this.submitForm(formParameters, encodeInQuery) {
+            url(url)
+            block()
+        }
+    }

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

@@ -1,18 +1,27 @@
 package bou.amine.apps.readerforselfossv2.rest
 
-import bou.amine.apps.readerforselfossv2.model.*
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.model.StatusAndData
+import bou.amine.apps.readerforselfossv2.model.SuccessResponse
 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.auth.providers.*
 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 io.ktor.util.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 
 class SelfossApi(private val appSettingsService: AppSettingsService) {
@@ -20,19 +29,20 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
     var client = createHttpClient()
 
     private fun createHttpClient(): HttpClient {
-        return HttpClient {
+        val client = HttpClient {
             install(ContentNegotiation) {
                 install(HttpCache)
                 json(Json {
                     prettyPrint = true
                     isLenient = true
                     ignoreUnknownKeys = true
+                    explicitNulls = false
                 })
             }
             install(Logging) {
                 logger = object : Logger {
                     override fun log(message: String) {
-                        appSettingsService.logApiCalls(message)
+                        Napier.d(message, tag = "LogApiCalls")
                     }
                 }
                 level = LogLevel.INFO
@@ -40,22 +50,26 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             install(HttpTimeout) {
                 requestTimeoutMillis = appSettingsService.getApiTimeout()
             }
-            /* TODO: Auth as basic
-            if (apiDetailsService.getUserName().isNotEmpty() && apiDetailsService.getPassword().isNotEmpty()) {
-
-                install(Auth) {
-                    basic {
-                        credentials {
-                            BasicAuthCredentials(username = apiDetailsService.getUserName(), password = apiDetailsService.getPassword())
-                        }
-                        sendWithoutRequest {
-                            true
-                        }
+            install(HttpCookies)
+            install(HttpRequestRetry) {
+                maxRetries = 2
+                retryIf { _, response ->
+                    response.status == HttpStatusCode.Forbidden && shouldHavePostLogin() && hasLoginInfo()
+                }
+                modifyRequest {
+                    Napier.i("Will modify", tag = "HttpSend")
+                    CoroutineScope(Dispatchers.Main).launch {
+                        Napier.i("Will login", tag = "HttpSend")
+                        this@SelfossApi.login()
+                        Napier.i("Did login", tag = "HttpSend")
                     }
                 }
-            }*/
+            }
             expectSuccess = false
         }
+
+
+        return client
     }
 
     fun url(path: String) =
@@ -66,12 +80,83 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         client = createHttpClient()
     }
 
+    fun constructBasicAuthValue(credentials: BasicAuthCredentials): String {
+        val authString = "${credentials.username}:${credentials.password}"
+        val authBuf = authString.toByteArray(Charsets.UTF_8).encodeBase64()
+
+        return "Basic $authBuf"
+    }
+
+    // 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().isNotEmpty() && appSettingsService.getPassword()
+            .isNotEmpty()
+
     suspend fun login(): SuccessResponse =
-        maybeResponse(client.get(url("/login")) {
-            parameter("username", appSettingsService.getUserName())
-            parameter("password", appSettingsService.getPassword())
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
+                .isNotEmpty()
+        ) {
+            if (shouldHavePostLogin()) {
+                postLogin()
+            } else {
+                getLogin()
+            }
+        } else {
+            SuccessResponse(true)
+        }
+
+    private suspend fun getLogin() = maybeResponse(client.tryToGet(url("/login")) {
+        parameter("username", appSettingsService.getUserName())
+        parameter("password", appSettingsService.getPassword())
+        if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+            headers {
+                append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                )
+            }
+        }
+    })
+
+    private suspend fun postLogin() = maybeResponse(client.tryToPost(url("/login")) {
+        parameter("username", appSettingsService.getUserName())
+        parameter("password", appSettingsService.getPassword())
+        if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+            headers {
+                append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                )
+            }
+        }
+    })
+
+    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.tryToGet(url("/logout")) {
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
         })
 
+    private suspend fun doLogout() = maybeResponse(client.tryToDelete(url("/api/session/current")) {
+        if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+            headers {
+                append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                )
+            }
+        }
+    })
+
     suspend fun getItems(
         type: String,
         offset: Int,
@@ -81,82 +166,209 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         updatedSince: String?,
         items: Int? = null
     ): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(client.get(url("/items")) {
+        bodyOrFailure(client.tryToGet(url("/items")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-                parameter("type", type)
-                parameter("tag", tag)
-                parameter("source", source)
-                parameter("search", search)
-                parameter("updatedsince", updatedSince)
-                parameter("items", items ?: appSettingsService.getItemsNumber())
-                parameter("offset", offset)
-            })
+            }
+            parameter("type", type)
+            parameter("tag", tag)
+            parameter("source", source)
+            parameter("search", search)
+            parameter("updatedsince", updatedSince)
+            parameter("items", items ?: appSettingsService.getItemsNumber())
+            parameter("offset", offset)
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
+
+    suspend fun getItemsWithoutCatch(): StatusAndData<List<SelfossModel.Item>> =
+        bodyOrFailure(client.get(url("/items")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            parameter("type", "all")
+            parameter("items", 1)
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
 
     suspend fun stats(): StatusAndData<SelfossModel.Stats> =
-        bodyOrFailure(client.get(url("/stats")) {
+        bodyOrFailure(client.tryToGet(url("/stats")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            })
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
 
     suspend fun tags(): StatusAndData<List<SelfossModel.Tag>> =
-        bodyOrFailure(client.get(url("/tags")) {
+        bodyOrFailure(client.tryToGet(url("/tags")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            })
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
 
     suspend fun update(): StatusAndData<String> =
-        bodyOrFailure(client.get(url("/update")) {
+        bodyOrFailure(client.tryToGet(url("/update")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            })
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
 
     suspend fun spouts(): StatusAndData<Map<String, SelfossModel.Spout>> =
-        bodyOrFailure(client.get(url("/sources/spouts")) {
+        bodyOrFailure(client.tryToGet(url("/sources/spouts")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            })
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
 
-    suspend fun sources(): StatusAndData<ArrayList<SelfossModel.Source>> =
-        bodyOrFailure(client.get(url("/sources/list")) {
+    suspend fun sourcesStats(): StatusAndData<ArrayList<SelfossModel.SourceStats>> =
+        bodyOrFailure(client.tryToGet(url("/sources/stats")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            })
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
 
-    suspend fun version(): StatusAndData<SelfossModel.ApiVersion> =
-        bodyOrFailure(client.get(url("/api/about")))
+    suspend fun sourcesDetailed(): StatusAndData<ArrayList<SelfossModel.SourceDetail>> =
+        bodyOrFailure(client.tryToGet(url("/sources/list")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
+
+    suspend fun apiInformation(): StatusAndData<SelfossModel.ApiInformation> =
+        bodyOrFailure(client.tryToGet(url("/api/about")) {
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
+        })
 
     suspend fun markAsRead(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/mark/$id")) {
-            parameter("username", appSettingsService.getUserName())
-            parameter("password", appSettingsService.getPassword())
+        maybeResponse(client.tryToPost(url("/mark/$id")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
         })
 
     suspend fun unmarkAsRead(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/unmark/$id")) {
-            parameter("username", appSettingsService.getUserName())
-            parameter("password", appSettingsService.getPassword())
+        maybeResponse(client.tryToPost(url("/unmark/$id")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
         })
 
     suspend fun starr(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/starr/$id")) {
-            parameter("username", appSettingsService.getUserName())
-            parameter("password", appSettingsService.getPassword())
+        maybeResponse(client.tryToPost(url("/starr/$id")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
         })
 
     suspend fun unstarr(id: String): SuccessResponse =
-        maybeResponse(client.post(url("/unstarr/$id")) {
-            parameter("username", appSettingsService.getUserName())
-            parameter("password", appSettingsService.getPassword())
+        maybeResponse(client.tryToPost(url("/unstarr/$id")) {
+            if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                    )
+                }
+            }
         })
 
     suspend fun markAllAsRead(ids: List<String>): SuccessResponse =
-        maybeResponse(client.submitForm(
+        maybeResponse(client.tryToSubmitForm(
             url = url("/mark"),
             formParameters = Parameters.build {
-                append("username", appSettingsService.getUserName())
-                append("password", appSettingsService.getPassword())
+                if (!shouldHavePostLogin()) {
+                    append("username", appSettingsService.getUserName())
+                    append("password", appSettingsService.getPassword())
+                }
                 ids.map { append("ids[]", it) }
+            },
+            block = {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                    headers {
+                        append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                        )
+                    }
+                }
             }
         ))
 
@@ -165,56 +377,107 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         url: String,
         spout: String,
         tags: String,
-        filter: String,
-        version: Int
     ): SuccessResponse =
         maybeResponse(
-            if (version > 1) {
-                createSource2(title, url, spout, tags, filter)
+            if (appSettingsService.getApiVersion() > 1) {
+                createSource("tags[]", title, url, spout, tags)
             } else {
-                createSource(title, url, spout, tags, filter)
+                createSource("tags", title, url, spout, tags)
             }
         )
 
-    suspend fun createSource(
+    private suspend fun createSource(
+        tagsParamName: String,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String
+    ): HttpResponse? =
+        client.tryToSubmitForm(
+            url = url("/source"),
+            formParameters = Parameters.build {
+                if (!shouldHavePostLogin()) {
+                    append("username", appSettingsService.getUserName())
+                    append("password", appSettingsService.getPassword())
+                }
+                append("title", title)
+                append("url", url)
+                append("spout", spout)
+                append(tagsParamName, tags)
+            },
+            block = {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                    headers {
+                        append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                        )
+                    }
+                }
+            }
+        )
+
+    suspend fun updateSourceForVersion(
+        id: Int,
+        title: String,
+        url: String,
+        spout: String,
+        tags: String
+    ): SuccessResponse =
+        maybeResponse(
+            if (appSettingsService.getApiVersion() > 1) {
+                updateSource(id, "tags[]", title, url, spout, tags)
+            } else {
+                updateSource(id, "tags", title, url, spout, tags)
+            }
+        )
+
+    private suspend fun updateSource(
+        id: Int,
+        tagsParamName: String,
         title: String,
         url: String,
         spout: String,
         tags: String,
-        filter: String
-    ): HttpResponse =
-        client.submitForm(
-            url = url("/source?username=${appSettingsService.getUserName()}&password=${appSettingsService.getPassword()}"),
+    ): HttpResponse? =
+        client.tryToSubmitForm(
+            url = url("/source/$id"),
             formParameters = Parameters.build {
+                if (!shouldHavePostLogin()) {
+                    append("username", appSettingsService.getUserName())
+                    append("password", appSettingsService.getPassword())
+                }
                 append("title", title)
                 append("url", url)
                 append("spout", spout)
-                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("filter", filter)
+                append(tagsParamName, tags)
+            },
+            block = {
+                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                    headers {
+                        append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword()))
+                        )
+                    }
+                }
             }
         )
 
     suspend fun deleteSource(id: Int): SuccessResponse =
-        maybeResponse(client.delete(url("/source/$id")) {
+        maybeResponse(client.tryToDelete(url("/source/$id")) {
+            if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            })
+            }
+            if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
+                headers {
+                    append(
+                        HttpHeaders.Authorization,
+                        constructBasicAuthValue(
+                            BasicAuthCredentials(
+                                username = appSettingsService.getBasicUserName(),
+                                password = appSettingsService.getBasicPassword()
+                            )
+                        )
+                    )
+                }
+            }
+        })
 }

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

@@ -0,0 +1,70 @@
+package bou.amine.apps.readerforselfossv2.service
+
+import com.russhwolf.settings.Settings
+
+// This will be used in ACRA process. For now, it does nothing.
+// This is to fix ACRA not sending reports anymore.
+// See https://www.acra.ch/docs/Troubleshooting-Guide#applicationoncreate
+class ACRASettings : Settings {
+    override val keys: Set<String> = emptySet()
+    override val size: Int = 0
+
+    override fun clear() {
+        // Nothing
+    }
+
+    override fun getBoolean(key: String, defaultValue: Boolean): Boolean = false
+
+    override fun getBooleanOrNull(key: String): Boolean? = null
+
+    override fun getDouble(key: String, defaultValue: Double): Double = 0.0
+
+    override fun getDoubleOrNull(key: String): Double? = null
+
+    override fun getFloat(key: String, defaultValue: Float): Float = 0.0F
+
+    override fun getFloatOrNull(key: String): Float? = null
+
+    override fun getInt(key: String, defaultValue: Int): Int = 0
+
+    override fun getIntOrNull(key: String): Int? = null
+
+    override fun getLong(key: String, defaultValue: Long): Long = 0
+
+    override fun getLongOrNull(key: String): Long? = null
+
+    override fun getString(key: String, defaultValue: String): String = "0"
+
+    override fun getStringOrNull(key: String): String? = null
+
+    override fun hasKey(key: String): Boolean = false
+
+    override fun putBoolean(key: String, value: Boolean) {
+        // Nothing
+    }
+
+    override fun putDouble(key: String, value: Double) {
+        // Nothing
+    }
+
+    override fun putFloat(key: String, value: Float) {
+        // Nothing
+    }
+
+    override fun putInt(key: String, value: Int) {
+        // Nothing
+    }
+
+    override fun putLong(key: String, value: Long) {
+        // Nothing
+    }
+
+    override fun putString(key: String, value: String) {
+        // Nothing
+    }
+
+    override fun remove(key: String) {
+        // Nothing
+    }
+
+}

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

@@ -1,17 +1,18 @@
 package bou.amine.apps.readerforselfossv2.service
 
 import com.russhwolf.settings.Settings
-import io.github.aakira.napier.Napier
-import io.ktor.client.plugins.*
 
-class AppSettingsService {
-    val settings: Settings = Settings()
+class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
+    val settings: Settings = if (acraSenderServiceProcess) { ACRASettings() } else { Settings() }
 
     // Api related
     private var _apiVersion: Int = -1
+    private var _publicAccess: Boolean? = null
     private var _baseUrl: String = ""
     private var _userName: String = ""
+    private var _basicUserName: String = ""
     private var _password: String = ""
+    private var _basicPassword: String = ""
 
     // User settings related
     private var _itemsCaching: Boolean? = null
@@ -27,7 +28,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,7 +36,6 @@ class AppSettingsService {
     private var _staticBar: Boolean? = null
     private var _font: String = ""
     private var _theme: Int? = null
-    private var _enableAnalytics: Boolean? = null
 
 
     init {
@@ -44,10 +43,6 @@ class AppSettingsService {
         refreshUserSettings()
     }
 
-    fun logApiCalls(message: String) {
-        Napier.d(message, tag = "LogApiCalls")
-    }
-
     fun getApiVersion(): Int {
         if (_apiVersion == -1) {
             refreshApiVersion()
@@ -56,10 +51,32 @@ class AppSettingsService {
         return _apiVersion
     }
 
+
+    fun updateApiVersion(apiMajorVersion: Int) {
+        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
+        refreshApiVersion()
+    }
+
     private fun refreshApiVersion() {
         _apiVersion = settings.getInt(API_VERSION_MAJOR, -1)
     }
 
+    fun getPublicAccess(): Boolean {
+        if (_publicAccess == null) {
+            refreshPublicAccess()
+        }
+        return _publicAccess!!
+    }
+
+    fun updatePublicAccess(publicAccess: Boolean) {
+        settings.putBoolean(API_PUBLIC_ACCESS, publicAccess)
+        refreshPublicAccess()
+    }
+
+    private fun refreshPublicAccess() {
+        _publicAccess = settings.getBoolean(API_PUBLIC_ACCESS, false)
+    }
+
     fun getBaseUrl(): String {
         if (_baseUrl.isEmpty()) {
             refreshBaseUrl()
@@ -81,6 +98,20 @@ class AppSettingsService {
         return _password
     }
 
+    fun getBasicUserName(): String {
+        if (_basicUserName.isEmpty()) {
+            refreshBasicUsername()
+        }
+        return _basicUserName
+    }
+
+    fun getBasicPassword(): String {
+        if (_basicPassword.isEmpty()) {
+            refreshBasicPassword()
+        }
+        return _basicPassword
+    }
+
     fun getItemsNumber(): Int {
         if (_itemsNumber == null) {
             refreshItemsNumber()
@@ -89,7 +120,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 {
@@ -99,9 +136,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 = if (settingsTimeout > 0) settingsTimeout else HttpTimeout.INFINITE_TIMEOUT_MS
+        _apiTimeout = secToMs(try {
+            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() {
@@ -116,6 +165,14 @@ class AppSettingsService {
         _password = settings.getString(PASSWORD, "")
     }
 
+    private fun refreshBasicUsername() {
+        _basicUserName = settings.getString(BASIC_LOGIN, "")
+    }
+
+    private fun refreshBasicPassword() {
+        _basicPassword = settings.getString(BASIC_PASSWORD, "")
+    }
+
     private fun refreshArticleViewerEnabled() {
         _articleViewer = settings.getBoolean(PREFER_ARTICLE_VIEWER, true)
     }
@@ -212,19 +269,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)
     }
@@ -309,17 +353,6 @@ 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, "")
     }
@@ -345,8 +378,11 @@ class AppSettingsService {
     fun refreshApiSettings() {
         refreshPassword()
         refreshUsername()
+        refreshBasicUsername()
+        refreshBasicPassword()
         refreshBaseUrl()
         refreshApiVersion()
+        refreshPublicAccess()
     }
 
     fun refreshUserSettings() {
@@ -361,7 +397,6 @@ class AppSettingsService {
         refreshPeriodicRefreshEnabled()
         refreshRefreshWhenChargingOnlyEnabled()
         refreshRefreshMinutes()
-        refreshHiddenTags()
         refreshInfiniteLoadingEnabled()
         refreshItemCachingEnabled()
         refreshNotifyNewItemsEnabled()
@@ -371,7 +406,6 @@ class AppSettingsService {
         refreshFont()
         refreshStaticBarEnabled()
         refreshCurrentTheme()
-        refreshAnalyticsEnabled()
     }
 
     fun refreshLoginInformation(
@@ -379,7 +413,17 @@ class AppSettingsService {
         login: String,
         password: String
     ) {
-        settings.putString(BASE_URL, url)
+        val regex = """\/\/(\D+):(\D+)@""".toRegex()
+        val matchResult = regex.find(url)
+        if (matchResult != null) {
+            val (basicLogin, basicPassword) = matchResult.destructured
+            settings.putString(BASIC_LOGIN, basicLogin)
+            settings.putString(BASIC_PASSWORD, basicPassword)
+            val urlWithoutBasicAuth = url.replace(regex, "//")
+            settings.putString(BASE_URL, urlWithoutBasicAuth)
+        } else {
+            settings.putString(BASE_URL, url)
+        }
         settings.putString(LOGIN, login)
         settings.putString(PASSWORD, password)
         refreshApiSettings()
@@ -389,14 +433,11 @@ class AppSettingsService {
         settings.remove(BASE_URL)
         settings.remove(LOGIN)
         settings.remove(PASSWORD)
+        settings.remove(BASIC_LOGIN)
+        settings.remove(BASIC_PASSWORD)
         refreshApiSettings()
     }
 
-    fun updateApiVersion(apiMajorVersion: Int) {
-        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
-        refreshApiVersion()
-    }
-
     fun clearAll() {
         settings.clear()
         refreshApiSettings()
@@ -425,6 +466,8 @@ class AppSettingsService {
 
         const val API_VERSION_MAJOR = "apiVersionMajor"
 
+        const val API_PUBLIC_ACCESS = "apiPublicAccess"
+
         const val API_ITEMS_NUMBER = "prefer_api_items_number"
 
         const val API_TIMEOUT = "api_timeout"
@@ -435,6 +478,10 @@ class AppSettingsService {
 
         const val PASSWORD = "password"
 
+        const val BASIC_LOGIN = "basic_login"
+
+        const val BASIC_PASSWORD = "basic_password"
+
         const val PREFER_ARTICLE_VIEWER = "prefer_article_viewer"
 
         const val CARD_VIEW_ACTIVE = "card_view_active"
@@ -465,14 +512,11 @@ 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"
     }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/EntityUtils.kt

@@ -12,24 +12,27 @@ fun TAG.toView(): SelfossModel.Tag =
         this.unread.toInt()
     )
 
-fun SOURCE.toView(): SelfossModel.Source =
-    SelfossModel.Source(
+fun SOURCE.toView(): SelfossModel.SourceDetail =
+    SelfossModel.SourceDetail(
         this.id.toInt(),
         this.title,
-        this.tags.split(","),
+        null,
+        this.tags?.split(","),
         this.spout,
         this.error,
-        this.icon
+        this.icon,
+        if (this.url != null) SelfossModel.SourceParams(this.url) else null
     )
 
-fun SelfossModel.Source.toEntity(): SOURCE =
+fun SelfossModel.SourceDetail.toEntity(): SOURCE =
     SOURCE(
         this.id.toString(),
         this.title.getHtmlDecoded(),
-        this.tags.joinToString(","),
-        this.spout,
-        this.error,
-        this.icon.orEmpty()
+        this.tags?.joinToString(",").orEmpty(),
+        this.spout.orEmpty(),
+        this.error.orEmpty(),
+        this.icon.orEmpty(),
+        this.params?.url
     )
 
 fun SelfossModel.Tag.toEntity(): TAG =
@@ -51,7 +54,8 @@ fun ITEM.toView(): SelfossModel.Item =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags.split(",")
+        this.tags.split(","),
+        this.author
     )
 
 fun SelfossModel.Item.toEntity(): ITEM =
@@ -66,5 +70,6 @@ fun SelfossModel.Item.toEntity(): ITEM =
         this.icon,
         this.link,
         this.sourcetitle.getHtmlDecoded(),
-        this.tags.joinToString(",")
+        this.tags.joinToString(","),
+        this.author
     )

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/1.sqm

@@ -0,0 +1,6 @@
+CREATE TABLE ITEM_BACKUP AS SELECT `id`, `datetime`, `title`, `content`,
+ `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`,
+ `tags` FROM ITEM;
+ALTER TABLE ITEM_BACKUP ADD COLUMN `author` TEXT;
+DROP TABLE ITEM;
+ALTER TABLE ITEM_BACKUP RENAME TO ITEM;

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/2.sqm

@@ -0,0 +1 @@
+ALTER TABLE SOURCE ADD COLUMN `url` TEXT;