.drone.yml

@@ -0,0 +1,124 @@
+kind: pipeline
+type: docker
+name: test
+
+steps:
+  - name: AnylyseBuildTest
+    image: mingc/android-build-box:latest
+    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Configure gradle..."
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - echo "---------------------------------------------------------"
+      - echo "Analysing..."
+      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
+      - echo "---------------------------------------------------------"
+      - echo "Building..."
+      - ./gradlew build
+      - echo "---------------------------------------------------------"
+      - echo "Testing..."
+      - echo "---------------------------------------------------------"
+      - ./gradlew test
+    environment:
+      SONAR_HOST_URL:
+        from_secret: sonarScannerHostUrl
+      SONAR_LOGIN:
+        from_secret: sonarScannerLogin
+trigger:
+  event:
+    - push
+    - pull_request
+
+---
+kind: pipeline
+type: docker
+name: Publish
+
+steps:
+  - name: createTag
+    image: ubuntu:latest
+    commands:
+      - apt-get update && apt-get install -y git
+      - ./build.sh --publish --from-ci
+      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
+      - git push pushing --tags
+    environment:
+      GITEA_USR:
+        from_secret: giteaUsr
+      GITEA_PASS:
+        from_secret: giteaPass
+
+  - name: scpFiles
+    image: appleboy/drone-scp
+    settings:
+      host: amine-louveau.fr
+      username: ubuntu
+      key:
+        from_secret: privateKey
+      port: 22
+      target: /home/ubuntu/
+      source: version.txt
+
+  - name: deploy
+    image: appleboy/drone-ssh
+    settings:
+      host: amine-louveau.fr
+      user: ubuntu
+      key:
+        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/
+
+trigger:
+  event:
+    - promote
+  target:
+    - production
+
+---
+kind: pipeline
+type: docker
+name: Release
+
+steps:
+  - name: build
+    image: mingc/android-build-box:latest
+    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Configure gradle..."
+      - 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 "Generate APK"
+      - ./gradlew :androidApp:assembleGithubConfigRelease  -P pushCache=false
+      - echo "---------------------------------------------------------"
+      - echo "Get Key"
+      - wget https://amine-louveau.fr/key
+      - echo "---------------------------------------------------------"
+      - echo "Zipalign"
+      - $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
+      - echo "---------------------------------------------------------"
+      - echo "Sign"
+      - $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias $YOUR_KEY_ALIAS --ks-pass pass:$YOUR_KEYSTORE_PASSWORD --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
+      - echo "---------------------------------------------------------"
+      - echo "Verify"
+      - $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
+    environment:
+      YOUR_KEYSTORE_PASSWORD:
+        from_secret: keyPass
+      YOUR_KEY_ALIAS:
+        from_secret: keyAlias
+
+  - name: gitea_release
+    image: plugins/gitea-release
+    settings:
+      api_key:
+        from_secret: giteaAPI
+      base_url: https://gitea.amine-louveau.fr
+      files: signed.apk
+trigger:
+  event:
+    - tag

.gitea/workflows/common_build.yml

@@ -1,24 +0,0 @@
-name: Build
-on:
-  workflow_call:
-
-jobs:
-  BuildAndTest:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Fetch tags
-        run: git fetch --tags -p
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-      - name: Configure gradle...
-        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
-      - name: Build and test
-        run: ./gradlew build --stacktrace

.gitea/workflows/on_merge_on_release.yml

@@ -1,51 +0,0 @@
-name: Create tag
-on:
-  push:
-    branches:
-      - release
-
-jobs:
-  build:
-    uses: ./.gitea/workflows/common_build.yml
-  createTagAndChangelog:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Config git
-        run: |
-          git config --global user.email aminecmi+giteadrone@pm.me
-          git config --global user.name Gitea
-      - name: Creating the tag
-        run: |
-          git fetch --tags -p
-          PREV=$(git describe --tags --abbrev=0)
-          ./build.sh --publish --from-ci
-      - name: Generating changelog
-        run: |
-          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"
-          git push origin ${VER}
-          git push origin master
-      - name: copy file via ssh password
-        uses: garygrossgarten/github-action-scp@release
-        with:
-          host: amine-bouabdallaoui.fr
-          username: ubuntu
-          privateKey: ${{ secrets.PRIVATE_KEY }}
-          local: version.txt
-          target: /home/ubuntu/
-      - name: deploy version file
-        uses: appleboy/ssh-action@v1.2.0
-        with:
-          host: amine-bouabdallaoui.fr
-          username: ubuntu
-          key: ${{ secrets.PRIVATE_KEY }}
-          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/

.gitea/workflows/on_pr.yml

@@ -1,26 +0,0 @@
-name: Check PR code
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  Lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
-      - name: Install klint
-        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
-      - name: Install detekt
-        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
-      - name: Linting...
-        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true
-      - name: Detecting...
-        run: ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
-  build:
-    uses: ./.gitea/workflows/common_build.yml

.gitea/workflows/on_push.yml

@@ -1,9 +0,0 @@
-name: Check master code
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    uses: ./.gitea/workflows/common_build.yml

.gitea/workflows/on_tag.yml

@@ -1,48 +0,0 @@
-name: Create release
-on:
-  push:
-    tags:
-      
-jobs:
-  release:
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Fetch tags
-        run: git fetch --tags -p
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-      - name: Configure gradle...
-        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
-      - name: Generate APK
-        run: ./gradlew :androidApp:assembleGithubConfigRelease
-      - name: Get Key
-        run: wget ${{ secrets.KEY_URL }}
-      - name: Zippalign
-        run: $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
-      - name: Sigh
-        run: $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias ${{ secrets.KEY_ALIAS }} --ks-pass pass:${{ secrets.KEYSTORE_PASSWORD }} --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
-      - name: Verify
-        run: $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
-      - name: Release
-        uses: https://gitea.com/actions/release-action@main
-        with:
-          files: signed.apk
-          api_key: ${{ secrets.API_KEY }}
-      - name: Send mail
-        uses: https://github.com/dawidd6/action-send-mail@v4
-        with:
-          connection_url: ${{ secrets.MAIL_CONNECTION }}
-          to: ${{ secrets.MAIL_TO }}
-          from: ${{ secrets.MAIL_FROM }}
-          subject: Mapping file
-          priority: high
-          convert_markdown: true
-          body: Nouveu fichier de mapping
-          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt

.github/CONTRIBUTING.md

@@ -10,7 +10,7 @@ Please read the guidelines before contributing, and follow them (or try to) when
 
 There are many ways to contribute to this project, you could [translate the app](https://crowdin.com/project/readerforselfoss), report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
 
-You can fork the repository, and [help me solve some issues](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
+You can fork the repository, and [help me solve some issues](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
 
 ### What I can't help you with.
 

CHANGELOG.md

@@ -1,284 +1,3 @@
-**v124041081**
-
-- chore: comment.
-- fix: Last time fixing the parsing date hack before moving it to os version.
-- Changelog for v124030731 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124030731**
-
-- fix: Basic auth and password can have non whitspace characters. Fixes 142.
-- Changelog for v124020451 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124020451**
-
-- fix: Fixed handling of position in card adapter.
-- Changelog for v124010301 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010301**
-
-- fix: This may fix the oom errors.
-- Changelog for v124010191 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010191**
-
-- fix: moving listeners.
-- chore: removed a useless log.
-- Changelog for v124010032 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010032**
-
-- fix: Another date format thing.
-- Changelog for v124010031 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010031**
-
-- fix: Checking if selfoss instance.
-- fix: handle three characters lenght hexcode colors.
-- Changelog for v123113311 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123113311**
-
-- chore: Source tracker url in the menu.
-- fix: Handle kodein proguard rules.
-- Changelog for v123102961 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123102961**
-
-- chore: domain changes.
-- Changelog for v123102852 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123102852**
-
-- chore: lint cleaning.
-- Changelog for v123102841 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123102841**
-
-- chore: cleaning ci steps and upgrading dependencies.
-- feat: Self signed ssl support.
-- Changelog for v123061811 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v123061811**
-
-- feat: Added confirmation dialog for disconnect item menu.
-- Changelog for v123061651 [CI SKIP]
-
---------------------------------------------------------------------
-
-**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**

README.md

@@ -1,4 +1,4 @@
-# ReaderForSelfoss-multiplatform [![Build Status](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/actions/workflows/on_push.yml/badge.svg)](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/actions?workflow=on_push.yml&actor=0&status=0)
+# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-louveau.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform)
 
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
@@ -10,6 +10,10 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 <a href="https://f-droid.org/packages/bou.amine.apps.readerforselfossv2.android"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
 
+## Screen captures
+
+<img src="res//fr-card.png?raw=true" alt="card view" width="400"/> <img src="res//fr-list.png?raw=true" alt="list view" width="400"/>
+
 ## Like my app ?
 
 <a href="https://www.buymeacoffee.com/aminecmi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>
@@ -18,15 +22,15 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
 
-2. Check the [Contribution guide](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
+2. Check the [Contribution guide](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
 
-3. Build the project by following [these steps](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
+3. Build the project by following [these steps](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
 
 ## Useful links
 
-- [Check what changed](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
+- [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
-- [See what I'm doing](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
+- [See what I'm doing](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
-- [Create an issue, or request a new feature](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
+- [Create an issue, or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
 
 ## Contributors (V1) (Alphabetical order) ❤️

androidApp/build.gradle.kts

@@ -8,15 +8,14 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("org.jetbrains.kotlinx.kover")
 }
 
 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
-    val result: String = ByteArrayOutputStream().use { outputStream ->
+    var result: String = ByteArrayOutputStream().use { outputStream ->
         project.exec {
             commandLine = cmd.split(" ")
             standardOutput = outputStream
-            isIgnoreExitValue = ignore
+            isIgnoreExitValue = ignore ?: false
         }
         outputStream.toString()
     }
@@ -24,10 +23,11 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
 }
 
 fun gitVersion(): String {
+    var process = ""
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    val process = if (maybeTagOfCurrentCommit.isEmpty()) {
+    process = if (maybeTagOfCurrentCommit.isEmpty()) {
         println("No tag on current commit. Will take the latest one.")
-        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
+        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
     } else {
         println("Tag found on current commit")
         execWithOutput("git -C ../ describe --contains HEAD")
@@ -55,24 +55,24 @@ fun versionNameFromGit(): String {
 
 android {
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         // Flag to enable support for the new language APIs
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     // For Kotlin projects
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
     }
-    compileSdk = 34
+    compileSdk = 33
+    buildToolsVersion = "31.0.0"
     buildFeatures {
         viewBinding = true
     }
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
-        minSdk = 25
+        minSdk = 21
-        targetSdk = 34
+        targetSdk = 33
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -85,7 +85,7 @@ android {
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    packaging {
+    packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
@@ -111,28 +111,27 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
-
     implementation(project(":shared"))
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
 
-    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation("androidx.preference:preference-ktx:1.1.1")
 
     implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
 
     // Android Support
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
+    implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.2.0-beta01")
+    implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.7.0")
+    implementation("androidx.annotation:annotation:1.3.0")
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    implementation("androidx.work:work-runtime-ktx:2.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("org.jsoup:jsoup:1.15.4")
+    implementation("org.jsoup:jsoup:1.14.3")
 
     //multidex
     implementation("androidx.multidex:multidex:2.0.1")
@@ -143,17 +142,18 @@ 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.15.0")
+    kapt("com.github.bumptech.glide:compiler:4.11.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.1.1")
 
     // Themes
     implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
-    implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
+    implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
 
     //Dependency Injection
     implementation("org.kodein.di:kodein-di:7.14.0")
@@ -169,7 +169,7 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.8.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
@@ -182,11 +182,14 @@ dependencies {
     //test
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.mockk:mockk:1.12.0")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
     implementation("ch.acra:acra-http:$acraVersion")
     implementation("ch.acra:acra-toast:$acraVersion")
+
+    // Matomo
+    implementation("com.github.matomo-org:matomo-sdk-android:4.1.4")
 }
 
 tasks.withType<Test> {

androidApp/proguard-rules.pro

@@ -55,7 +55,6 @@
 # maybe remove later ?
 -keep class * extends androidx.fragment.app.Fragment
 
--dontwarn org.slf4j.impl.StaticLoggerBinder
 
 # Keep `Companion` object fields of serializable classes.
 # This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
@@ -86,12 +85,3 @@
 
 -dontwarn io.mockk.**
 -keep class io.mockk.** { *; }
-
-
-
-# Kodein
--keep, allowobfuscation, allowoptimization class org.kodein.type.TypeReference
--keep, allowobfuscation, allowoptimization class org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest
-
--keep, allowobfuscation, allowoptimization class * extends org.kodein.type.TypeReference
--keep, allowobfuscation, allowoptimization class * extends org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest

androidApp/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <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" />
 
@@ -53,7 +52,7 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity
-            android:name=".UpsertSourceActivity"
+            android:name=".AddSourceActivity"
             android:parentActivityName=".SourcesActivity"
             android:exported="true">
             <meta-data
@@ -70,8 +69,7 @@
             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"

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

@@ -0,0 +1,172 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.*
+import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityAddSourceBinding
+import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
+import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.kodein.di.DIAware
+import org.kodein.di.android.closestDI
+import org.kodein.di.instance
+
+
+class AddSourceActivity : AppCompatActivity(), DIAware {
+
+    private var mSpoutsValue: String? = null
+
+    private lateinit var binding: ActivityAddSourceBinding
+
+    override val di by closestDI()
+    private val repository : Repository by instance()
+    private val appSettingsService : AppSettingsService by instance()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityAddSourceBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        setContentView(view)
+
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
+
+        binding.saveBtn.setOnClickListener {
+            handleSaveSource(
+                binding.tags,
+                binding.nameInput.text.toString(),
+                binding.sourceUri.text.toString()
+            )
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        val baseUrl = appSettingsService.getBaseUrl()
+        if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
+            mustLoginToAddSource()
+        } else {
+            handleSpoutsSpinner(binding.spoutsSpinner, binding.progress, binding.formContainer)
+        }
+    }
+
+    private fun handleSpoutsSpinner(
+        spoutsSpinner: Spinner,
+        mProgress: ProgressBar,
+        formContainer: ConstraintLayout
+    ) {
+        val spoutsKV = HashMap<String, String>()
+        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()
+                    mSpoutsValue = spoutsKV[spoutName]
+                }
+            }
+
+            override fun onNothingSelected(adapterView: AdapterView<*>) {
+                mSpoutsValue = null
+            }
+        }
+
+
+        fun handleSpoutFailure(networkIssue: Boolean = false) {
+            Toast.makeText(
+                this@AddSourceActivity,
+                if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
+                Toast.LENGTH_SHORT
+            ).show()
+            mProgress.visibility = View.GONE
+        }
+
+        CoroutineScope(Dispatchers.Main).launch {
+            try {
+                val items = repository.getSpouts()
+                if (items.isNotEmpty()) {
+                    val itemsStrings = items.map { it.value.name }
+                    for ((key, value) in items) {
+                        spoutsKV[value.name] = key
+                    }
+
+                    mProgress.visibility = View.GONE
+                    formContainer.visibility = View.VISIBLE
+
+                    val spinnerArrayAdapter =
+                        ArrayAdapter(
+                            this@AddSourceActivity,
+                            android.R.layout.simple_spinner_item,
+                            itemsStrings
+                        )
+                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                    spoutsSpinner.adapter = spinnerArrayAdapter
+                } else {
+                    handleSpoutFailure()
+                }
+            } catch (e: NetworkUnavailableException) {
+                handleSpoutFailure(networkIssue = true)
+            }
+        }
+    }
+
+    private fun maybeGetDetailsFromIntentSharing(
+        intent: Intent,
+        sourceUri: EditText,
+        nameInput: EditText
+    ) {
+        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
+            sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
+            nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+        }
+    }
+
+    private fun mustLoginToAddSource() {
+        Toast.makeText(this, getString(R.string.addStringNoUrl), Toast.LENGTH_SHORT).show()
+        val i = Intent(this, LoginActivity::class.java)
+        startActivity(i)
+        finish()
+    }
+
+    private fun handleSaveSource(tags: EditText, title: String, url: String) {
+
+        val sourceDetailsUnavailable =
+            title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
+
+        when {
+            sourceDetailsUnavailable -> {
+                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
+            }
+            else -> {
+                CoroutineScope(Dispatchers.Main).launch {
+                    val successfullyAddedSource = repository.createSource(
+                        title,
+                        url,
+                        mSpoutsValue!!,
+                        tags.text.toString(),
+                        "",
+                    )
+                    if (successfullyAddedSource) {
+                        finish()
+                    } else {
+                        Toast.makeText(
+                            this@AddSourceActivity,
+                            R.string.cant_create_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -13,11 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
@@ -35,20 +31,24 @@ 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.longHash
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 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.TrackHelper
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 
+
 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {
+
     private var items: ArrayList<SelfossModel.Item> = ArrayList()
 
     private var elementsShown: ItemType = ItemType.UNREAD
@@ -62,24 +62,29 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener
     private lateinit var binding: ActivityHomeBinding
 
-    private var recyclerAdapter: ItemsAdapter<out RecyclerView.ViewHolder>? = null
+    private var recyclerAdapter: RecyclerView.Adapter<*>? = null
 
     private var fromTabShortcut: Boolean = false
 
-    private val settingsLauncher =
+    private lateinit var tagsBadge: Map<Long, Int>
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+
+    private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         appSettingsService.refreshUserSettings()
     }
 
     override val di by closestDI()
     private val repository : Repository by instance()
     private val appSettingsService : AppSettingsService by instance()
+    private val tracker : Tracker by instance()
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeBinding.inflate(layoutInflater)
         val view = binding.root
 
+        TrackHelper.track().screen("/home").with(tracker)
+
         fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
         repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)
 
@@ -95,6 +100,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleSwipeRefreshLayout()
 
+
         if (appSettingsService.isItemCachingEnabled()) {
             CoroutineScope(Dispatchers.Main).launch {
                 repository.tryToCacheItemsAndGetNewOnes()
@@ -106,7 +112,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         binding.swipeRefreshLayout.setColorSchemeResources(
             R.color.refresh_progress_1,
             R.color.refresh_progress_2,
-            R.color.refresh_progress_3,
+            R.color.refresh_progress_3
         )
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
@@ -117,41 +123,31 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
-        val swipeDirs =
-            if (appSettingsService.getPublicAccess()) {
-                0
-            } else {
-                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
-            }
-
         val simpleItemTouchCallback =
             object : ItemTouchHelper.SimpleCallback(
                 0,
-                swipeDirs,
+                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
             ) {
                 override fun getSwipeDirs(
                     recyclerView: RecyclerView,
-                    viewHolder: RecyclerView.ViewHolder,
+                    viewHolder: RecyclerView.ViewHolder
                 ): Int =
                     if (elementsShown == ItemType.STARRED) {
                         0
                     } else {
                         super.getSwipeDirs(
                             recyclerView,
-                            viewHolder,
+                            viewHolder
                         )
                     }
 
                 override fun onMove(
                     recyclerView: RecyclerView,
                     viewHolder: RecyclerView.ViewHolder,
-                    target: RecyclerView.ViewHolder,
+                    target: RecyclerView.ViewHolder
                 ): Boolean = false
 
-                override fun onSwiped(
+                override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) {
-                    viewHolder: RecyclerView.ViewHolder,
-                    swipeDir: Int,
-                ) {
                     val position = viewHolder.bindingAdapterPosition
                     val i = items.elementAtOrNull(position)
 
@@ -160,6 +156,15 @@ 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()
+
                         // Just load everythin
                         if (items.size <= 0) {
                             getElementsAccordingToTab()
@@ -168,7 +173,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         Toast.makeText(
                             this@HomeActivity,
                             "Found null when swiping at positon $position.",
-                            Toast.LENGTH_LONG,
+                            Toast.LENGTH_LONG
                         ).show()
                     }
                 }
@@ -177,10 +182,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
     }
 
-    private fun updateBottomBarBadgeCount(
+    private fun updateBottomBarBadgeCount(badge: TextBadgeItem, count: Int) {
-        badge: TextBadgeItem,
-        count: Int,
-    ) {
         if (count > 0) {
             badge
                 .setText(count.toString())
@@ -191,16 +193,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBar() {
-        tabNewBadge =
+
-            TextBadgeItem()
+        tabNewBadge = TextBadgeItem()
             .setText("")
             .setHideOnSelect(false).hide(false)
-        tabArchiveBadge =
+        tabArchiveBadge = TextBadgeItem()
-            TextBadgeItem()
             .setText("")
             .setHideOnSelect(false).hide(false)
-        tabStarredBadge =
+        tabStarredBadge = TextBadgeItem()
-            TextBadgeItem()
             .setText("")
             .setHideOnSelect(false).hide(false)
 
@@ -229,19 +229,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         val tabNew =
             BottomNavigationItem(
                 R.drawable.ic_tab_fiber_new_black_24dp,
-                getString(R.string.tab_new),
+                getString(R.string.tab_new)
             )
                 .setBadgeItem(tabNewBadge)
         val tabArchive =
             BottomNavigationItem(
                 R.drawable.ic_tab_archive_black_24dp,
-                getString(R.string.tab_read),
+                getString(R.string.tab_read)
             )
                 .setBadgeItem(tabArchiveBadge)
         val tabStarred =
             BottomNavigationItem(
                 R.drawable.ic_tab_favorite_black_24dp,
-                getString(R.string.tab_favs),
+                getString(R.string.tab_favs)
             ).setActiveColorResource(R.color.pink)
                 .setBadgeItem(tabStarredBadge)
 
@@ -282,6 +282,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getElementsAccordingToTab()
     }
 
+
     private fun handleGDPRDialog(GDPRShown: Boolean) {
         val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
         messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
@@ -291,7 +292,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
+                "OK"
             ) { dialog, _ ->
                 appSettingsService.settings.putBoolean("GDPR_shown", true)
                 dialog.dismiss()
@@ -308,19 +309,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         when (currentManager) {
             is StaggeredGridLayoutManager ->
                 if (!appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
+                    layoutManager = GridLayoutManager(
-                        GridLayoutManager(
                         this,
-                            calculateNoOfColumns(),
+                        calculateNoOfColumns()
                     )
                     binding.recyclerView.layoutManager = layoutManager
                 }
             is GridLayoutManager ->
                 if (appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
+                    layoutManager = StaggeredGridLayoutManager(
-                        StaggeredGridLayoutManager(
                         calculateNoOfColumns(),
-                            StaggeredGridLayoutManager.VERTICAL,
+                        StaggeredGridLayoutManager.VERTICAL
                     )
                     layoutManager.gapStrategy =
                             StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
@@ -329,17 +328,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             else ->
                 if (currentManager == null) {
                     if (!appSettingsService.isCardViewEnabled()) {
-                        layoutManager =
+                        layoutManager = GridLayoutManager(
-                            GridLayoutManager(
                             this,
-                                calculateNoOfColumns(),
+                            calculateNoOfColumns()
                         )
                         binding.recyclerView.layoutManager = layoutManager
                     } else {
-                        layoutManager =
+                        layoutManager = StaggeredGridLayoutManager(
-                            StaggeredGridLayoutManager(
                             calculateNoOfColumns(),
-                                StaggeredGridLayoutManager.VERTICAL,
+                            StaggeredGridLayoutManager.VERTICAL
                         )
                         layoutManager.gapStrategy =
                                 StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
@@ -350,11 +347,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBarActions() {
-        binding.bottomBar.setTabSelectedListener(
+        binding.bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener {
-            object : BottomNavigationBar.OnTabSelectedListener {
             override fun onTabUnselected(position: Int) = Unit
 
             override fun onTabReselected(position: Int) {
+
                 when (val layoutManager = binding.recyclerView.adapter) {
                     is StaggeredGridLayoutManager ->
                         if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
@@ -382,24 +379,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
                 fetchOnEmptyList()
             }
-            },
+        })
-        )
     }
 
     fun fetchOnEmptyList() {
         binding.recyclerView.doOnNextLayout {
+            // TODO: do if last element (or is empty ?)
             getElementsAccordingToTab(true)
         }
     }
 
     private fun handleInfiniteScroll() {
-        recyclerViewScrollListener =
+        recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
-            object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
-                override fun onScrolled(
-                    localRecycler: RecyclerView,
-                    dx: Int,
-                    dy: Int,
-                ) {
                 if (dy > 0) {
                     val lastVisibleItem = getLastVisibleItem()
 
@@ -416,9 +408,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun getLastVisibleItem() : Int {
         return when (val manager = binding.recyclerView.layoutManager) {
-            is StaggeredGridLayoutManager ->
+            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
-                manager.findLastCompletelyVisibleItemPositions(
+                null
-                    null,
             ).last()
             is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
             else -> 0
@@ -432,9 +423,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             binding.emptyText.visibility = View.GONE
         }
 
-    fun getElementsAccordingToTab(appendResults: Boolean = false) {
+    fun getElementsAccordingToTab(
-        offset =
+        appendResults: Boolean = false
-            if (appendResults && items.size > 0) {
+    ) {
+        offset = if (appendResults && items.size > 0) {
             items.size - 1
         } else {
             0
@@ -444,15 +436,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getItems(appendResults, elementsShown)
     }
 
-    private fun getItems(
+    private fun getItems(appendResults: Boolean, itemType: ItemType) {
-        appendResults: Boolean,
-        itemType: ItemType,
-    ) {
         CoroutineScope(Dispatchers.Main).launch {
             binding.swipeRefreshLayout.isRefreshing = true
             repository.displayedItems = itemType
-            items =
+            items = if (appendResults) {
-                if (appendResults) {
                 repository.getOlderItems()
             } else {
                 repository.getNewerItems()
@@ -465,8 +453,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun handleListResult(appendResults: Boolean = false) {
         if (appendResults) {
             val oldManager = binding.recyclerView.layoutManager
-            firstVisible =
+            firstVisible = when (oldManager) {
-                when (oldManager) {
                 is StaggeredGridLayoutManager ->
                     oldManager.findFirstCompletelyVisibleItemPositions(null).last()
                 is GridLayoutManager ->
@@ -496,13 +483,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 binding.recyclerView.addItemDecoration(
                     DividerItemDecoration(
                         this@HomeActivity,
-                        DividerItemDecoration.VERTICAL,
+                        DividerItemDecoration.VERTICAL
-                    ),
+                    )
                 )
             }
             binding.recyclerView.adapter = recyclerAdapter
         } else {
-            recyclerAdapter!!.updateAllItems(items)
+                (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
         }
 
         reloadBadges()
@@ -542,10 +529,6 @@ 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
@@ -554,11 +537,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         return true
     }
 
-    private fun needsConfirmation(
+    private fun needsConfirmation(titleRes: Int, messageRes: Int, doFn: () -> Unit) {
-        titleRes: Int,
-        messageRes: Int,
-        doFn: () -> Unit,
-    ) {
         AlertDialog.Builder(this@HomeActivity)
             .setMessage(messageRes)
             .setTitle(titleRes)
@@ -570,11 +549,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.issue_tracker -> {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-                startActivity(browserIntent)
-                return true
-            }
             R.id.action_filter -> {
                 val filterSheetFragment = FilterSheetFragment()
                 filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG)
@@ -583,20 +557,21 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             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,
+                                R.string.refresh_success_response, Toast.LENGTH_LONG
-                                Toast.LENGTH_LONG,
                             )
                                 .show()
                         } else {
                             Toast.makeText(
                                 this@HomeActivity,
                                 R.string.refresh_failer_message,
-                                Toast.LENGTH_SHORT,
+                                Toast.LENGTH_SHORT
                             ).show()
                         }
                     }
@@ -614,7 +589,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 Toast.makeText(
                                     this@HomeActivity,
                                     R.string.all_posts_read,
-                                    Toast.LENGTH_SHORT,
+                                    Toast.LENGTH_SHORT
                                 ).show()
                                 tabNewBadge.removeBadge()
 
@@ -623,7 +598,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 Toast.makeText(
                                     this@HomeActivity,
                                     R.string.all_posts_not_read,
-                                    Toast.LENGTH_SHORT,
+                                    Toast.LENGTH_SHORT
                                 ).show()
                             }
                             handleListResult()
@@ -634,24 +609,18 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 return true
             }
             R.id.action_disconnect -> {
-                needsConfirmation(R.string.confirm_disconnect_title, R.string.confirm_disconnect_description) {
+                CoroutineScope(Dispatchers.Main).launch {
-                    runBlocking {
                     repository.logout()
                 }
                 val intent = Intent(this, LoginActivity::class.java)
                 this.startActivity(intent)
-                    finish()
+                this@HomeActivity.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)
         }
     }
@@ -670,8 +639,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun handleRecurringTask() {
         if (appSettingsService.isPeriodicRefreshEnabled()) {
-            val myConstraints =
+            val myConstraints = Constraints.Builder()
-                Constraints.Builder()
                 .setRequiresBatteryNotLow(true)
                 .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled())
                 .setRequiresStorageNotLow(true)
@@ -683,9 +651,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                     .addTag("selfoss-loading")
                     .build()
 
-            WorkManager.getInstance(
+            WorkManager.getInstance(baseContext).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
-                baseContext,
-            ).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
         }
     }
 }
+

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

@@ -3,7 +3,6 @@ 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
@@ -24,6 +23,7 @@ class ImageActivity : AppCompatActivity() {
         setContentView(view)
 
         setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
@@ -31,52 +31,12 @@ 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 -> {
-                onBackPressedDispatcher.onBackPressed()
+                onBackPressed()
                 return true
             }
         }
@@ -85,6 +45,7 @@ class ImageActivity : AppCompatActivity() {
     }
 
     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+
         override fun getItemCount(): Int = allImages.size
 
         override fun createFragment(position: Int): Fragment = ImageFragment.newInstance(allImages[position])

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

@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.Menu
@@ -12,7 +11,6 @@ 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
@@ -24,12 +22,18 @@ 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 {
+
     private var inValidCount: Int = 0
     private var isWithLogin = false
 
@@ -38,10 +42,16 @@ class LoginActivity : AppCompatActivity(), DIAware {
     override val di by closestDI()
     private val repository : Repository by instance()
     private val appSettingsService : AppSettingsService by instance()
+    private val tracker : Tracker by instance()
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        TrackHelper.track().download().identifier(DownloadTracker.Extra.ApkChecksum(applicationContext))
+            .with(tracker)
+        TrackHelper.track().screen("/login").with(tracker)
+
         handleTheme()
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
@@ -54,7 +64,6 @@ class LoginActivity : AppCompatActivity(), DIAware {
         handleBaseUrlFail()
 
         if (appSettingsService.getBaseUrl().isNotEmpty()) {
-            showProgress(true)
             goToMain()
         }
 
@@ -67,6 +76,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun handleActions() {
+
         binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
@@ -74,7 +84,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
                     return@OnEditorActionListener true
                 }
                 false
-            },
+            }
         )
 
         binding.signInButton.setOnClickListener { attemptLogin() }
@@ -95,7 +105,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
+                "OK"
             ) { dialog, _ -> dialog.dismiss() }
             alertDialog.show()
         }
@@ -103,8 +113,16 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     private fun goToMain() {
         CoroutineScope(Dispatchers.Main).launch {
-            repository.updateApiInformation()
+            repository.updateApiVersion()
-            ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
+
+            val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
+            messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
+            tracker.userId = String(messageDigest.digest())
+
+            val mDimensionQueue = DimensionQueue(tracker)
+            mDimensionQueue.add(1, appSettingsService.getApiVersion().toString())
+
+            tracker.isOptOut = !appSettingsService.isAnalyticsEnabled()
         }
         val intent = Intent(this, HomeActivity::class.java)
         startActivity(intent)
@@ -120,6 +138,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun attemptLogin() {
+
         // Reset errors.
         binding.urlView.error = null
         binding.loginView.error = null
@@ -130,72 +149,13 @@ class LoginActivity : AppCompatActivity(), DIAware {
         val login = binding.loginView.text.toString().trim()
         val password = binding.passwordView.text.toString().trim()
 
-        failInvalidUrl(url)
-        failLoginDetails(password, login)
-
-        showProgress(true)
-
-        appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
-
-        repository.refreshLoginInformation(url, login, password)
-
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                repository.updateApiInformation()
-            } catch (e: Exception) {
-                if (e.message?.startsWith("No transformation found") == true) {
-                    Toast.makeText(
-                        applicationContext,
-                        R.string.application_selfoss_only,
-                        Toast.LENGTH_LONG,
-                    ).show()
-                    preferenceError()
-                    showProgress(false)
-                }
-            }
-            val result = repository.login()
-            if (result) {
-                val errorFetching = repository.checkIfFetchFails()
-                if (!errorFetching) {
-                    goToMain()
-                } else {
-                    preferenceError()
-                }
-            } else {
-                preferenceError()
-            }
-            showProgress(false)
-        }
-    }
-
-    private fun failLoginDetails(
-        password: String,
-        login: String,
-    ) {
-        var lastFocusedView: View? = null
         var cancel = false
-        if (isWithLogin) {
+        var focusView: View? = null
-            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()) {
-            cancel = true
             binding.urlView.error = getString(R.string.login_url_problem)
+            focusView = binding.urlView
+            cancel = true
             inValidCount++
             if (inValidCount == 3) {
                 val alertDialog = AlertDialog.Builder(this).create()
@@ -203,21 +163,45 @@ class LoginActivity : AppCompatActivity(), DIAware {
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
+                    "OK"
                 ) { dialog, _ -> dialog.dismiss() }
                 alertDialog.show()
                 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)
         }
     }
 
@@ -229,13 +213,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 0F else 1F,
+                if (show) 0F else 1F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
             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
@@ -243,13 +226,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 1F else 0F,
+                if (show) 1F else 0F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
                 binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
             }
-                },
+        }
         )
     }
 
@@ -260,17 +242,10 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.issue_tracker -> {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-                startActivity(browserIntent)
-                return true
-            }
             R.id.about -> {
                 LibsBuilder()
                     .withAboutIconShown(true)
                     .withAboutVersionShown(true)
-                    .withAboutSpecial2("Bug reports").withAboutSpecial2Description(AppSettingsService.trackerUrl)
-                    .withAboutSpecial1("Project Page").withAboutSpecial1Description(AppSettingsService.sourceUrl)
                     .start(this)
                 true
             }

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

@@ -8,6 +8,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivityMainBinding
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)

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

@@ -3,7 +3,10 @@ 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
@@ -15,6 +18,8 @@ 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 io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
@@ -30,24 +35,21 @@ 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
+        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
-            singleton {
-                Repository(
-                    instance(),
-                    instance(),
-                    isConnectionAvailable,
-                    instance(),
-                )
-            }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
         bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
+        bind<Tracker>() with singleton { TrackerBuilder.createDefault("https://matomo.amine-louveau.fr/matomo.php", if (BuildConfig.DEBUG) 4 else 5).build(
+            Matomo.getInstance(applicationContext)) }
     }
 
     private val repository: Repository by instance()
@@ -67,17 +69,11 @@ class MyApp : MultiDexApplication(), DIAware {
 
             handleNotificationChannels()
 
-            ProcessLifecycleOwner.get().lifecycle.addObserver(
+            ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
-                AppLifeCycleObserver(
-                    connectivityStatus,
-                    repository,
-                ),
-            )
 
             CoroutineScope(Dispatchers.Main).launch {
                 viewModel.networkAvailableProvider.collect { networkAvailable ->
-                    val toastMessage =
+                    val toastMessage = if (networkAvailable) {
-                        if (networkAvailable) {
                         repository.handleDBActions()
                         R.string.network_connectivity_retrieved
                     } else {
@@ -87,13 +83,11 @@ class MyApp : MultiDexApplication(), DIAware {
                     Toast.makeText(
                         applicationContext,
                         toastMessage,
-                        Toast.LENGTH_SHORT,
+                        Toast.LENGTH_SHORT
                     ).show()
                 }
             }
         }
-
-        repository.migrate(driverFactory)
     }
 
     override fun attachBaseContext(base: Context?) {
@@ -101,40 +95,23 @@ class MyApp : MultiDexApplication(), DIAware {
 
         initAcra {
             reportFormat = StringFormat.JSON
-            reportContent =
+            reportContent = listOf(
-                listOf(
+                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
-                    ReportField.REPORT_ID,
+                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
-                    ReportField.INSTALLATION_ID,
+                ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
-                    ReportField.APP_VERSION_CODE,
+                ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
-                    ReportField.APP_VERSION_NAME,
+                ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
-                    ReportField.BUILD,
+                ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
-                    ReportField.ANDROID_VERSION,
+                ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
-                    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 =
+                uri = "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
-                    "https://bugs.amine-bouabdallaoui.fr/report" // best guess, you may need to adjust this
+                basicAuthLogin = "LMTlLZuazADohTCm"
-                basicAuthLogin = "qMEscjj89Gwt6cPR"
+                basicAuthPassword = "he6ghHp83F0PYPfh"
-                basicAuthPassword = "Yo58QFlGzFaWlBzP"
                 httpMethod = HttpSender.Method.POST
             }
         }
@@ -150,12 +127,7 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel =
+            val newItemsChannelmChannel = NotificationChannel(AppSettingsService.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
-                NotificationChannel(
-                    AppSettingsService.newItemsChannelId,
-                    newItemsChannelname,
-                    newItemsChannelimportance,
-                )
 
             notificationManager.createNotificationChannel(mChannel)
             notificationManager.createNotificationChannel(newItemsChannelmChannel)
@@ -166,22 +138,17 @@ class MyApp : MultiDexApplication(), DIAware {
         val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is NoClassDefFoundError &&
+            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
-                e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
-                }
+                }) {
-            ) {
-                // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    class AppLifeCycleObserver(
+    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
-        val connectivityStatus: ConnectivityStatus,
+
-        val repository: Repository,
-    ) : DefaultLifecycleObserver {
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
             repository.connectionMonitored = true

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

@@ -23,14 +23,13 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 class ReaderActivity : AppCompatActivity(), DIAware {
+
     private var currentItem: Int = 0
 
     private lateinit var toolbarMenu: Menu
 
     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()
@@ -62,19 +61,13 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
+        if (allItems.isEmpty()) {
+            finish()
+        }
+
         currentItem = intent.getIntExtra("currentItem", 0)
 
-        allItems = repository.getReaderItems()
-
-        if (allItems.isEmpty() || currentItem > allItems.size) {
-            finish()
-        }
-
-        try {
         readItem(allItems[currentItem])
-        } catch (e: IndexOutOfBoundsException) {
-            finish()
-        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
@@ -87,7 +80,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     }
 
     private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
+        if (appSettingsService.isMarkOnScrollEnabled()) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
@@ -101,15 +94,15 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
         FragmentStateAdapter(fa) {
+
         override fun getItemCount(): Int = allItems.size
 
-        override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
+        override fun createFragment(position: Int): Fragment =
+            ArticleFragment.newInstance(allItems[position])
+
     }
 
-    override fun onKeyDown(
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        keyCode: Int,
-        event: KeyEvent?,
-    ): Boolean {
         return when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
                 val currentFragment =
@@ -140,19 +133,16 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
-        alignmentMenu()
-
-        if (appSettingsService.getPublicAccess()) {
-            menu.removeItem(R.id.star)
-        } else {
         if (allItems.isNotEmpty() && allItems[currentItem].starred) {
             canRemoveFromFavorite()
         } else {
             canFavorite()
         }
+        alignmentMenu()
 
         binding.pager.registerOnPageChangeCallback(
             object : ViewPager2.OnPageChangeCallback() {
+
                 override fun onPageSelected(position: Int) {
                     super.onPageSelected(position)
 
@@ -163,9 +153,8 @@ class ReaderActivity : AppCompatActivity(), DIAware {
                     }
                     readItem(allItems[position])
                 }
-                },
-            )
             }
+        )
 
         return true
     }
@@ -184,18 +173,20 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
+                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()
                 }
@@ -223,4 +214,8 @@ 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

@@ -18,6 +18,7 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 class SourcesActivity : AppCompatActivity(), DIAware {
+
     private lateinit var binding: ActivitySourcesBinding
 
     override val di by closestDI()
@@ -48,19 +49,17 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         super.onResume()
         val mLayoutManager = LinearLayoutManager(this)
 
-        var items: ArrayList<SelfossModel.SourceDetail>
+        var items: ArrayList<SelfossModel.Source>
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
         CoroutineScope(Dispatchers.Main).launch {
-            val response = repository.getSourcesDetails()
+            val response = repository.getSources()
             if (response.isNotEmpty()) {
                 items = response
-                val mAdapter =
+                val mAdapter = SourcesListAdapter(
-                    SourcesListAdapter(
+                    this@SourcesActivity, items
-                        this@SourcesActivity,
-                        items,
                 )
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
@@ -68,13 +67,13 @@ class SourcesActivity : AppCompatActivity(), DIAware {
                 Toast.makeText(
                     this@SourcesActivity,
                     R.string.cant_get_sources,
-                    Toast.LENGTH_SHORT,
+                    Toast.LENGTH_SHORT
                 ).show()
             }
         }
 
         binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }
 }

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

@@ -1,210 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-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
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.kodein.di.DIAware
-import org.kodein.di.android.closestDI
-import org.kodein.di.instance
-
-class UpsertSourceActivity : AppCompatActivity(), DIAware {
-    private var existingSource: SelfossModel.SourceDetail? = null
-    private var mSpoutsValue: String? = null
-
-    private lateinit var binding: ActivityUpsertSourceBinding
-
-    override val di by closestDI()
-    private val repository: Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        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.saveBtn.setOnClickListener {
-            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()
-
-        val baseUrl = appSettingsService.getBaseUrl()
-        if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
-            mustLoginToAddSource()
-        } else {
-            handleSpoutsSpinner()
-        }
-    }
-
-    private fun handleSpoutsSpinner() {
-        val spoutsKV = HashMap<String, String>()
-        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()
-                        mSpoutsValue = spoutsKV[spoutName]
-                    }
-                }
-
-                override fun onNothingSelected(adapterView: AdapterView<*>) {
-                    mSpoutsValue = null
-                }
-            }
-
-        fun handleSpoutFailure(networkIssue: Boolean = false) {
-            Toast.makeText(
-                this@UpsertSourceActivity,
-                if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
-                Toast.LENGTH_SHORT,
-            ).show()
-            binding.progress.visibility = View.GONE
-        }
-
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                val items = repository.getSpouts()
-                if (items.isNotEmpty()) {
-                    val itemsStrings = items.map { it.value.name }
-                    for ((key, value) in items) {
-                        spoutsKV[value.name] = key
-                    }
-
-                    binding.progress.visibility = View.GONE
-                    binding.formContainer.visibility = View.VISIBLE
-
-                    val spinnerArrayAdapter =
-                        ArrayAdapter(
-                            this@UpsertSourceActivity,
-                            android.R.layout.simple_spinner_item,
-                            itemsStrings,
-                        )
-                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                    binding.spoutsSpinner.adapter = spinnerArrayAdapter
-
-                    if (existingSource != null) {
-                        initFields(items)
-                    }
-                } else {
-                    handleSpoutFailure()
-                }
-            } catch (e: NetworkUnavailableException) {
-                handleSpoutFailure(networkIssue = true)
-            }
-        }
-    }
-
-    private fun maybeGetDetailsFromIntentSharing(intent: Intent) {
-        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
-            binding.sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
-            binding.nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
-        }
-    }
-
-    private fun mustLoginToAddSource() {
-        Toast.makeText(this, getString(R.string.addStringNoUrl), Toast.LENGTH_SHORT).show()
-        val i = Intent(this, LoginActivity::class.java)
-        startActivity(i)
-        finish()
-    }
-
-    private fun handleSaveSource() {
-        val url = binding.sourceUri.text.toString()
-
-        val sourceDetailsUnavailable =
-            title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
-
-        when {
-            sourceDetailsUnavailable -> {
-                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
-            }
-            else -> {
-                CoroutineScope(Dispatchers.Main).launch {
-                    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@UpsertSourceActivity,
-                            R.string.cant_create_source,
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        repository.unsetSelectedSource()
-    }
-}

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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,11 +9,12 @@ 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.sendSilentlyWithAcraWithName
+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.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -20,6 +22,8 @@ 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
@@ -30,10 +34,11 @@ import org.kodein.di.instance
 
 class ItemCardAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
-    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
-    override lateinit var binding: CardItemBinding
+    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()
 
@@ -41,67 +46,23 @@ class ItemCardAdapter(
     override val repository: Repository by instance()
     override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
-    ): ViewHolder {
-        binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    private fun handleClickListeners(holderBinding: CardItemBinding, position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holderBinding.favButton.setOnClickListener {
-            val item = items[position]
-            if (item.starred) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    repository.unstarr(item)
-                }
-                binding.favButton.isSelected = false
-            } else {
-                CoroutineScope(Dispatchers.IO).launch {
-                    repository.starr(item)
-                }
-                binding.favButton.isSelected = true
-            }
-        }
-
-        binding.shareBtn.setOnClickListener {
-            val item = items[position]
-            c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
-        }
-
-        binding.browserBtn.setOnClickListener {
-            c.openInBrowserAsNewTask(items[position])
-        }
-    }
-
-    override fun onBindViewHolder(
-        holder: ViewHolder,
-        position: Int,
-    ) {
         with(holder) {
             val itm = items[position]
 
-            handleClickListeners(binding, position)
-            handleLinkOpening(binding, 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 = try {
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemCardAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (!appSettingsService.isFullHeightCardsEnabled()) {
                 binding.itemImage.maxHeight = imageMaxHeight
@@ -118,12 +79,67 @@ class ItemCardAdapter(
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                val drawable =
+                    TextDrawable
+                        .builder()
+                        .round()
+                        .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+                binding.sourceImage.setImageDrawable(drawable)
             } else {
-                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
+                c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
             }
         }
     }
 
-    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root)
+    override fun getItemCount(): Int {
+        return items.size
+    }
+
+    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        init {
+            handleClickListeners()
+            handleLinkOpening()
+        }
+
+        private fun handleClickListeners() {
+
+            binding.favButton.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                if (item.starred) {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.unstarr(item)
+                    }
+                    binding.favButton.isSelected = false
+                } else {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.starr(item)
+                    }
+                    binding.favButton.isSelected = true
+                }
+            }
+
+            binding.shareBtn.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
+            }
+
+            binding.browserBtn.setOnClickListener {
+                c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+            }
+        }
+
+        private fun handleLinkOpening() {
+            binding.root.setOnClickListener {
+                c.openItemUrl(
+                    items,
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    appSettingsService.isArticleViewerEnabled(),
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -1,76 +1,97 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
+import android.content.Context
 import android.view.LayoutInflater
 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.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+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.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import 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
 
 class ItemListAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
-    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
-    override lateinit var binding: ListItemBinding
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private val c: Context = app.baseContext
 
     override val di: DI by closestDI(app)
     override val repository : Repository by instance()
     override val appSettingsService : AppSettingsService by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
-    ): ViewHolder {
-        binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder: ViewHolder,
-        position: Int,
-    ) {
         with(holder) {
             val itm = items[position]
 
-            handleLinkOpening(binding, position)
-
             binding.title.text = itm.title.getHtmlDecoded()
 
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemListAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
+
                 if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                    binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                    val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                    val drawable =
+                            TextDrawable
+                                    .builder()
+                                    .round()
+                                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+
+                    binding.itemImage.setImageDrawable(drawable)
                 } else {
-                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+                    c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
                 }
             } else {
-                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage)
             }
         }
     }
 
-    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root)
+    override fun getItemCount(): Int = items.size
+
+    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {
+
+        init {
+            handleLinkOpening()
+        }
+
+        private fun handleLinkOpening() {
+            binding.root.setOnClickListener {
+                c.openItemUrl(
+                    items,
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    appSettingsService.isArticleViewerEnabled(),
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -1,13 +1,10 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
-import android.content.Context
 import android.graphics.Color
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -19,36 +16,30 @@ import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
-    abstract val items: ArrayList<SelfossModel.Item>
+    abstract var items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
-    abstract val binding: ViewBinding
     abstract val appSettingsService: AppSettingsService
     abstract val app: Activity
-    abstract val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit
+    abstract val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
-
-    protected val c: Context get() = app.baseContext
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items.clear()
+        this.items = items
-        this.items.addAll(items)
-        updateHomeItems(items)
         notifyDataSetChanged()
+        updateItems(this.items)
     }
 
-    private fun unmarkSnackbar(
+    private fun unmarkSnackbar(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
+        val s = Snackbar
-        position: Int,
-    ) {
-        val s =
-            Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
                 R.string.marked_as_read,
-                    Snackbar.LENGTH_LONG,
+                Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
+                CoroutineScope(Dispatchers.IO).launch {
                     unreadItemAtIndex(item, position, false)
                 }
+            }
 
         val view = s.view
         val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
@@ -56,16 +47,12 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(
+    private fun markSnackbar(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
+        val s = Snackbar
-        position: Int,
-    ) {
-        val s =
-            Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
                 R.string.marked_as_unread,
-                    Snackbar.LENGTH_LONG,
+                Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
                 readItemAtIndex(item, position, false)
@@ -77,18 +64,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    protected fun handleLinkOpening(holderBinding: ViewBinding, position: Int) {
-        holderBinding.root.setOnClickListener {
-            repository.setReaderItems(items)
-            c.openItemUrl(
-                position,
-                items[position].getLinkDecoded(),
-                appSettingsService.isArticleViewerEnabled(),
-                app,
-            )
-        }
-    }
-
     fun handleItemAtIndex(position: Int) {
         if (items[position].unread) {
             readItemAtIndex(items[position], position)
@@ -97,19 +72,14 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun readItemAtIndex(
+    private fun readItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.markAsRead(item)
         }
         if (repository.displayedItems == ItemType.UNREAD) {
             items.remove(item)
             notifyItemRemoved(position)
-            notifyItemRangeChanged(position, itemCount)
+            updateItems(items)
-            updateHomeItems(items)
         } else {
             notifyItemChanged(position)
         }
@@ -118,13 +88,10 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun unreadItemAtIndex(
+    private fun unreadItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.unmarkAsRead(item)
+
         }
         notifyItemChanged(position)
         if (showSnackbar) {
@@ -132,21 +99,18 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    fun addItemAtIndex(
+    fun addItemAtIndex(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
-        position: Int,
-    ) {
         items.add(position, item)
         notifyItemInserted(position)
-        updateHomeItems(items)
+        updateItems(items)
+
     }
 
     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
         val oldSize = items.size
         items.addAll(newItems)
         notifyItemRangeInserted(oldSize, newItems.size)
-        updateHomeItems(items)
+        updateItems(items)
-    }
 
-    override fun getItemCount(): Int = items.size
+    }
 }

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.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 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,66 +28,34 @@ import org.kodein.di.instance
 
 class SourcesListAdapter(
     private val app: Activity,
-    private val items: ArrayList<SelfossModel.SourceDetail>,
+    private val items: ArrayList<SelfossModel.Source>
 ) : 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)
     private val repository : Repository by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
-        viewType: Int,
-    ): ViewHolder {
         binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding.root)
     }
 
-    override fun onBindViewHolder(
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder: ViewHolder,
-        position: Int,
-    ) {
         val itm = items[position]
 
-        val deleteBtn: Button = holder.mView.findViewById(R.id.deleteBtn)
-
-        deleteBtn.setOnClickListener {
-            val (id, title) = items[position]
-            CoroutineScope(Dispatchers.IO).launch {
-                val successfullyDeletedSource = repository.deleteSource(id, title)
-                if (successfullyDeletedSource) {
-                    items.removeAt(position)
-                    notifyItemRemoved(position)
-                    notifyItemRangeChanged(position, itemCount)
-                } else {
-                    Toast.makeText(
-                        app,
-                        R.string.can_delete_source,
-                        Toast.LENGTH_SHORT,
-                    ).show()
-                }
-            }
-        }
-
-        holder.mView.setOnClickListener {
-            val source = items[position]
-
-            repository.setSelectedSource(source)
-            app.startActivity(Intent(app, UpsertSourceActivity::class.java))
-        }
-
         if (itm.getIcon(repository.baseUrl).isEmpty()) {
-            binding.itemImage.setBackgroundAndText(itm.title.getHtmlDecoded())
+            val color = generator.getColor(itm.title.getHtmlDecoded())
-        } else {
-            c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
-        }
 
-        if (!itm.error.isNullOrBlank()) {
+            val drawable =
-            binding.errorText.visibility = View.VISIBLE
+                TextDrawable
-            binding.errorText.text = itm.error
+                    .builder()
+                    .round()
+                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+            binding.itemImage.setImageDrawable(drawable)
         } else {
-            binding.errorText.visibility = View.GONE
+            c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
         }
 
         binding.sourceTitle.text = itm.title.getHtmlDecoded()
@@ -99,5 +67,33 @@ class SourcesListAdapter(
 
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView)
+    inner class ViewHolder(private val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+
+        init {
+            handleClickListeners()
+        }
+
+        private fun handleClickListeners() {
+
+            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
+
+            deleteBtn.setOnClickListener {
+                val (id) = items[bindingAdapterPosition]
+                CoroutineScope(Dispatchers.IO).launch {
+                    val successfullyDeletedSource = repository.deleteSource(id)
+                    if (successfullyDeletedSource) {
+                        items.removeAt(bindingAdapterPosition)
+                        notifyItemRemoved(bindingAdapterPosition)
+                        notifyItemRangeChanged(bindingAdapterPosition, itemCount)
+                    } else {
+                        Toast.makeText(
+                            app,
+                            R.string.can_delete_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -26,15 +26,15 @@ import org.kodein.di.instance
 import java.util.*
 import kotlin.concurrent.schedule
 
-class LoadingWorker(val context: Context, params: WorkerParameters) :
+class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {
-    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()
 
 override fun doWork(): Result {
     if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+
         CoroutineScope(Dispatchers.IO).launch {
             val notificationManager =
                 applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -66,37 +66,34 @@ class LoadingWorker(val context: Context, params: WorkerParameters) :
 
     private fun handleNewItemsNotification(
         newItems: List<SelfossModel.Item>?,
-        notificationManager: NotificationManager,
+        notificationManager: NotificationManager
     ) {
+        // TODO: Check if this coroutine is actually required
         CoroutineScope(Dispatchers.IO).launch {
                 val apiItems = newItems.orEmpty()
 
+
                 val newSize = apiItems.filter { it.unread }.size
                 if (newSize > 0) {
-                val intent =
+
-                    Intent(context, MainActivity::class.java).apply {
+                    val intent = Intent(context, MainActivity::class.java).apply {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                     }
-                val pflags =
+                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         PendingIntent.FLAG_IMMUTABLE
                     } else {
                         0
                     }
-                val pendingIntent: PendingIntent =
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
-                    PendingIntent.getActivity(context, 0, intent, pflags)
 
                     val newItemsNotification =
-                    NotificationCompat.Builder(
+                        NotificationCompat.Builder(applicationContext, AppSettingsService.newItemsChannelId)
-                        applicationContext,
-                        AppSettingsService.newItemsChannelId,
-                    )
                             .setContentTitle(context.getString(R.string.new_items_notification_title))
                             .setContentText(
                                 context.getString(
                                     R.string.new_items_notification_text,
-                                newSize,
+                                    newSize
-                            ),
+                                )
                             )
                             .setPriority(PRIORITY_DEFAULT)
                             .setChannelId(AppSettingsService.newItemsChannelId)

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

@@ -1,6 +1,5 @@
 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
@@ -17,6 +16,7 @@ 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
@@ -27,10 +27,8 @@ 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
@@ -47,16 +45,18 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.acra.ktx.sendSilentlyWithAcra
+import org.acra.ktx.sendWithAcra
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 import java.net.MalformedURLException
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.util.*
 import java.util.concurrent.ExecutionException
 
-private const val IMAGE_JPG = "image/jpg"
 
 class ArticleFragment : Fragment(), DIAware {
     private var fontSize: Int = 16
@@ -69,7 +69,8 @@ class ArticleFragment : Fragment(), DIAware {
     private lateinit var allImages : ArrayList<String>
     private lateinit var fab: FloatingActionButton
     private lateinit var textAlignment: String
-    private lateinit var binding: FragmentArticleBinding
+    private var _binding: FragmentArticleBinding? = null
+    private val binding get() = _binding!!
 
     override val di : DI by closestDI()
     private val repository: Repository by instance()
@@ -82,6 +83,7 @@ class ArticleFragment : Fragment(), DIAware {
 
     private val mercuryApi : MercuryApi by instance()
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -93,21 +95,16 @@ class ArticleFragment : Fragment(), DIAware {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        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 = try {
+            contentSource = item.sourceAndDateText()
-                item.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("Article Fragment parse date")
-                item.sourceAuthorOnly()
-            }
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()
@@ -122,7 +119,48 @@ class ArticleFragment : Fragment(), DIAware {
 
             fab.rippleColor = resources.getColor(R.color.colorAccentDark)
 
-            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()
+            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?) {
+                    }
+                }
+            )
 
             if (staticBar) {
                 fab.hide()
@@ -134,47 +172,8 @@ class ArticleFragment : Fragment(), DIAware {
                 binding.source.typeface = typeface
             }
 
-            handleContent()
-
-            binding.nestedScrollView.setOnScrollChangeListener(
-                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-                    if (scrollY > oldScrollY) {
-                        floatingToolbar.hide()
-                        fab.hide()
-                    } else {
-                        if (staticBar) {
-                            floatingToolbar.show()
-                        } else {
-                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
-                        }
-                    }
-                },
-            )
-        } catch (e: InflateException) {
-            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
-    }
-
-    private fun handleContent() {
             if (contentText.isEmptyOrNullOrNullString()) {
-            if (repository.isNetworkAvailable()) {
                 getContentFromMercury()
-            }
             } else {
                 binding.titleView.text = contentTitle
                 if (typeface != null) {
@@ -195,62 +194,46 @@ class ArticleFragment : Fragment(), DIAware {
                     binding.imageView.visibility = View.GONE
                 }
             }
-    }
 
-    private fun handleFloatingToolbar(): FloatingToolbar {
+            binding.nestedScrollView.setOnScrollChangeListener(
-        val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-        if (appSettingsService.getPublicAccess()) {
+                    if (scrollY > oldScrollY) {
-            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
+                        floatingToolbar.hide()
-        }
+                        fab.hide()
-        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 {
+                        if (staticBar) {
-                                        repository.unmarkAsRead(this@ArticleFragment.item)
+                            floatingToolbar.show()
-                                    }
+                        } else {
-                                    this@ArticleFragment.item.unread = true
+                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG,
-                                    ).show()
                         }
                     }
-                        else -> Unit
                 }
+            )
+
+        } catch (e: InflateException) {
+            e.sendSilentlyWithAcraWithName("webview not available")
+            AlertDialog.Builder(requireContext())
+                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                .setPositiveButton(android.R.string.ok
+                ) { _, _ ->
+                    appSettingsService.disableArticleViewer()
+                    requireActivity().finish()
+                }
+                .create()
+                .show()
         }
 
-                override fun onItemLongClick(item: MenuItem?) {
+        return binding.root
-                    // We do nothing
     }
-            },
+
-        )
+    override fun onDestroyView() {
-        return floatingToolbar
+        super.onDestroyView()
+        _binding = null
     }
 
     private fun refreshAlignment() {
-        textAlignment =
+        textAlignment = when (appSettingsService.getActiveAllignment()) {
-            when (appSettingsService.getActiveAllignment()) {
             1 -> "justify"
             2 -> "left"
             else -> "justify"
@@ -258,136 +241,85 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury() {
+        if (repository.isNetworkAvailable()) {
             binding.progressBar.visibility = View.VISIBLE
 
             CoroutineScope(Dispatchers.Main).launch {
                 try {
                     val response = mercuryApi.query(url)
-                if (response.success && response.data != null) {
+                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
-                    handleMercuryData(response.data!!)
+                        binding.titleView.text = response.data!!.title.orEmpty()
-                } else {
+                        try {
-                    openInBrowserAfterFailing()
-                }
-            } catch (e: Exception) {
-                openInBrowserAfterFailing()
-            }
-        }
-    }
-
-    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)
+                        } catch (e: Exception) {
-            url = data.url!!
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
+                        }
 
-            contentText = data.content.orEmpty()
+                        try {
+                            // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                            URL(response.data!!.url)
+                            url = response.data!!.url
+                        } catch (e: MalformedURLException) {
+                            // Mercury returned a relative url
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
+                        }
+
+                        try {
+                            contentText = response.data!!.content.orEmpty()
                             htmlToWebview()
-
+                        } catch (e: Exception) {
-            handleLeadImage(data?.lead_image_url)
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > contenttext or html")
-
-            binding.nestedScrollView.scrollTo(0, 0)
-            binding.progressBar.visibility = View.GONE
-        }
                         }
 
-    private fun handleLeadImage(lead_image_url: String?) {
+                        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
-        if (!lead_image_url.isNullOrEmpty() && context != null) {
+                            try {
                                 binding.imageView.visibility = View.VISIBLE
+                                try {
                                     Glide
                                         .with(requireContext())
                                         .asBitmap()
                                         .load(
-                    lead_image_url,
+                                            response.data!!.lead_image_url.orEmpty()
                                         )
                                         .apply(RequestOptions.fitCenterTransform())
                                         .into(binding.imageView)
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
+                                }
+                            } catch (e: Exception) {
+                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
+                            }
                         } 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 {
-                    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)))
+                            binding.nestedScrollView.scrollTo(0, 0)
-                        } catch (e: ActivityNotFoundException) {
+                            binding.progressBar.visibility = View.GONE
-                            e.sendSilentlyWithAcraWithName("activityNotFound > $url")
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
                         }
-                        true
                     } else {
-                        false
+                        openInBrowserAfterFailing()
                     }
+                } catch (e: SocketTimeoutException) {
+                    openInBrowserAfterFailing()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
+                    openInBrowserAfterFailing()
                 }
-
-                @Deprecated("Deprecated in Java")
-                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")
-                    ) {
-                        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) {
-                            // 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) {
-                            // 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) {
-                            // Do nothing
-                        }
-                    }
-
-                    return super.shouldInterceptRequest(view, url)
             }
         }
     }
 
     private fun htmlToWebview() {
-        if (context != null) {
+
         val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
         val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
+
         binding.webcontent.settings.standardFontFamily = a.getString(0)
         binding.webcontent.visibility = View.VISIBLE
 
@@ -401,17 +333,52 @@ class ArticleFragment : Fragment(), DIAware {
         binding.webcontent.settings.loadWithOverviewMode = true
         binding.webcontent.settings.javaScriptEnabled = false
 
-            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)))
+                }
+                return true
+            }
 
-            val gestureDetector =
+            @Deprecated("Deprecated in Java")
-                GestureDetector(
+            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
-                    activity,
+                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                    object : GestureDetector.SimpleOnGestureListener() {
+                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) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg")
+                    }
+                }
+                else if (url.lowercase(Locale.US).contains(".png")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png")
+                    }
+                }
+                else if (url.lowercase(Locale.US).contains(".webp")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp")
+                    }
+                }
+
+                return super.shouldInterceptRequest(view, url)
+            }
+        }
+
+        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
             override fun onSingleTapUp(e: MotionEvent): Boolean {
                 return performClick()
             }
-                    },
+        })
-                )
 
         binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
@@ -424,25 +391,18 @@ class ArticleFragment : Fragment(), DIAware {
             val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-                e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
+            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
         }
 
-            val fontName =
+        val fontName =  when (font) {
-                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 =
+        val fontLinkAndStyle = if (font.isNotEmpty()) {
-                if (font.isNotEmpty()) {
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
-                    """<link href="https://fonts.googleapis.com/css?family=${
-                        fontName.replace(
-                            " ",
-                            "+",
-                        )
-                    }" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
@@ -466,12 +426,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |        max-width: 100%;
                 |      }
                 |      a {
-                |        color: ${
+                |        color: ${String.format("#%06X", 0xFFFFFF and resources.getColor(R.color.colorAccent))} !important;
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and resources.getColor(R.color.colorAccent),
-                    )
-                } !important;
                 |      }
                 |      *:not(a) {
                 |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
@@ -482,26 +437,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                };
                 |      }
                 |      body, html {
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)} !important;
-                    String.format(
+                |        border-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)}  !important;
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                } !important;
-                |        border-color: ${
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                }  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -511,26 +451,19 @@ class ArticleFragment : Fragment(), DIAware {
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                };
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
                 |</head>
                 |<body>
                 |   $contentText
-                |</body>
+                |</body>""".trimMargin(),
-                """.trimMargin(),
             "text/html",
             "utf-8",
-                null,
+            null
         )
     }
-    }
 
     fun scrollDown() {
         val height = binding.nestedScrollView.measuredHeight
@@ -544,17 +477,15 @@ class ArticleFragment : Fragment(), DIAware {
 
     private fun openInBrowserAfterFailing() {
         binding.progressBar.visibility = View.GONE
-        if (context != null) {
+        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-            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): ArticleFragment {
+        fun newInstance(
+                item: SelfossModel.Item
+        ): ArticleFragment {
             val fragment = ArticleFragment()
             val args = Bundle()
             args.putParcelable(ARG_ITEMS, item.toParcelable())
@@ -564,11 +495,9 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (allImages != null && (
+        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+
-            )
-        ) {
             val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
@@ -579,4 +508,6 @@ class ArticleFragment : Fragment(), DIAware {
         }
         return false
     }
+
+
 }

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

@@ -1,12 +1,10 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
-import android.content.Context
+import android.annotation.SuppressLint
 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
@@ -14,15 +12,17 @@ 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.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.ViewTarget
+import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.request.transition.Transition
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.chip.Chip
 import kotlinx.coroutines.CoroutineScope
@@ -33,71 +33,78 @@ 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 val appSettingsService: AppSettingsService by instance()
 
     private var selectedChip: Chip? = null
 
+    @SuppressLint("ResourceAsColor")
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
-    ): View {
+    ): View? {
-        binding =
+        val binding =
-            FilterFragmentBinding.inflate(
+            bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding.inflate(
                 inflater,
                 container,
-                false,
+                false
             )
 
-        val context: Context? = context
+        val tagGroup = binding.tagsGroup
-
+        val hiddenTagGroup = binding.hiddenTagsGroup
-        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().forEachIndexed { _, source ->
+        CoroutineScope(Dispatchers.Main).launch {
-            val c = Chip(context)
+            val tags = repository.getTags()
-            c.ellipsize = TextUtils.TruncateAt.END
+            val hiddenTags = appSettingsService.getHiddenTags()
 
-            Glide.with(context)
+            tags.filterNot { hiddenTags.contains(it.tag) }.forEach { tag ->
+                val c = chipForTag(tag)
+                tagGroup.addView(c)
+            }
+
+            if (hiddenTags.isNotEmpty()) {
+                binding.filterHiddenTagsTitle.visibility = VISIBLE
+                binding.hiddenTagsGroup.visibility = VISIBLE
+
+                tags.filter { hiddenTags.contains(it.tag) }.forEach { tag ->
+                    val c = chipForTag(tag)
+
+                    hiddenTagGroup.addView(c)
+                }
+            }
+
+            repository.getSources().forEach { source ->
+                val c = Chip(requireContext())
+
+                Glide.with(requireContext())
                     .load(source.getIcon(repository.baseUrl))
-                .into(
+                    .listener(object : RequestListener<Drawable?> {
-                    object : ViewTarget<Chip?, Drawable?>(c) {
+                        override fun onLoadFailed(
+                            e: GlideException?,
+                            model: Any?,
+                            target: Target<Drawable?>?,
+                            isFirstResource: Boolean
+                        ): Boolean {
+                            return false
+                        }
+
                         override fun onResourceReady(
-                            resource: Drawable,
+                            resource: Drawable?,
-                            transition: Transition<in Drawable?>?,
+                            model: Any?,
-                        ) {
+                            target: Target<Drawable?>?,
-                            try {
+                            dataSource: DataSource?,
+                            isFirstResource: Boolean
+                        ): Boolean {
                             c.chipIcon = resource
-                            } catch (e: Exception) {
+                            return false
-                                e.sendSilentlyWithAcraWithName("sources > onResourceReady")
                         }
-                        }
+                    }).preload()
-                    },
-                )
 
                 c.text = source.title.getHtmlDecoded()
 
@@ -118,39 +125,36 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                     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)
             }
+
+            binding.progressBar2.visibility = GONE
+            binding.filterView.visibility = VISIBLE
         }
 
-    private suspend fun handleTagChips(context: Context) {
+        binding.floatingActionButton2.setOnClickListener {
-        val tagGroup = binding.tagsGroup
+            (activity as HomeActivity).getElementsAccordingToTab()
+            (activity as HomeActivity).fetchOnEmptyList()
+            dismiss()
+        }
+        return binding.root
+    }
 
-        val tags = repository.getTags()
+    private fun chipForTag(tag: SelfossModel.Tag): Chip {
-
+        val c = Chip(requireContext())
-        tags.forEachIndexed { _, tag ->
-            val c = Chip(context)
-            c.ellipsize = TextUtils.TruncateAt.END
         c.text = tag.tag
 
-            if (tag.color.isNotEmpty()) {
-                try {
         val gd = GradientDrawable()
-                    val gdColor =
+        val gdColor = try {
-                        try {
+            Color.parseColor(tag.color)
-                            Color.parseColor(tag.getColorHexCode())
         } catch (e: IllegalArgumentException) {
-                            e.sendSilentlyWithAcraWithName("color issue " + tag.color + " / " + tag.getColorHexCode())
+            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
             resources.getColor(R.color.colorPrimary)
         }
         gd.setColor(gdColor)
@@ -158,10 +162,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         gd.setSize(30, 30)
         gd.cornerRadius = 30F
         c.chipIcon = gd
-                } catch (e: Exception) {
-                    e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
-                }
-            }
 
         c.setOnCloseIconClickListener {
             (it as Chip).isCloseIconVisible = false
@@ -184,12 +184,12 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
             c.isCloseIconVisible = true
             selectedChip = c
         }
-
+        return c
-            tagGroup.addView(c)
-        }
     }
 
     companion object {
-        const val TAG = "FilterModalBottomSheet"
+        const val TAG = "ModalBottomSheet"
     }
+
+
 }

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

@@ -11,6 +11,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 
 class ImageFragment : Fragment() {
+
     private lateinit var imageUrl : String
     private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
     private var _binding: FragmentImageBinding? = null
@@ -22,16 +23,12 @@ class ImageFragment : Fragment() {
         imageUrl = requireArguments().getString("imageUrl")!!
     }
 
-    override fun onCreateView(
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
         _binding = FragmentImageBinding.inflate(inflater, container, false)
         val view = binding?.root
 
         binding!!.photoView.visibility = View.VISIBLE
-        Glide.with(requireActivity())
+        Glide.with(activity)
                 .asBitmap()
                 .apply(glideOptions)
                 .load(imageUrl)
@@ -48,7 +45,9 @@ class ImageFragment : Fragment() {
     companion object {
         private const val ARG_IMAGE = "imageUrl"
 
-        fun newInstance(imageUrl: String): ImageFragment {
+        fun newInstance(
+                imageUrl : String
+        ): ImageFragment {
             val fragment = ImageFragment()
             val args = Bundle()
             args.putString(ARG_IMAGE, imageUrl)

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

@@ -8,12 +8,14 @@ import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
+import org.acra.ktx.sendSilentlyWithAcra
 
 fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
     val imageUrls = this.getImages()
 
     val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
 
+
     try {
         for (url in imageUrls) {
             if ( URLUtil.isValidUrl(url)) {

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

@@ -16,10 +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(
         this.id,
@@ -32,10 +30,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,
     val datetime: String,
@@ -47,15 +43,13 @@ data class ParecelableItem(
     val icon: String?,
     val link: String,
     val sourcetitle: String,
-    val tags: String,
+    val tags: String
-    val author: String?,
 ) : Parcelable {
+
     companion object {
         @JvmField
-        val CREATOR: Parcelable.Creator<ParecelableItem> =
+        val CREATOR: Parcelable.Creator<ParecelableItem> = object : Parcelable.Creator<ParecelableItem> {
-            object : Parcelable.Creator<ParecelableItem> {
             override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source)
-
             override fun newArray(size: Int): Array<ParecelableItem?> = arrayOfNulls(size)
         }
     }
@@ -71,16 +65,12 @@ 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
 
-    override fun writeToParcel(
+    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest: Parcel,
-        flags: Int,
-    ) {
         dest.writeInt(id)
         dest.writeString(datetime)
         dest.writeString(title)
@@ -92,6 +82,5 @@ 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

@@ -19,21 +19,28 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBin
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
+import org.acra.ktx.sendSilentlyWithAcra
+import org.acra.ktx.sendWithAcra
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
+import org.kodein.di.instance
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.extra.TrackHelper
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
-class SettingsActivity :
+class SettingsActivity : AppCompatActivity(),
-    AppCompatActivity(),
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
-    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
@@ -74,14 +81,13 @@ class SettingsActivity :
 
     override fun onPreferenceStartFragment(
             caller: PreferenceFragmentCompat,
-        pref: Preference,
+            pref: Preference
     ): Boolean {
         // Instantiate the new Fragment
         val args = pref.extras
-        val fragment =
+        val fragment = supportFragmentManager.fragmentFactory.instantiate(
-            supportFragmentManager.fragmentFactory.instantiate(
                 classLoader,
-                pref.fragment.toString(),
+                pref.fragment
         ).apply {
             arguments = args
             setTargetFragment(caller, 0)
@@ -97,20 +103,15 @@ class SettingsActivity :
     }
 
     class MainPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                Preference.OnPreferenceChangeListener { _, newValue ->
                 AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
                 true
             }
 
-            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                Preference.OnPreferenceClickListener { _ ->
                 context?.let {
                     LibsBuilder()
                         .withAboutIconShown(true)
@@ -123,17 +124,13 @@ class SettingsActivity :
     }
 
     class GeneralPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_general, rootKey)
 
             val editTextPreference = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
             editTextPreference?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.filters =
+                editText.filters = arrayOf(
-                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input: Int = (dest.toString() + source.toString()).toInt()
@@ -143,42 +140,22 @@ class SettingsActivity :
                                 Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                             }
                             ""
-                        },
+                        }
                 )
             }
         }
     }
 
     class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_viewer, rootKey)
 
             val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.addTextChangedListener {
+                editText.addTextChangedListener { object : TextWatcher {
-                    object : TextWatcher {
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                        override fun beforeTextChanged(
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                            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()
@@ -186,10 +163,8 @@ class SettingsActivity :
                             e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                         }
                     }
-                    }
+                } }
-                }
+                editText.filters = arrayOf(
-                editText.filters =
-                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input = (dest.toString() + source.toString()).toInt()
@@ -198,30 +173,23 @@ class SettingsActivity :
                                 nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                             }
                             ""
-                        },
+                        }
                 )
             }
         }
     }
 
     class OfflinePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_offline, rootKey)
         }
     }
 
     class ThemePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_theme, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                Preference.OnPreferenceChangeListener { _, newValue ->
                 AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
                 true
             }
@@ -234,26 +202,20 @@ class SettingsActivity :
             startActivity(browserIntent)
         }
 
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_links, rootKey)
 
-            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
                 openUrl(Uri.parse(AppSettingsService.trackerUrl))
                 true
             }
 
-            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
                 openUrl(Uri.parse(AppSettingsService.sourceUrl))
                 false
             }
 
-            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
                 openUrl(Uri.parse(AppSettingsService.translationUrl))
                 false
             }
@@ -261,10 +223,7 @@ class SettingsActivity :
     }
 
     class ExperimentalPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_experimental, rootKey)
         }
     }

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

@@ -5,10 +5,7 @@ import android.content.Intent
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 
-fun Context.shareLink(
+fun Context.shareLink(itemUrl: String, itemTitle: String) {
-    itemUrl: String,
-    itemTitle: String,
-) {
     val sendIntent = Intent()
     sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
     sendIntent.action = Intent.ACTION_SEND
@@ -18,7 +15,7 @@ fun Context.shareLink(
     startActivity(
         Intent.createChooser(
             sendIntent,
-            getString(R.string.share),
+            getString(R.string.share)
-        ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+        ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     )
 }

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

@@ -1,65 +0,0 @@
-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

@@ -18,19 +18,22 @@ 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,
-    app: Activity,
+    app: Activity
 ) {
+
     if (!linkDecoded.isUrlValid()) {
         Toast.makeText(
             this,
             this.getString(R.string.cant_open_invalid_url),
-            Toast.LENGTH_LONG,
+            Toast.LENGTH_LONG
         ).show()
     } else {
         if (articleViewer) {
+            ReaderActivity.allItems = allItems
             val intent = Intent(this, ReaderActivity::class.java)
             intent.putExtra("currentItem", currentItem)
             app.startActivity(intent)
@@ -43,7 +46,8 @@ fun Context.openItemUrl(
     }
 }
 
-fun String.isUrlValid(): Boolean = this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+fun String.isUrlValid(): Boolean =
+    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlInvalid(): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
@@ -64,10 +68,7 @@ fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) {
 }
 
 class LinkOnTouchListener : View.OnTouchListener {
-    override fun onTouch(
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        v: View?,
-        event: MotionEvent?,
-    ): Boolean {
         var ret = false
         val widget: TextView = v as TextView
         val text: CharSequence = widget.text

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

@@ -8,4 +8,5 @@ fun TextBadgeItem.removeBadge(): TextBadgeItem {
     return this
 }
 
-fun TextBadgeItem.maybeShow(): TextBadgeItem = if (this.isHidden) this.show() else this
+fun TextBadgeItem.maybeShow(): TextBadgeItem =
+    if (this.isHidden) this.show() else this

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

@@ -3,37 +3,38 @@ package bou.amine.apps.readerforselfossv2.android.utils.glide
 import android.content.Context
 import android.graphics.Bitmap
 import android.widget.ImageView
-import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 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
 
-fun Context.bitmapCenterCrop(
+fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
-    url: String,
+    Glide.with(this)
-    iv: ImageView,
-) = Glide.with(this)
         .asBitmap()
         .load(url)
         .apply(RequestOptions.centerCropTransform())
         .into(iv)
 
-fun Context.circularDrawable(
+fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    url: String,
-    view: CircleImageView,
-) {
-    view.textView.text = ""
-
     Glide.with(this)
+        .asBitmap()
         .load(url)
-        .into(view.imageView)
+        .apply(RequestOptions.centerCropTransform())
+        .into(object : BitmapImageViewTarget(iv) {
+            override fun setResource(resource: Bitmap?) {
+                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(
+                    resources,
+                    resource
+                )
+                circularBitmapDrawable.isCircular = true
+                iv.setImageDrawable(circularBitmapDrawable)
             }
+        })
 
-fun getBitmapInputStream(
+fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
-    bitmap: Bitmap,
-    compressFormat: Bitmap.CompressFormat,
-): InputStream {
     val byteArrayOutputStream = ByteArrayOutputStream()
     bitmap.compress(compressFormat, 80, byteArrayOutputStream)
     val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()

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

@@ -19,8 +19,7 @@ class AppViewModel(private val repository: Repository) : ViewModel() {
                     if (isConnected && !wasConnected && repository.connectionMonitored) {
                         _networkAvailableProvider.emit(true)
                         wasConnected = true
-                    } else if (!isConnected && wasConnected && repository.connectionMonitored)
+                    } else if (!isConnected && wasConnected && repository.connectionMonitored){
-                        {
                         _networkAvailableProvider.emit(false)
                         wasConnected = false
                     }

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

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

androidApp/src/main/res/layout/activity_add_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.UpsertSourceActivity">
+    tools:context="bou.amine.apps.readerforselfossv2.android.AddSourceActivity">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,83 +17,116 @@
             <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:id="@+id/formContainer"
+            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:layout_width="match_parent"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
             android:layout_height="match_parent"
-            android:padding="16dp"
+            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:visibility="gone"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintVertical_bias="0.0">
-            app:layout_constraintTop_toTopOf="parent">
 
-
+            <TextView
-            <EditText
+                android:text="@string/add_source"
-                android:id="@+id/nameInput"
-                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:inputType="text"
-                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:id="@+id/spoutsSpinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="48dp"
-                android:layout_marginTop="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tags" />
-
-            <Button
-                android:id="@+id/saveBtn"
                 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"
-                android:elevation="5dp"
+                app:layout_constraintTop_toTopOf="parent"
-                android:text="@string/add_source_save"
+                android:layout_marginEnd="16dp"
-                android:textColor="?android:textColorPrimary"
+                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBottom_toBottomOf="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"
-                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner" />
+                android:inputType="text"
+                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" />
+
+            <Spinner
+                android:layout_width="match_parent"
+                android:id="@+id/spoutsSpinner"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/tags"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_height="40dp"/>
+
+            <Button
+                android:text="@string/add_source_save"
+                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"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintVertical_bias="0.0"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -102,6 +135,8 @@
             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/activity_home.xml

@@ -1,12 +1,13 @@
 <?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:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     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"
-    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
@@ -27,12 +28,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <androidx.appcompat.widget.Toolbar
+                    <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:theme="@style/ToolBarStyle"
-                        app:popupTheme="?attr/toolbarPopupTheme"
 
                          />
 
@@ -46,19 +45,19 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="?android:attr/windowBackground"
+                        android:orientation="vertical"
-                        android:orientation="vertical">
+                        android:background="?android:attr/windowBackground">
 
                         <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
@@ -78,7 +77,6 @@
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
         <com.ashokvarma.bottomnavigation.BottomNavigationBar
             android:id="@+id/bottomBar"
             android:layout_width="match_parent"

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

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.motion.widget.MotionLayout 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: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">
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.Toolbar android:theme="@style/ToolBarStyle"
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -20,21 +21,13 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
-
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
         android:layout_width="match_parent"
-            android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
-    </androidx.core.widget.NestedScrollView>
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
-
+</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.motion.widget.MotionLayout>

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

@@ -1,30 +1,31 @@
 <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
+        <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: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:padding="@dimen/activity_horizontal_margin">
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
         <!-- Login progress -->
         <ProgressBar
             android:id="@+id/loginProgress"
@@ -34,8 +35,12 @@
             android:layout_marginBottom="8dp"
             android:visibility="gone"/>
 
-        <LinearLayout
+        <ScrollView
             android:id="@+id/loginForm"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -48,22 +53,14 @@
                     android:imeOptions="actionUnspecified"
                     android:importantForAutofill="no"
                     android:inputType="textUri"
-                android:maxLines="1"
+                    android:maxLines="1" />
-                android:minHeight="48dp" />
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/selfSigned"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/disable_ssl"
-                android:textAlignment="viewStart" />
-
-            <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" />
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:id="@+id/withLogin"
+                    android:layout_weight="1"/>
 
                 <EditText
                     android:id="@+id/loginView"
@@ -73,7 +70,6 @@
                     android:hint="@string/prompt_login"
                     android:inputType="text"
                     android:maxLines="1"
-                android:minHeight="48dp"
                     android:visibility="gone" />
 
                 <EditText
@@ -84,7 +80,6 @@
                     android:hint="@string/prompt_password"
                     android:inputType="textPassword"
                     android:maxLines="1"
-                android:minHeight="48dp"
                     android:visibility="gone" />
 
                 <Button
@@ -98,6 +93,7 @@
                     android:textStyle="bold" />
 
             </LinearLayout>
+        </ScrollView>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -24,8 +24,7 @@
         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/card_item.xml

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

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

@@ -1,26 +0,0 @@
-<?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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,18 +17,27 @@
         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:layout_height="match_parent"
         android:visibility="gone"
         tools:visibility="visible">
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/floatingActionButton2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+
+            android:layout_marginTop="8dp"
+            android:clickable="true"
+            app:backgroundTint="@color/colorAccent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:rippleColor="@color/colorAccentDark"
+            app:srcCompat="@drawable/ic_menu_search_white_24dp" />
+
         <TextView
             android:id="@+id/filterTagsTitle"
             style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
@@ -39,17 +49,6 @@
             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"
@@ -63,6 +62,45 @@
 
         </com.google.android.material.chip.ChipGroup>
 
+        <TextView
+            android:id="@+id/filterHiddenTagsTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="@string/filter_item_hidden_tags"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
+
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/hiddenTagsGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filterHiddenTagsTitle"
+            app:singleSelection="true">
+
+        </com.google.android.material.chip.ChipGroup>
+
+
+        <TextView
+            android:id="@+id/filterSourcesTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="@string/filter_item_sources"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/hiddenTagsGroup" />
+
+
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/sourcesGroup"
             android:layout_width="match_parent"
@@ -74,23 +112,5 @@
 
         </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,4 +1,5 @@
-<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"
@@ -21,22 +22,10 @@
                 android:layout_width="0dp"
                 android:layout_height="200dp"
                 android:scaleType="centerCrop"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="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"
@@ -47,23 +36,40 @@
                 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"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginLeft="16dp"
-                app:layout_constraintStart_toStartOf="parent"
+                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_constraintTop_toBottomOf="@+id/source"
                 tools:visibility="visible" />
 
@@ -74,10 +80,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_constraintStart_toStartOf="parent">
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_gravity="end|bottom|right">
 
         <com.github.rubensousa.floatingtoolbar.FloatingToolbar
             android:id="@+id/floatingToolbar"
@@ -90,11 +96,12 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
+            android:layout_gravity="end|bottom|right"
-            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:paddingTop="@dimen/activity_vertical_margin"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:paddingBottom="@dimen/activity_vertical_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
             android:src="@drawable/ic_add_white_24dp"
             app:backgroundTint="?attr/colorAccent"
             app:fabSize="mini"
@@ -105,11 +112,11 @@
         android:id="@+id/progressBar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:alpha="0.8"
+        android:visibility="gone"
         android:animateLayoutChanges="true"
+        android:alpha="0.8"
         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,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -13,4 +13,4 @@
         android:background="@drawable/checkerboard"
         app:srcCompat="@android:drawable/screen_background_dark" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

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

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

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

@@ -3,74 +3,48 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="48dp"
     android:orientation="vertical">
 
 
-    <Button
+    <ImageView
-        android:id="@+id/deleteBtn"
-        style="@style/Widget.AppCompat.Button.Borderless"
-        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: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_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_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="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_height="17dp"
         android:layout_marginStart="8dp"
         android:ellipsize="end"
+        android:gravity="start"
         android:maxLines="1"
-        android:textAlignment="viewStart"
+        android:textAlignment="textStart"
+        android:textSize="13sp"
         android:textColor="?android:textColorPrimary"
-        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
-        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" />
+        tools:text="source title" />
 
-    <TextView
+    <Button
-        android:id="@+id/errorText"
+        android:id="@+id/deleteBtn"
-        android:layout_width="0dp"
+        style="@style/Widget.AppCompat.Button.Borderless"
-        android:layout_height="wrap_content"
+        android:layout_width="34dp"
-        android:layout_marginStart="10sp"
+        android:layout_height="34dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
+        android:background="@drawable/ic_remove_circle_outline_black_24dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:backgroundTint="?android:textColorSecondary"
-        android:textColor="@color/red"
+        android:elevation="4dp"
-        android:textStyle="italic"
+        android:contentDescription="@string/remove_source"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="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

@@ -20,11 +20,6 @@
           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"
@@ -36,12 +31,6 @@
         android:orderInCategory="101"
         android:title="@string/menu_home_refresh" />
 
-    <item
-        android:id="@+id/issue_tracker"
-        app:showAsAction="never"
-        android:orderInCategory="103"
-        android:title="@string/issue_tracker_link" />
-
     <item android:id="@+id/action_disconnect"
           android:title="@string/action_disconnect"
           android:orderInCategory="104"

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

@@ -3,13 +3,6 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
-
-    <item
-        android:id="@+id/issue_tracker"
-        app:showAsAction="never"
-        android:orderInCategory="101"
-        android:title="@string/issue_tracker_link" />
-
     <item android:id="@+id/about"
           android:title="@string/action_about"
           android:orderInCategory="102"

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

@@ -1,16 +0,0 @@
-<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

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Temes</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">Aquesta acció marcarà els elements com a llegits.</string>
     <string name="pref_switch_actions_pager_scroll">Marca com a llegit en lliscar el dit</string>
     <string name="pref_switch_actions_pager_scroll_off">No es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
+    <string name="filter_item_hidden_tags">Etiquetes ocultes</string>
     <string name="unmark">Marca com no llegit</string>
     <string name="pref_header_offline">Sense connexió i memòria clau</string>
     <string name="pref_switch_items_caching_off">Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-de-rDE/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Designs</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">Dies wird alle Elemente als gelesen markieren.</string>
     <string name="pref_switch_actions_pager_scroll">Beim Wischen als gelesen markieren</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Eintrag als ungelesen markieren</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-es-rES/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Temas</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">Esto marcará todos los artículos como leídos.</string>
     <string name="pref_switch_actions_pager_scroll">Marcar artículos como leídos al deslizar con el dedo hacia los lados</string>
     <string name="pref_switch_actions_pager_scroll_off">No marcar artículos como leídos al deslizar con el dedo hacia los lados.</string>
+    <string name="filter_item_hidden_tags">Etiquetas ocultas</string>
     <string name="unmark">Marcar artículo como no leído</string>
     <string name="pref_header_offline">Sin conexión y caché</string>
     <string name="pref_switch_items_caching_off">Los artículos no se guardarán en la memoria del dispositivo y la aplicación no se podrá utilizar sin conexión.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-fa-rIR/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Themes</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-fr-rFR/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Thèmes</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">Marquer tous les éléments comme lus ?</string>
     <string name="pref_switch_actions_pager_scroll">Marquer comme lu à la navigation.</string>
     <string name="pref_switch_actions_pager_scroll_off">Ne pas marquer les articles comme lus à la navigation.</string>
+    <string name="filter_item_hidden_tags">Tags Cachés</string>
     <string name="unmark">Marquer l\'article comme non lu</string>
     <string name="pref_header_offline">Hors ligne et cache</string>
     <string name="pref_switch_items_caching_off">Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Thème sombre</string>
     <string name="mode_system">Utiliser les paramètres système</string>
     <string name="mode_light">Thème clair</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-gl-rES/strings.xml

@@ -33,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">"Non se pode obter a lista de spouts por mor dun erro de rede."</string>
+    <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</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="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</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>
@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Temas</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">Isto marcara todos os elementos como lidos.</string>
     <string name="pref_switch_actions_pager_scroll">Marcar artigos como lidos ao deslizar co dedo cara os lados</string>
     <string name="pref_switch_actions_pager_scroll_off">Non marcar artigos como lidos ao deslizar co dedo cara os lados.</string>
+    <string name="filter_item_hidden_tags">Etiquetas ocultas</string>
     <string name="unmark">Marcar artículo como non lido</string>
     <string name="pref_header_offline">Sen conexión e caché</string>
     <string name="pref_switch_items_caching_off">Os artigos non se gardaran na memoria do dispositivo e non se poderá utilizar a aplicación sen conexión.</string>
@@ -97,7 +99,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>
@@ -116,19 +118,14 @@
     <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">Modo Claro/Escuro</string>
+    <string name="pref_theme_title">Light/Dark mode</string>
-    <string name="mode_dark">Modo escuro</string>
+    <string name="mode_dark">Dark mode</string>
-    <string name="mode_system">Seguir axustes do sistema</string>
+    <string name="mode_system">Follow the system setting</string>
-    <string name="mode_light">Modo claro</string>
+    <string name="mode_light">Light mode</string>
-    <string name="gdpr_dialog_title">A aplicación non comparte ningún dato persoal seu.</string>
+    <string name="pref_switch_enable_analytics">Enable analytics</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="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_toast_text">Ocurriu un erro. Enviando os detalles o desenvolvedor.</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="pref_switch_disable_acra">"Deshabilitar o reporte automático de erros. "</string>
+    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
-    <string name="menu_home_filter">Filtros</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</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_filter">Filters</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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-in-rID/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Tema</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -90,14 +92,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">"Koneksi jaringan hilang"</string>
+    <string name="network_connectivity_lost">"Network connection lost"</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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-it-rIT/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Temi</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Segna come non letto</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-ko-rKR/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Themes</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_switch_enable_analytics">Enable analytics</string>
+    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
+    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
+    <string name="menu_home_filter">Filters</string>
+</resources>

androidApp/src/main/res/values-nl-rNL/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Thema \'s</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-pt-rBR/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Temas</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">Isso marcará todos os itens como lidos.</string>
     <string name="pref_switch_actions_pager_scroll">Marcar Como Lida ao Abrir</string>
     <string name="pref_switch_actions_pager_scroll_off">Não marca artigos como lido quando abrir.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-pt-rPT/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Temas</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-si-rLK/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Themes</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-tr-rTR/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_theme">Temalar</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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-zh-rCN/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">这将标记所有项目为已读。</string>
     <string name="pref_switch_actions_pager_scroll">滑动时标为已读</string>
     <string name="pref_switch_actions_pager_scroll_off">滑动时不标记文章为已读</string>
+    <string name="filter_item_hidden_tags">隐藏标签</string>
     <string name="unmark">标记条目为未读</string>
     <string name="pref_header_offline">离线和缓存</string>
     <string name="pref_switch_items_caching_off">文章不会被保存到设备内存，应用程序在离线时将无法阅读它们</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">深色模式</string>
     <string name="mode_system">遵循系统设置</string>
     <string name="mode_light">浅色模式</string>
-    <string name="gdpr_dialog_title">该应用不分享任何关于您的个人数据。</string>
+    <string name="pref_switch_enable_analytics">Enable analytics</string>
-    <string name="gdpr_dialog_message"><![CDATA[崩溃报告发送现已启用。 可以从设置页面禁用它。 请记住，崩溃报告对于应用程序开发是必需的。]]></string>
+    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</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="pref_switch_disable_acra">"禁用自动错误报告 "</string>
+    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
-    <string name="menu_home_filter">筛选器</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
-    <string name="application_selfoss_only">此应用只适用于 Selfoss 实例，不适用于其他 RSS 。</string>
+    <string name="menu_home_filter">Filters</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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

androidApp/src/main/res/values-zh-rTW/strings.xml

@@ -69,6 +69,7 @@
     <string name="pref_header_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>
@@ -83,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -97,7 +99,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>
@@ -120,15 +122,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="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>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -12,5 +12,4 @@
     <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/strings.xml

@@ -6,7 +6,6 @@
     <string name="error_invalid_password">"Password not long enough"</string>
     <string name="error_field_required">"Field required"</string>
     <string name="prompt_url">"Url"</string>
-    <string name="disable_ssl">"Disable SSL"</string>
     <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>
@@ -70,6 +69,7 @@
     <string name="pref_header_theme">Themes</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>
@@ -84,6 +84,7 @@
     <string name="markall_dialog_message">This will mark all the items as read.</string>
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="filter_item_hidden_tags">Hidden Tags</string>
     <string name="unmark">Mark item as unread</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
@@ -106,7 +107,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 (seconds)</string>
+    <string name="pref_api_timeout">Api Timeout</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>
@@ -124,14 +125,10 @@
     <string name="mode_dark">Dark mode</string>
     <string name="mode_system">Follow the system setting</string>
     <string name="mode_light">Light mode</string>
+    <string name="pref_switch_enable_analytics">Enable analytics</string>
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
-    <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

@@ -26,16 +26,4 @@
         <item name="android:textColorSecondary">@color/white</item>
         <item name="actionMenuTextColor">@color/white</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

@@ -1,41 +0,0 @@
-<?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_general.xml

@@ -14,6 +14,15 @@
         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

@@ -38,6 +38,13 @@
         android:icon="@drawable/ic_widgets_black_24dp" />
 
 
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="enable_analytics"
+        android:title="@string/pref_switch_enable_analytics"
+        android:icon="@drawable/ic_baseline_insights_24"/>
+
+
     <SwitchPreference
         android:defaultValue="false"
         android:key="acra.disable"

androidApp/src/test/kotlin/DatesTest.kt

@@ -8,59 +8,26 @@ import kotlinx.datetime.toInstant
 import org.junit.Test
 
 class DatesTest {
-    private val newVersionDateVariant =     "2022-12-24T17:00:08+00"
-    private val newVersionDate =            "2013-04-07T13:43:00+01:00"
-    private val newVersionDate2 =            "2013-04-07T13:43:00-01:00"
-    private val oldVersionDate =            "2013-05-07 13:46:00"
-    private val oldVersionDateVariant =     "2021-03-21 10:32:00.000000"
 
+    private val v3Date = "2013-04-07T13:43:00+01:00"
+    private val v4Date = "2013-04-07 13:43:00"
 
     @Test
-    fun new_version_date_should_be_parsed() {
+    fun v3_date_should_be_parsed() {
-        val date = DateUtils.parseDate(newVersionDate)
+        val date = DateUtils.parseDate(v3Date)
+        val expected = LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.of("UTC+1")) .toEpochMilliseconds()
+
+        assertEquals(date, expected)
+    }
+
+    @Test
+    fun v4_date_should_be_parsed() {
+        val date = DateUtils.parseDate(v4Date)
         val expected =
             LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
                 .toEpochMilliseconds()
 
-        assertEquals(expected, date)
+        assertEquals(date, expected)
-    }
-    @Test
-    fun new_version_date2_should_be_parsed() {
-        val date = DateUtils.parseDate(newVersionDate2)
-        val expected =
-            LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
     }
 
-    @Test
-    fun old_version_date_should_be_parsed() {
-        val date = DateUtils.parseDate(oldVersionDate)
-        val expected =
-            LocalDateTime(2013, 5, 7, 13, 46, 0, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
-    }
-
-    @Test
-    fun old_version_variant_date_should_be_parsed() {
-        val date = DateUtils.parseDate(oldVersionDateVariant)
-        val expected =
-            LocalDateTime(2021, 3, 21, 10, 32, 0, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
-    }
-
-    @Test
-    fun new_version_variant_date_should_be_parsed() {
-        val date = DateUtils.parseDate(newVersionDateVariant)
-        val expected =
-            LocalDateTime(2022, 12, 24, 17, 0, 8, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
-    }
 }

androidApp/src/test/kotlin/TestUtils.kt

@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.repository
 import bou.amine.apps.readerforselfossv2.dao.ITEM
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 
+
 fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<ITEM> {
     return listOf(
         ITEM(
@@ -16,9 +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,9 +35,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,
+        )
-        ),
     )
 }
 
@@ -55,5 +54,4 @@ 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

@@ -1,24 +1,27 @@
 buildscript {
     dependencies {
         // SqlDelight
-        classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
+        classpath("com.squareup.sqldelight:gradle-plugin:1.5.4")
     }
 }
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.1.2").apply(false)
+    id("com.android.application").version("7.3.1").apply(false)
-    id("com.android.library").version("8.1.2").apply(false)
+    id("com.android.library").version("7.3.1").apply(false)
-    id("org.jetbrains.kotlin.android").version("1.9.10").apply(false)
+    kotlin("android").version("1.7.20").apply(false)
-    kotlin("multiplatform").version("1.9.10").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(true)
 }
 
+apply(plugin = "org.sonarqube")
+
 allprojects {
     repositories {
         google()
         mavenCentral()
+        jcenter()
         maven { url = uri("https://www.jitpack.io") }
     }
 }
@@ -27,7 +30,3 @@ allprojects {
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
-
-koverMerged {
-    enable()
-}

docs/index.html

@@ -68,9 +68,9 @@ redirect_from: "/ReaderforSelfoss-multiplatform/"
             <div id="links">
 
 
-                <a class="github-button" href="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
+                <a class="github-button" href="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
             </div>
-            <meta itemprop="url" content="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform">
+            <meta itemprop="url" content="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform">
             <meta itemprop="applicationCategory" content="News & Magazines">
         </div>
     </body>

gradle.properties

@@ -13,16 +13,24 @@
 #Tue Mar 22 16:50:00 CET 2022
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
 #Kotlin
 kotlin.code.style=official
+
 #Android
 android.useAndroidX=true
+kotlin.native.enableDependencyPropagation=false
 #android.nonTransitiveRClass=true
 android.enableJetifier=true
-android.nonTransitiveRClass=false
+
+
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+
+
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
+pushCache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jul 13 11:41:19 CEST 2023
+#Wed Feb 09 17:05:19 CET 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -1,3 +1,5 @@
+val pushCache: String by settings
+
 pluginManagement {
     repositories {
         google()
@@ -13,6 +15,17 @@ dependencyResolutionManagement {
     }
 }
 
+
+buildCache {
+    remote<HttpBuildCache> {
+        url = uri("http://18.0.0.7:3071/cache/")
+        isAllowInsecureProtocol = true
+        isAllowUntrustedServer = true
+        isUseExpectContinue = true
+        isPush = (pushCache == "true")
+    }
+}
+
 rootProject.name = "ReaderForSelfossV2"
 include(":androidApp")
 include(":shared")

shared/build.gradle.kts

@@ -1,5 +1,3 @@
-val ktorVersion = "2.3.2"
-
 object SqlDelight {
     const val runtime = "com.squareup.sqldelight:runtime:1.5.4"
     const val android = "com.squareup.sqldelight:android-driver:1.5.4"
@@ -11,12 +9,11 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     id("com.squareup.sqldelight")
-    kotlin("plugin.serialization") version "1.9.0"
+    kotlin("plugin.serialization") version "1.4.10"
-    id("org.jetbrains.kotlinx.kover")
 }
 
 kotlin {
-    androidTarget()
+    android()
 
     listOf(
         iosX64(),
@@ -31,18 +28,16 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
+                implementation("io.ktor:ktor-client-core:2.1.1")
-                implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
+                implementation("io.ktor:ktor-client-content-negotiation:2.1.1")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.1")
-                implementation("io.ktor:ktor-client-logging:$ktorVersion")
+                implementation("io.ktor:ktor-client-logging:2.1.1")
-                implementation("io.ktor:ktor-client-auth:$ktorVersion")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
-                implementation("io.ktor:ktor-client-cio:$ktorVersion")
+                implementation("io.ktor:ktor-client-auth:2.1.1")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+                implementation("org.jsoup:jsoup:1.14.3")
-
-                implementation("org.jsoup:jsoup:1.15.4")
 
                 //Dependency Injection
-                implementation("org.kodein.di:kodein-di:7.14.0")
+                implementation("org.kodein.di:kodein-di:7.12.0")
 
                 //Settings
                 implementation("com.russhwolf:multiplatform-settings-no-arg:1.0.0-RC")
@@ -62,15 +57,14 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation("com.squareup.okhttp3:okhttp:4.11.0")
+                implementation("io.ktor:ktor-client-okhttp:2.1.1")
-                implementation("io.ktor:ktor-client-okhttp:2.2.4")
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
                 // Sql
                 implementation(SqlDelight.android)
             }
         }
-        val androidUnitTest by getting {
+        val androidTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
@@ -103,14 +97,15 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 32
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdk = 25
+        minSdk = 21
+        targetSdk = 32
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     namespace = "bou.amine.apps.readerforselfossv2"
 }

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/rest/NetworkSSL.kt

@@ -1,23 +0,0 @@
-package bou.amine.apps.readerforselfossv2.rest
-
-import io.ktor.client.engine.cio.CIOEngineConfig
-import java.security.cert.X509Certificate
-import javax.net.ssl.X509TrustManager
-
-class NaiveTrustManager : X509TrustManager {
-    override fun checkClientTrusted(
-        chain: Array<out X509Certificate>?,
-        authType: String?,
-    ) {}
-
-    override fun checkServerTrusted(
-        chain: Array<out X509Certificate>?,
-        authType: String?,
-    ) {}
-
-    override fun getAcceptedIssuers(): Array<out X509Certificate> = arrayOf()
-}
-
-actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
-    config.https.trustManager = NaiveTrustManager()
-}

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt

@@ -1,45 +1,28 @@
 package bou.amine.apps.readerforselfossv2.utils
 
 import android.text.format.DateUtils
-import io.github.aakira.napier.Napier
 import kotlinx.datetime.*
 
+
 actual class DateUtils {
     actual companion object {
-        // Possible formats are
-        // yyyy-mm-dd hh:mm:ss format
-        private val oldVersionFormat = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}(.()\\d*)?".toRegex()
-
-        // yyyy-MM-dd'T'HH:mm:ss[.SSS]XXX (RFC3339)
-        private val newVersionFormat = "(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2})[+-](\\d{2}(:\\d{2})?)?".toRegex()
-
-        // TODO: do not fix any more issues here. Move everything to plateform specific code.
         actual fun parseDate(dateString: String): Long {
-            var isoDateString: String =
+            return try {
-                try {
+                Instant.parse(dateString).toEpochMilliseconds()
-                    if (dateString.matches(oldVersionFormat)) {
-                        dateString.replace(" ", "T")
-                    } else if (dateString.matches(newVersionFormat)) {
-                        newVersionFormat.find(dateString)?.groups?.get(1)?.value ?: throw Exception("Couldn't parse $dateString")
-                    } else {
-                        throw Exception("Unrecognized format for $dateString")
-                    }
             } catch (e: Exception) {
-                    throw Exception("parseDate failed for $dateString", e)
+                LocalDateTime.parse(dateString.replace(" ", "T")).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
             }
-
-            return LocalDateTime.parse(isoDateString).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
         }
 
         actual fun parseRelativeDate(dateString: String): String {
+
             val date = parseDate(dateString)
 
-            return " " +
+            return " " + DateUtils.getRelativeTimeSpanString(
-                DateUtils.getRelativeTimeSpanString(
                 date,
                 Clock.System.now().toEpochMilliseconds(),
                 DateUtils.MINUTE_IN_MILLIS,
-                    DateUtils.FORMAT_ABBREV_RELATIVE,
+                DateUtils.FORMAT_ABBREV_RELATIVE
             )
         }
     }

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/ModelConverters.kt

@@ -26,8 +26,8 @@ actual fun SelfossModel.Item.getImages(): ArrayList<String> {
         if (url.lowercase(Locale.US).contains(".jpg") ||
             url.lowercase(Locale.US).contains(".jpeg") ||
             url.lowercase(Locale.US).contains(".png") ||
-            url.lowercase(Locale.US).contains(".webp")
+            url.lowercase(Locale.US).contains(".webp"))
-        ) {
+        {
             allImages.add(url)
         }
     }
@@ -38,11 +38,7 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
     return constructUrl(baseUrl, "favicons", icon)
 }
 
-actual fun constructUrl(
+actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String {
     return if (file == null || file == "null" || file.isEmpty()) {
         ""
     } else {

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

@@ -2,12 +2,14 @@ package bou.amine.apps.readerforselfossv2.DI
 
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import org.kodein.di.DI
 import org.kodein.di.bind
 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,16 +1,157 @@
 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? = null,
+        val title: String,
-        val content: String? = null,
+        val content: String?,
-        val lead_image_url: String? = null, // NOSONAR
+        val lead_image_url: String?,
-        val url: String? = null,
+        val url: String
-        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,5 +1,8 @@
 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
@@ -19,3 +22,27 @@ class StatusAndData<T>(val success: Boolean, val data: T? = null) {
         }
     }
 }
+
+suspend fun responseOrSuccessIf404(r: HttpResponse): SuccessResponse {
+    return if (r.status === HttpStatusCode.NotFound) {
+        SuccessResponse(true)
+    } else {
+        maybeResponse(r)
+    }
+}
+
+suspend fun maybeResponse(r: HttpResponse): SuccessResponse {
+    return if (r.status.isSuccess()) {
+        r.body()
+    } 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,35 +9,34 @@ 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 {
+
     @Serializable
     data class Tag(
         val tag: String,
         val color: String,
-        val unread: Int,
+        val unread: Int
     )
 
     @Serializable
     class Stats(
         val total: Int,
-        val unread: Int? = null,
+        val unread: Int,
-        val starred: Int? = null,
+        val starred: Int
     )
 
     @Serializable
     data class Spout(
         val name: String,
-        val description: String,
+        val description: String
     )
 
     @Serializable
-    data class ApiInformation(
+    data class ApiVersion(
-        val version: String? = null,
+        val version: String?,
-        val apiversion: String? = null,
+        val apiversion: String?
-        val configuration: ApiConfiguration? = null,
     ) {
         fun getApiMajorVersion() : Int {
             var versionNumber = 0
@@ -46,55 +45,17 @@ class SelfossModel {
             }
             return versionNumber
         }
-
-        fun getApiConfiguration() = configuration ?: ApiConfiguration(null, null)
     }
 
     @Serializable
-    data class ApiConfiguration(
+    data class Source(
-        @Serializable(with = BooleanSerializer::class)
+        val id: Int,
-        val publicMode: Boolean? = null,
+        val title: String,
-        @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,
+        val tags: List<String>,
-        var spout: String? = null,
+        val spout: String,
-        override var error: String? = null,
+        val error: String,
-        override var icon: String? = null,
+        val icon: String?
-        var params: SourceParams? = null,
-    ) : Source
-
-    @Serializable
-    data class SourceParams(
-        val url: String? = null,
     )
 
     @Serializable
@@ -107,22 +68,26 @@ class SelfossModel {
         var unread: Boolean,
         @Serializable(with = BooleanSerializer::class)
         var starred: Boolean,
-        val thumbnail: String? = null,
+        val thumbnail: String?,
-        val icon: String? = null,
+        val icon: String?,
         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.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
+                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")) {
@@ -137,22 +102,8 @@ class SelfossModel {
             return stringUrl
         }
 
-        fun sourceAuthorAndDate(): String {
+        fun sourceAndDateText(): String =
-            var txt = this.sourcetitle.getHtmlDecoded()
+            this.sourcetitle.getHtmlDecoded() + DateUtils.parseRelativeDate(this.datetime)
-            if (!this.author.isNullOrBlank()) {
-                txt += " (by ${this.author}) "
-            }
-            txt += DateUtils.parseRelativeDate(this.datetime)
-            return txt
-        }
-
-        fun sourceAuthorOnly(): String {
-            var txt = this.sourcetitle.getHtmlDecoded()
-            if (!this.author.isNullOrBlank()) {
-                txt += " (by ${this.author}) "
-            }
-            return txt
-        }
 
         fun toggleStar(): Item {
             this.starred = !this.starred
@@ -164,19 +115,17 @@ class SelfossModel {
     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().replace("^\"|\"$".toRegex(), "") }
+                is JsonArray -> json.toList().map { it.toString() }
                 else -> json.toString().split(",")
             }
+
         }
 
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
 
-        override fun serialize(
+        override fun serialize(encoder: Encoder, value: List<String>) {
-            encoder: Encoder,
+            TODO("Not yet implemented")
-            value: List<String>,
-        ) {
-            encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
         }
     }
 
@@ -193,10 +142,7 @@ class SelfossModel {
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN)
 
-        override fun serialize(
+        override fun serialize(encoder: Encoder, value: Boolean) {
-            encoder: Encoder,
-            value: Boolean,
-        ) {
             TODO("Not yet implemented")
         }
     }

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

@@ -14,12 +14,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-class Repository(
+class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, val isConnectionAvailable: MutableStateFlow<Boolean>, private val db: ReaderForSelfossDB) {
-    private val api: SelfossApi,
+
-    private val appSettingsService: AppSettingsService,
-    val isConnectionAvailable: MutableStateFlow<Boolean>,
-    private val db: ReaderForSelfossDB,
-) {
     var items = ArrayList<SelfossModel.Item>()
     var connectionMonitored = false
 
@@ -42,27 +38,26 @@ class Repository(
     private val _badgeStarred = MutableStateFlow(0)
     val badgeStarred = _badgeStarred.asStateFlow()
 
-    private var fetchedTags = false
     private var fetchedSources = false
-
+    private var fetchedTags = 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 =
+            fetchedItems = api.getItems(
-                api.getItems(
                 displayedItems.type,
                 offset = 0,
                 tagFilter.value?.tag,
                 sourceFilter.value?.id?.toLong(),
                 searchFilter,
-                    null,
+                null
             )
-        } else if (appSettingsService.isItemCachingEnabled()) {
+        } else {
-            var dbItems =
+            if (appSettingsService.isItemCachingEnabled()) {
-                getDBItems().filter {
+                fromDB = true
+                var dbItems = getDBItems().filter {
                     displayedItems == ItemType.ALL ||
                             (it.unread && displayedItems == ItemType.UNREAD) ||
                             (it.starred && displayedItems == ItemType.STARRED)
@@ -73,16 +68,17 @@ class Repository(
                 if (sourceFilter.value != null) {
                     dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
                 }
-            val itemsList = ArrayList(dbItems.map { it.toView() })
+                fetchedItems = StatusAndData.succes(
-            itemsList.sortByDescending { DateUtils.parseDate(it.datetime) }
+                    dbItems.map { it.toView() }
-            fetchedItems =
-                StatusAndData.succes(
-                    itemsList,
                 )
             }
+        }
 
         if (fetchedItems.success && fetchedItems.data != null) {
             items = ArrayList(fetchedItems.data!!)
+            if (fromDB) {
+                items.sortByDescending { DateUtils.parseDate(it.datetime) }
+            }
         }
         return items
     }
@@ -91,14 +87,13 @@ class Repository(
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
         if (isNetworkAvailable()) {
             val offset = items.size
-            fetchedItems =
+            fetchedItems = api.getItems(
-                api.getItems(
                 displayedItems.type,
                 offset,
                 tagFilter.value?.tag,
                 sourceFilter.value?.id?.toLong(),
                 searchFilter,
-                    null,
+                null
             )
         } // When using the db cache, we load everything the first time, so there should be nothing more to load.
 
@@ -110,15 +105,14 @@ class Repository(
 
     private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> {
         return if (isNetworkAvailable()) {
-            val items =
+            val items = api.getItems(
-                api.getItems(
                 itemType.type,
                 0,
                 null,
                 null,
                 null,
                 null,
-                    200,
+                200
             )
             return if (items.success && items.data != null) {
                 items.data
@@ -135,9 +129,9 @@ class Repository(
         if (isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
-                _badgeUnread.value = response.data.unread ?: 0
+                _badgeUnread.value = response.data.unread
                 _badgeAll.value = response.data.total
-                _badgeStarred.value = response.data.starred ?: 0
+                _badgeStarred.value = response.data.starred
                 success = true
             }
         } else if (appSettingsService.isItemCachingEnabled()) {
@@ -152,8 +146,7 @@ class Repository(
     }
 
     suspend fun getTags(): List<SelfossModel.Tag> {
-        val isDatabaseEnabled =
+        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         return if (isNetworkAvailable() && !fetchedTags) {
             val apiTags = api.tags()
             if (apiTags.success && apiTags.data != null && isDatabaseEnabled) {
@@ -170,61 +163,39 @@ class Repository(
         }
     }
 
+    // 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()
+                emptyMap() // TODO: do something here
             }
         } else {
             throw NetworkUnavailableException()
         }
     }
 
-    suspend fun getSourcesDetailsOrStats(): ArrayList<SelfossModel.Source> {
+    suspend fun getSources(): ArrayList<SelfossModel.Source> {
-        var sources = ArrayList<SelfossModel.Source>()
+        val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-        val isDatabaseEnabled =
+        return if (isNetworkAvailable() && !fetchedSources) {
-            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
+            val apiSources = api.sources()
-        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
+            if (apiSources.success && apiSources.data != null && isDatabaseEnabled) {
-        if (shouldFetch && isNetworkAvailable()) {
+                resetDBSourcesWithData(apiSources.data)
-            if (appSettingsService.getPublicAccess()) {
+                if (!appSettingsService.isUpdateSourcesEnabled()) {
-                val apiSources = api.sourcesStats()
-                if (apiSources.success && apiSources.data != null) {
                     fetchedSources = true
-                    sources = apiSources.data as ArrayList<SelfossModel.Source>
                 }
+            }
+            apiSources.data ?: ArrayList()
+        } else if (isDatabaseEnabled) {
+            ArrayList(getDBSources().map { it.toView() })
         } else {
-                sources = getSourcesDetails() as ArrayList<SelfossModel.Source>
+            ArrayList()
         }
-        } else if (isDatabaseEnabled) {
-            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)
 
@@ -243,6 +214,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
         val success = unmarkAsReadById(item.id)
 
@@ -261,6 +233,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun starr(item: SelfossModel.Item): Boolean {
         val success = starrById(item.id)
 
@@ -279,6 +252,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
         val success = unstarrById(item.id)
 
@@ -297,6 +271,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
@@ -358,6 +333,7 @@ class Repository(
         url: String,
         spout: String,
         tags: String,
+        filter: String
     ): Boolean {
         var response = false
         if (isNetworkAvailable()) {
@@ -366,44 +342,20 @@ class Repository(
                 url,
                 spout,
                 tags,
+                filter
             ).isSuccess == true
         }
 
         return response
     }
 
-    suspend fun updateSource(
+    suspend fun deleteSource(id: Int): Boolean {
-        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
     }
 
@@ -422,80 +374,53 @@ class Repository(
                 val response = api.login()
                 result = response.isSuccess == true
             } catch (cause: Throwable) {
-                Napier.e("login failed", cause, tag = "RepositoryImpl.login")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.login")
             }
         }
         return result
     }
 
-    suspend fun checkIfFetchFails(): Boolean {
-        var fetchFailed = true
-        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: Throwable) {
-                Napier.e("checkIfFetchFails failed", e, tag = "RepositoryImpl.shouldBeSelfossInstance")
-            }
-        }
-
-        return fetchFailed
-    }
-
     suspend fun logout() {
         if (isNetworkAvailable()) {
             try {
                 val response = api.logout()
-                if (!response.isSuccess) {
+                if (response.isSuccess) {
                     Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
                 }
             } catch (cause: Throwable) {
-                Napier.e("logout failed", cause, tag = "RepositoryImpl.logout")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.logout")
-            }
+            } finally {
                 appSettingsService.clearAll()
+            }
         } else {
             appSettingsService.clearAll()
         }
     }
 
-    fun refreshLoginInformation(
+    fun refreshLoginInformation(url: String, login: String, password: String) {
-        url: String,
-        login: String,
-        password: String,
-    ) {
         appSettingsService.refreshLoginInformation(url, login, password)
         baseUrl = url
         api.refreshLoginInformation()
     }
 
-    suspend fun updateApiInformation() {
+    suspend fun updateApiVersion() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
         if (isNetworkAvailable()) {
-            val fetchedInformation = api.apiInformation()
+            val fetchedVersion = api.version()
-            if (fetchedInformation.success && fetchedInformation.data != null) {
+            if (fetchedVersion.success && fetchedVersion.data != null && fetchedVersion.data.getApiMajorVersion() != apiMajorVersion) {
-                if (fetchedInformation.data.getApiMajorVersion() != apiMajorVersion) {
+                appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
-                    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)
-                }
             }
         }
     }
 
     fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
 
-    private fun getDBActions(): List<ACTION> = db.actionsQueries.actions().executeAsList()
+    private fun getDBActions(): List<ACTION> =
+        db.actionsQueries.actions().executeAsList()
 
-    private fun deleteDBAction(action: ACTION) = db.actionsQueries.deleteAction(action.id)
+    private fun deleteDBAction(action: ACTION) =
+        db.actionsQueries.deleteAction(action.id)
 
     private fun getDBTags(): List<TAG> = db.tagsQueries.tags().executeAsList()
 
@@ -511,7 +436,7 @@ class Repository(
         }
     }
 
-    private fun resetDBSourcesWithData(sources: List<SelfossModel.SourceDetail>) {
+    private fun resetDBSourcesWithData(sources: List<SelfossModel.Source>) {
         db.sourcesQueries.deleteAllSources()
 
         db.sourcesQueries.transaction {
@@ -531,29 +456,11 @@ class Repository(
 
     private fun getDBItems(): List<ITEM> = db.itemsQueries.items().executeAsList()
 
-    private fun insertDBAction(
+    private fun insertDBAction(articleid: String, read: Boolean = false, unread: Boolean = false, starred: Boolean = false, unstarred: Boolean = false) =
-        articleid: String,
+        db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
-        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(
+        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())
-            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 {
@@ -568,39 +475,34 @@ class Repository(
         return emptyList()
     }
 
+    // TODO: Add tests
     suspend fun handleDBActions() {
+
         val actions: List<ACTION> = getDBActions()
 
         actions.forEach { action ->
             when {
-                action.read ->
+                action.read -> doAndReportOnFail(
-                    doAndReportOnFail(
                     markAsReadById(action.articleid.toInt()),
-                        action,
+                    action
                 )
-                action.unread ->
+                action.unread -> doAndReportOnFail(
-                    doAndReportOnFail(
                     unmarkAsReadById(action.articleid.toInt()),
-                        action,
+                    action
                 )
-                action.starred ->
+                action.starred -> doAndReportOnFail(
-                    doAndReportOnFail(
                     starrById(action.articleid.toInt()),
-                        action,
+                    action
                 )
-                action.unstarred ->
+                action.unstarred -> doAndReportOnFail(
-                    doAndReportOnFail(
                     unstarrById(action.articleid.toInt()),
-                        action,
+                    action
                 )
             }
         }
     }
 
-    private fun doAndReportOnFail(
+    private fun doAndReportOnFail(result: Boolean, action: ACTION) {
-        result: Boolean,
-        action: ACTION,
-    ) {
         if (result) {
             deleteDBAction(action)
         }
@@ -613,28 +515,4 @@ class Repository(
     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/MercuryApi.kt

@@ -11,23 +11,21 @@ import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
 
 class MercuryApi() {
+
     var client = createHttpClient()
 
     private fun createHttpClient(): HttpClient {
         return HttpClient {
             install(ContentNegotiation) {
                 install(HttpCache)
-                json(
+                json(Json {
-                    Json {
                     prettyPrint = true
                     isLenient = true
                     ignoreUnknownKeys = true
-                    },
+                })
-                )
             }
             install(Logging) {
-                logger =
+                logger = object : Logger {
-                    object : Logger {
                     override fun log(message: String) {
                         Napier.d(message, tag = "LogMercuryCalls")
                     }
@@ -39,9 +37,7 @@ class MercuryApi() {
     }
 
     suspend fun query(url: String): StatusAndData<MercuryModel.ParsedContent> =
-        bodyOrFailure(
+        bodyOrFailure(client.get("https://amine-louveau.fr/parser.php") {
-            client.get("https://amine-bouabdallaoui.fr/parser.php") {
             parameter("link", url)
-            },
+        })
-        )
 }

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

@@ -1,97 +0,0 @@
-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,64 +1,40 @@
 package bou.amine.apps.readerforselfossv2.rest
 
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.model.*
-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.HttpClient
+import io.ktor.client.*
-import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.*
-import io.ktor.client.engine.cio.CIOEngineConfig
+import io.ktor.client.plugins.cache.*
-import io.ktor.client.plugins.HttpRequestRetry
+import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.cookies.*
-import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
+import io.ktor.client.plugins.logging.*
-import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.request.*
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.request.forms.*
-import io.ktor.client.plugins.cookies.HttpCookies
+import io.ktor.client.statement.*
-import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.http.*
-import io.ktor.client.plugins.logging.Logger
+import io.ktor.serialization.kotlinx.json.*
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.client.request.get
-import io.ktor.client.request.headers
-import io.ktor.client.request.parameter
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.Parameters
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.util.encodeBase64
-import io.ktor.utils.io.charsets.Charsets
-import io.ktor.utils.io.core.toByteArray
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 
-expect fun setupInsecureHTTPEngine(config: CIOEngineConfig)
-
 class SelfossApi(private val appSettingsService: AppSettingsService) {
+
     var client = createHttpClient()
 
-    fun createHttpClient() =
+    private fun createHttpClient(): HttpClient {
-        HttpClient(CIO) {
+        val client = HttpClient {
-            if (appSettingsService.getSelfSigned()) {
-                engine {
-                    setupInsecureHTTPEngine(this)
-                }
-            }
             install(ContentNegotiation) {
                 install(HttpCache)
-                json(
+                json(Json {
-                    Json {
                     prettyPrint = true
                     isLenient = true
                     ignoreUnknownKeys = true
-                        explicitNulls = false
+                })
-                    },
-                )
             }
             install(Logging) {
-                logger =
+                logger = object : Logger {
-                    object : Logger {
                     override fun log(message: String) {
                         Napier.d(message, tag = "LogApiCalls")
                     }
@@ -74,11 +50,11 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 retryIf { _, response ->
                     response.status == HttpStatusCode.Forbidden && shouldHavePostLogin() && hasLoginInfo()
                 }
-                modifyRequest {
+                modifyRequest { _ ->
                     Napier.i("Will modify", tag = "HttpSend")
                     CoroutineScope(Dispatchers.Main).launch {
                         Napier.i("Will login", tag = "HttpSend")
-                        login()
+                        this@SelfossApi.login()
                         Napier.i("Did login", tag = "HttpSend")
                     }
                 }
@@ -86,33 +62,23 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             expectSuccess = false
         }
 
-    fun url(path: String) = "${appSettingsService.getBaseUrl()}$path"
+        return client
+    }
+
+    fun url(path: String) =
+        "${appSettingsService.getBaseUrl()}$path"
 
     fun refreshLoginInformation() {
         appSettingsService.refreshApiSettings()
         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() != null && appSettingsService.getPassword() != null
-    private fun hasLoginInfo() =
-        appSettingsService.getUserName().isNotEmpty() &&
-            appSettingsService.getPassword()
-                .isNotEmpty()
 
     suspend fun login(): SuccessResponse =
-        if (appSettingsService.getUserName().isNotEmpty() &&
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
-            appSettingsService.getPassword()
-                .isNotEmpty()
-        ) {
             if (shouldHavePostLogin()) {
                 postLogin()
             } else {
@@ -122,50 +88,17 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             SuccessResponse(true)
         }
 
-    private suspend fun getLogin() =
+    private suspend fun getLogin() = maybeResponse(client.get(url("/login")) {
-        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() =
+    private suspend fun postLogin() = maybeResponse(client.post(url("/login")) {
-        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()
@@ -173,43 +106,9 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             maybeLogoutIfAvailable()
         }
 
-    private suspend fun maybeLogoutIfAvailable() =
+    private suspend fun maybeLogoutIfAvailable() = responseOrSuccessIf404(client.get(url("/logout")))
-        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() =
+    private suspend fun doLogout() = maybeResponse(client.delete(url("/api/session/current")))
-        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,
@@ -218,10 +117,9 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         source: Long?,
         search: String?,
         updatedSince: String?,
-        items: Int? = null,
+        items: Int? = null
     ): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(
+        bodyOrFailure(client.get(url("/items")) {
-            client.tryToGet(url("/items")) {
             if (!shouldHavePostLogin()) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
@@ -233,351 +131,121 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             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(
+        bodyOrFailure(client.get(url("/stats")) {
-            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(
+        bodyOrFailure(client.get(url("/tags")) {
-            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(
+        bodyOrFailure(client.get(url("/update")) {
-            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(
+        bodyOrFailure(client.get(url("/sources/spouts")) {
-            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 sourcesStats(): StatusAndData<ArrayList<SelfossModel.SourceStats>> =
+    suspend fun sources(): StatusAndData<ArrayList<SelfossModel.Source>> =
-        bodyOrFailure(
+        bodyOrFailure(client.get(url("/sources/list")) {
-            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 sourcesDetailed(): StatusAndData<ArrayList<SelfossModel.SourceDetail>> =
+    suspend fun version(): StatusAndData<SelfossModel.ApiVersion> =
-        bodyOrFailure(
+        bodyOrFailure(client.get(url("/api/about")))
-            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(
+        maybeResponse(client.post(url("/mark/$id")) {
-            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(
+        maybeResponse(client.post(url("/unmark/$id")) {
-            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(
+        maybeResponse(client.post(url("/starr/$id")) {
-            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(
+        maybeResponse(client.post(url("/unstarr/$id")) {
-            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(
+        maybeResponse(client.submitForm(
-            client.tryToSubmitForm(
             url = url("/mark"),
-                formParameters =
+            formParameters = Parameters.build {
-                    Parameters.build {
                 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(),
-                                    ),
-                                ),
-                            )
             }
-                    }
+        ))
-                },
-            ),
-        )
 
     suspend fun createSourceForVersion(
         title: String,
         url: String,
         spout: String,
         tags: String,
+        filter: String
     ): SuccessResponse =
         maybeResponse(
             if (appSettingsService.getApiVersion() > 1) {
-                createSource("tags[]", title, url, spout, tags)
+                createSource2(title, url, spout, tags, filter)
             } else {
-                createSource("tags", title, url, spout, tags)
+                createSource(title, url, spout, tags, filter)
-            },
+            }
         )
 
     private suspend fun createSource(
-        tagsParamName: String,
         title: String,
         url: String,
         spout: String,
         tags: String,
-    ): HttpResponse? =
+        filter: String
-        client.tryToSubmitForm(
+    ): HttpResponse =
+        client.submitForm(
             url = url("/source"),
-            formParameters =
+            formParameters = Parameters.build {
-                Parameters.build {
+                // TODO: test this
                 if (!shouldHavePostLogin()) {
                     append("username", appSettingsService.getUserName())
                     append("password", appSettingsService.getPassword())
@@ -585,52 +253,21 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 append("title", title)
                 append("url", url)
                 append("spout", spout)
-                    append(tagsParamName, tags)
+                append("tags", tags)
-                },
+                append("filter", filter)
-            block = {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
             }
-                }
-            },
         )
 
-    suspend fun updateSourceForVersion(
+    private suspend fun createSource2(
-        id: Int,
         title: String,
         url: String,
         spout: String,
         tags: String,
-    ): SuccessResponse =
+        filter: String
-        maybeResponse(
+    ): HttpResponse =
-            if (appSettingsService.getApiVersion() > 1) {
+        client.submitForm(
-                updateSource(id, "tags[]", title, url, spout, tags)
+            url = url("/source"),
-            } else {
+            formParameters = Parameters.build {
-                updateSource(id, "tags", title, url, spout, tags)
-            },
-        )
-
-    private suspend fun updateSource(
-        id: Int,
-        tagsParamName: String,
-        title: String,
-        url: String,
-        spout: String,
-        tags: String,
-    ): HttpResponse? =
-        client.tryToSubmitForm(
-            url = url("/source/$id"),
-            formParameters =
-                Parameters.build {
                 if (!shouldHavePostLogin()) {
                     append("username", appSettingsService.getUserName())
                     append("password", appSettingsService.getPassword())
@@ -638,45 +275,16 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 append("title", title)
                 append("url", url)
                 append("spout", spout)
-                    append(tagsParamName, tags)
+                append("tags[]", tags)
-                },
+                append("filter", filter)
-            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(
+        maybeResponse(client.delete(url("/source/$id")) {
-            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

@@ -1,105 +0,0 @@
-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,24 +1,17 @@
 package bou.amine.apps.readerforselfossv2.service
 
 import com.russhwolf.settings.Settings
+import io.github.aakira.napier.Napier
+import io.ktor.client.plugins.*
 
-class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
+class AppSettingsService {
-    val settings: Settings =
+    val settings: Settings = Settings()
-        if (acraSenderServiceProcess) {
-            ACRASettings()
-        } else {
-            Settings()
-        }
 
     // Api related
     private var _apiVersion: Int = -1
-    private var _publicAccess: Boolean? = null
-    private var _selfSigned: 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
@@ -34,6 +27,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     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
@@ -42,6 +36,8 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     private var _staticBar: Boolean? = null
     private var _font: String = ""
     private var _theme: Int? = null
+    private var _enableAnalytics: Boolean? = null
+
 
     init {
         refreshApiSettings()
@@ -56,47 +52,10 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         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 getSelfSigned(): Boolean {
-        if (_selfSigned == null) {
-            refreshSelfSigned()
-        }
-        return _selfSigned!!
-    }
-
-    fun updateSelfSigned(selfSigned: Boolean) {
-        settings.putBoolean(API_SELF_SIGNED, selfSigned)
-        refreshSelfSigned()
-    }
-
-    private fun refreshSelfSigned() {
-        _selfSigned = settings.getBoolean(API_SELF_SIGNED, false)
-    }
-
     fun getBaseUrl(): String {
         if (_baseUrl.isEmpty()) {
             refreshBaseUrl()
@@ -118,20 +77,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         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()
@@ -140,13 +85,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     }
 
     private fun refreshItemsNumber() {
-        _itemsNumber =
+        _itemsNumber = settings.getString(API_ITEMS_NUMBER, "20").toInt()
-            try {
-                settings.getString(API_ITEMS_NUMBER, "20").toInt()
-            } catch (e: Exception) {
-                settings.remove(API_ITEMS_NUMBER)
-                20
-            }
     }
 
     fun getApiTimeout(): Long {
@@ -156,24 +95,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _apiTimeout!!
     }
 
-    private fun secToMs(n: Long) = n * 1000
-
     private fun refreshApiTimeout() {
-        _apiTimeout =
+        val settingsTimeout = settings.getLong(API_TIMEOUT, HttpTimeout.INFINITE_TIMEOUT_MS)
-            secToMs(
+        _apiTimeout = if (settingsTimeout > 0) settingsTimeout else HttpTimeout.INFINITE_TIMEOUT_MS
-                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() {
@@ -188,14 +112,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         _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)
     }
@@ -206,7 +122,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _articleViewer == true
     }
-
     private fun refreshShouldBeCardViewEnabled() {
         _shouldBeCardView = settings.getBoolean(CARD_VIEW_ACTIVE, false)
     }
@@ -217,7 +132,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _shouldBeCardView == true
     }
-
     private fun refreshDisplayUnreadCountEnabled() {
         _displayUnreadCount = settings.getBoolean(DISPLAY_UNREAD_COUNT, true)
     }
@@ -228,7 +142,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _displayUnreadCount == true
     }
-
     private fun refreshDisplayAllCountEnabled() {
         _displayAllCount = settings.getBoolean(DISPLAY_OTHER_COUNT, false)
     }
@@ -239,7 +152,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _displayAllCount == true
     }
-
     private fun refreshFullHeightCardsEnabled() {
         _fullHeightCards = settings.getBoolean(FULL_HEIGHT_CARDS, false)
     }
@@ -250,7 +162,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _fullHeightCards == true
     }
-
     private fun refreshUpdateSourcesEnabled() {
         _updateSources = settings.getBoolean(UPDATE_SOURCES, true)
     }
@@ -261,7 +172,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _updateSources == true
     }
-
     private fun refreshPeriodicRefreshEnabled() {
         _periodicRefresh = settings.getBoolean(PERIODIC_REFRESH, false)
     }
@@ -298,6 +208,19 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         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)
     }
@@ -331,6 +254,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _notifyNewItems == true
     }
 
+
     private fun refreshMarkOnScrollEnabled() {
         _markOnScroll = settings.getBoolean(MARK_ON_SCROLL, false)
     }
@@ -342,6 +266,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _markOnScroll == true
     }
 
+
     private fun refreshActiveAllignment() {
         _activeAlignment = settings.getInt(TEXT_ALIGN, JUSTIFY)
     }
@@ -380,6 +305,17 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         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, "")
     }
@@ -405,12 +341,8 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     fun refreshApiSettings() {
         refreshPassword()
         refreshUsername()
-        refreshBasicUsername()
-        refreshBasicPassword()
         refreshBaseUrl()
         refreshApiVersion()
-        refreshPublicAccess()
-        refreshSelfSigned()
     }
 
     fun refreshUserSettings() {
@@ -425,6 +357,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         refreshPeriodicRefreshEnabled()
         refreshRefreshWhenChargingOnlyEnabled()
         refreshRefreshMinutes()
+        refreshHiddenTags()
         refreshInfiniteLoadingEnabled()
         refreshItemCachingEnabled()
         refreshNotifyNewItemsEnabled()
@@ -434,24 +367,15 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         refreshFont()
         refreshStaticBarEnabled()
         refreshCurrentTheme()
+        refreshAnalyticsEnabled()
     }
 
     fun refreshLoginInformation(
         url: String,
         login: String,
-        password: String,
+        password: String
     ) {
-        val regex = """\/\/(\S+):(\S+)@""".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()
@@ -461,11 +385,14 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         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()
@@ -480,9 +407,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     companion object {
         const val translationUrl = "https://crwd.in/readerforselfoss"
 
-        const val sourceUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform"
+        const val sourceUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform"
 
-        const val trackerUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
+        const val trackerUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
 
         const val syncChannelId = "sync-channel-id"
 
@@ -494,10 +421,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val API_VERSION_MAJOR = "apiVersionMajor"
 
-        const val API_PUBLIC_ACCESS = "apiPublicAccess"
-
-        const val API_SELF_SIGNED = "apiSelfSigned"
-
         const val API_ITEMS_NUMBER = "prefer_api_items_number"
 
         const val API_TIMEOUT = "api_timeout"
@@ -508,10 +431,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         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"
@@ -542,10 +461,14 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         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

@@ -9,37 +9,34 @@ fun TAG.toView(): SelfossModel.Tag =
     SelfossModel.Tag(
         this.name,
         this.color,
-        this.unread.toInt(),
+        this.unread.toInt()
     )
 
-fun SOURCE.toView(): SelfossModel.SourceDetail =
+fun SOURCE.toView(): SelfossModel.Source =
-    SelfossModel.SourceDetail(
+    SelfossModel.Source(
         this.id.toInt(),
         this.title,
-        null,
+        this.tags.split(","),
-        this.tags?.split(","),
         this.spout,
         this.error,
-        this.icon,
+        this.icon
-        if (this.url != null) SelfossModel.SourceParams(this.url) else null,
     )
 
-fun SelfossModel.SourceDetail.toEntity(): SOURCE =
+fun SelfossModel.Source.toEntity(): SOURCE =
     SOURCE(
         this.id.toString(),
         this.title.getHtmlDecoded(),
-        this.tags?.joinToString(",").orEmpty(),
+        this.tags.joinToString(","),
-        this.spout.orEmpty(),
+        this.spout,
-        this.error.orEmpty(),
+        this.error,
-        this.icon.orEmpty(),
+        this.icon.orEmpty()
-        this.params?.url,
     )
 
 fun SelfossModel.Tag.toEntity(): TAG =
     TAG(
         this.tag,
         this.color,
-        this.unread.toLong(),
+        this.unread.toLong()
     )
 
 fun ITEM.toView(): SelfossModel.Item =
@@ -54,8 +51,7 @@ fun ITEM.toView(): SelfossModel.Item =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags.split(","),
+        this.tags.split(",")
-        this.author,
     )
 
 fun SelfossModel.Item.toEntity(): ITEM =
@@ -70,16 +66,5 @@ fun SelfossModel.Item.toEntity(): ITEM =
         this.icon,
         this.link,
         this.sourcetitle.getHtmlDecoded(),
-        this.tags.joinToString(","),
+        this.tags.joinToString(",")
-        this.author,
     )
-
-fun SelfossModel.Tag.getColorHexCode(): String =
-    if (this.color.length == 4) { // #000
-        val char1 = this.color.get(1)
-        val char2 = this.color.get(2)
-        val char3 = this.color.get(3)
-        "#$char1$char1$char2$char2$char3$char3"
-    } else {
-        this.color
-    }