ci: Instrumentation tests coverage in ci.

Reviewed-on: #190

.drone.yml

@@ -1,21 +0,0 @@
-kind: pipeline
-type: docker
-name: android
-
-steps:
-  - name: code-analysis
-    image: mingc/android-build-box:latest
-    failure: ignore
-    commands:
-      - ls -la
-      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\""
-    environment:
-      SONAR_HOST_URL:
-        from_secret: sonarScannerHostUrl
-      SONAR_LOGIN:
-        from_secret: sonarScannerLogin
-
-  - name: build
-    image: mingc/android-build-box:latest
-    commands:
-      - ./gradlew  :androidApp:build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false

.editorconfig

@@ -0,0 +1,36 @@
+root = true
+
+[*]
+insert_final_newline = true
+
+[.editorconfig]
+insert_final_newline = false
+ij_kotlin_line_break_after_multiline_when_entry = false
+
+[*.{kt,kts}]
+#  Disable wildcard imports entirely
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+end_of_line = lf
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
+ij_kotlin_indent_before_arrow_on_new_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+ij_kotlin_packages_to_use_import_on_demand = unset
+indent_size = 4
+indent_style = space
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = unset
+ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 4
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
+ktlint_code_style = ktlint_official
+ktlint_enum_entry_name_casing = upper_or_camel_cases
+ktlint_function_naming_ignore_when_annotated_with = unset
+ktlint_function_signature_body_expression_wrapping = multiline
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
+ktlint_ignore_back_ticked_identifier = false
+ktlint_property_naming_constant_naming = screaming_snake_case
+max_line_length = 140
+
+[**/build]
+ktlint = disabled

.gitea/workflows/assets/crowdin.yml

@@ -0,0 +1,10 @@
+project_id_env: CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_PERSONAL_TOKEN
+base_path: "../../../"
+
+files:
+  - source: /androidApp/src/main/res/values/strings.xml
+    translation: /androidApp/src/main/res/values-%android_code%/%original_file_name%
+    translate_attributes: '0'
+    content_segmentation: '0'
+preserve_hierarchy: true

.gitea/workflows/assets/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3'
+services:
+  selfoss:
+    container_name: selfoss
+    image: rsprta/selfoss
+    network_mode: "host"
+    ports:
+      - "8888:8888"
+
+

.gitea/workflows/common_build.yml

@@ -0,0 +1,61 @@
+name: Build
+on:
+  workflow_call:
+
+jobs:
+  BuildAndTestAndCoverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: "Check android app changes"
+        id: check-android-changes
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            androidApp/src/**
+      - name: Fetch tags
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+        run: git fetch --tags -p
+      - uses: actions/setup-java@v4
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - uses: gradle/actions/setup-gradle@v3
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+      - uses: android-actions/setup-android@v3
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+      - name: Configure gradle...
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
+      - name: Build and test
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest # These tests will be done
+      # TESTS ARE RUN LOCALLY
+      #      - uses: KengoTODA/actions-setup-docker-compose@v1
+      #        with:
+      #          version: "2.23.3"
+      #      - name: run selfoss
+      #        run: |
+      #          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
+      - name: coverage
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+        run: |
+          ./gradlew :koverHtmlReport
+      - uses: actions/upload-artifact@v3
+        if: steps.check-android-changes.outputs.any_modified == 'true'
+        with:
+          name: coverage
+          path: build/reports/kover/html
+          retention-days: 1
+          overwrite: true
+          include-hidden-files: true
+#      TESTS ARE RUN LOCALLY
+#      - name: Clean
+#        if: always()
+#        run: |
+#          docker compose -f .gitea/workflows/assets/docker-compose.yml stop

.gitea/workflows/common_coverage.yml

@@ -0,0 +1,62 @@
+name: Coverage
+on:
+  workflow_call:
+
+jobs:
+  BuildAndTestAndCoverage:
+    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
+      - name: Check KVM
+        run: |
+          sudo apt update
+          sudo apt install -y kmod qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - uses: gradle/actions/setup-gradle@v3
+      #- uses: android-actions/setup-android@v3
+      - name: Configure gradle...
+        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
+      - uses: KengoTODA/actions-setup-docker-compose@v1
+        with:
+          version: "2.23.3"
+      - name: run selfoss
+        run: |
+          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
+      - name: Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          arch: x86_64
+          script: ./gradlew androidApp:connectedAndroidTest
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: failure-espresso
+          path: build/reports/androidTests/connected/screenshots
+          retention-days: 2
+          overwrite: true
+          include-hidden-files: true
+      - uses: actions/upload-artifact@v3
+        with:
+          name: coverage-espresso
+          path: build/reports/coverage/androidTest/githubConfig/debug/connected
+          retention-days: 1
+          overwrite: true
+          include-hidden-files: true
+      - name: Clean
+        if: always()
+        run: |
+          docker compose -f .gitea/workflows/assets/docker-compose.yml stop

.gitea/workflows/on_merge_on_release.yml

@@ -0,0 +1,128 @@
+name: Create tag
+on:
+  push:
+    branches:
+      - release
+  workflow_dispatch:
+
+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
+          ref: master
+      - name: Config git
+        run: |
+          git config --global user.email aminecmi+giteadrone@pm.me
+          git config --global user.name giteadrone
+      - name: Creating the tag and generate changelog
+        run: |
+          git fetch --tags -p
+          PREV=$(git describe --tags --abbrev=0)
+          ./build.sh --publish --from-ci
+          VER=$(git describe --tags --abbrev=0)
+          CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+          echo "**$VER
+          
+          $CHANGELOG
+          
+          --------------------------------------------------------------------
+          
+          $(cat CHANGELOG.md)" > CHANGELOG.md
+          git add CHANGELOG.md
+          touch ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
+          echo "**$VER**
+          
+          $CHANGELOG" > ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
+          git add ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
+          git commit -m "Changelog for $VER"
+      - name: Push changes
+        uses: appleboy/git-push-action@v1.0.0
+        with:
+          author_name: giteadrone
+          author_email: aminecmi+giteadrone@pm.me
+          remote: ${{ secrets.REMOTE_URL }}
+          followtags: true
+          ssh_key: ${{ secrets.PRIVATE_KEY }}
+          tags: true
+          branch: master
+      - name: copy file via ssh password
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: amine-bouabdallaoui.fr
+          username: ubuntu
+          key: ${{ secrets.PRIVATE_KEY }}
+          source: "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/
+  release:
+    runs-on: ubuntu-latest
+    needs: createTagAndChangelog
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Fetch tags
+        id: version
+        run: |
+          git fetch --tags -p
+          PREV=$(git describe --tags --abbrev=0)
+          echo $PREV
+          echo "VERSION=$PREV" >> $GITHUB_OUTPUT
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - 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: setup go
+        uses: https://github.com/actions/setup-go@v4
+        with:
+          go-version: '>=1.20.1'
+      - name: Generate APK
+        run: ./gradlew :androidApp:assembleGithubConfigRelease
+      - name: Get Key
+        run: wget ${{ secrets.KEY_URL }}
+      - name: Zippalign
+        run: |
+          sdkmanager "build-tools;31.0.0"
+          ls $ANDROID_HOME/build-tools 
+          $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/gitea-release-action@main
+        with:
+          files: signed.apk
+          token: ${{ secrets.API_KEY }}
+          tag_name: ${{ steps.version.outputs.VERSION }}
+          name: ${{ steps.version.outputs.VERSION }}
+      - 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: Nouveau fichier de mapping pour la version ${{ steps.version.outputs.VERSION }}
+          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt

.gitea/workflows/on_pr.yml

@@ -0,0 +1,93 @@
+name: Check PR code
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  EspressoReports:
+    runs-on: ubuntu-latest
+    uses: ./.gitea/workflows/common_coverage.yml
+#  Lint:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check out repository code
+#        uses: actions/checkout@v4
+#      - uses: actions/setup-java@v4
+#        with:
+#          distribution: 'temurin'
+#          java-version: '17'
+#          cache: gradle
+#      - name: Install klint
+#        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.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.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip
+#      - name: Linting...
+#        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build'
+#      - name: Detecting...
+#        run: ./detekt-cli-1.23.7/bin/detekt-cli -c detekt.yml --excludes '**/shared/build/**/*.kt'
+#  translations:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check out repository code
+#        uses: actions/checkout@v4
+#        with:
+#          fetch-depth: 0
+#      - name: "Check translations changes"
+#        id: check-translations-changes
+#        uses: tj-actions/changed-files@v45
+#        with:
+#          files: |
+#            androidApp/src/main/res/values/strings.xml
+#      - name: upload translation sources
+#        if: steps.check-api-changes.outputs.any_modified == 'true'
+#        uses: crowdin/github-action@v2
+#        with:
+#          config: './.gitea/workflows/assets/crowdin.yml'
+#          upload_sources: true
+#          upload_translations: false
+#          download_translations: false
+#          create_pull_request: false
+#          push_translations: false
+#        env:
+#          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+#          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+#      - name: wait
+#        if: steps.check-api-changes.outputs.any_modified == 'true'
+#        run: sleep 10s
+#      - name: download translations
+#        if: steps.check-api-changes.outputs.any_modified == 'true'
+#        uses: crowdin/github-action@v2
+#        with:
+#          config: './.gitea/workflows/assets/crowdin.yml'
+#          upload_sources: false
+#          upload_translations: false
+#          download_translations: true
+#          create_pull_request: false
+#          push_translations: false
+#        env:
+#          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+#          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+#      - name: Check for uncommitted changes
+#        if: steps.check-api-changes.outputs.any_modified == 'true'
+#        id: check-changes
+#        uses: mskri/check-uncommitted-changes-action@v1.0.1
+#      - name: Commit Changes
+#        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
+#        run: |
+#          git config --global user.email aminecmi+giteadrone@pm.me
+#          git config --global user.name giteadrone
+#          git add ./androidApp/src/main/res/*
+#          git commit -m "translation: translation files"
+#      - name: Push changes
+#        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
+#        uses: appleboy/git-push-action@v1.0.0
+#        with:
+#          author_name: giteadrone
+#          author_email: aminecmi+giteadrone@pm.me
+#          remote: ${{ secrets.REMOTE_URL }}
+#          ssh_key: ${{ secrets.PRIVATE_KEY }}
+#          branch: ${{ github.head_ref || github.ref_name }}
+#  build:
+#    needs: Lint
+#    uses: ./.gitea/workflows/common_build.yml

.gitea/workflows/on_push.yml

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

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

.gitignore

@@ -320,4 +320,9 @@ fabric.properties
 # End of https://www.toptal.com/developers/gitignore/api/gradle,kotlin,androidstudio,android,xcode,swift
 
 
-crowdin.properties
+crowdin.properties
+
+.kotlin/
+build-cache/
+
+act

CHANGELOG.md

@@ -1,3 +1,444 @@
+**v125030711
+
+- Merge pull request 'fix: initial status loading issues.' (#192) from connectivity into master
+- chore: check changes for translations and android.
+- fix: initial status loading issues.
+- Merge pull request 'chore: new connectivity dep. Closes #84.' (#189) from connectivity into master
+- chore: new connectivity dep. Closes #84.
+- Changelog for v125030681
+
+--------------------------------------------------------------------
+
+**v125030681
+
+- chore: do not send reports on simulators.
+- Merge pull request 'chore: do not send reports on simulators.' (#188) from chore-acra-simulator into master
+- chore: do not send reports on simulators.
+- Merge pull request 'fix: Url validation was not failing login. Added tests.' (#186) from fix-invalid-url into master
+- Merge pull request 'chore: crowding ci integration.' (#187) from chore-crowdin-ci into master
+- chore: we don't need to check if the url is valid in upsert screen.
+- fix: Url validation was not failing login. Added tests.
+- chore: crowding ci integration.
+- Show a confirmation dialog before deleting sources (#185)
+- Changelog for v125020581
+
+--------------------------------------------------------------------
+
+**v125020581
+
+- fix: url can be empty ?
+- Changelog for v125020471
+
+--------------------------------------------------------------------
+
+**v125020471
+
+- chore: no more docker-compose.
+- bump: gradle plugin.
+- Merge pull request 'fix: check index exists.' (#183) from fix-index into master
+- fix: check index exists.
+- Changelog for v125020411
+
+--------------------------------------------------------------------
+
+**v125020411
+
+- Merge pull request 'bump' (#182) from bump into master
+- chore: non transiant R classes.
+- Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master
+- bump
+- fix: One more missing context.
+
+--------------------------------------------------------------------
+
+**v125010241
+
+- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
+- refactor: context fragments issues.
+- logs: Context issues.
+- fix: Handle empty url issue, again.
+- fix: Link not opening.
+- Changelog for v125010201
+
+--------------------------------------------------------------------
+
+**v125010201
+
+- fix: Handle empty url issue.
+- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
+- chore: changing actions in reader fragment.
+- Changelog for v125010131
+
+--------------------------------------------------------------------
+
+**v125010131
+
+- fix: reload the adapter when it's needed. Fixes #128. (#176)
+- feat: basic auth and images loading. Fixes #172. (#175)
+- Changelog for v125010111
+
+--------------------------------------------------------------------
+
+**v125010111
+
+- Debug trying to fix context issues. (#174)
+- Changelog for v125010031
+
+--------------------------------------------------------------------
+
+**v125010031
+
+- Merge pull request 'Bump dependencies' (#173) from upgarde into master
+- chore: "faster" action.
+- fastlane: icon change.
+- chore: ignoring a pixel issue.
+- test: fixed an ui test issue.
+- fix: center the loading thing.
+- test: items displaying.
+- bump: sqldelight.
+- bump: material, desugar jdk, jsoup, kodein, settings, napier, mock.
+- bump: androix and coroutines.
+- bump: ktor. Closes #67.
+- Changelog for v124123651
+
+--------------------------------------------------------------------
+
+**v124123651
+
+- Merge pull request 'Bugfixes' (#171) from bugfixes into master
+- config: crowdin
+- chore: can links be empty ?
+- fix: Context issues in article fragment.
+- fix: Context issues in fragment sheet.
+- fix: build.
+- chore: compile issue fix.
+- chore: filter some bugs.
+- bugfix: catch users using something other than selfoss.
+- bugfix: No browser, no link.
+- translations
+- chore: remove log.
+- translation
+- Changelog for v124123641
+
+--------------------------------------------------------------------
+
+**v124123641
+
+- Chore: no tests on build.
+- Merge pull request 'testing' (#170) from testing into master
+- fix: Displaying fixes. Fixes #155
+- test: coverage
+- chore: update and use multiplatform datetime
+- Changelog for v124123421
+
+--------------------------------------------------------------------
+
+**v124123421
+
+- fix: Trying to fix the serialization issue.
+- Changelog for v124113311
+
+--------------------------------------------------------------------
+
+**v124113311
+
+- chore: update versions. (#165)
+- chore: fastlane changelog.
+- chore: fastlane fixes.
+- Changelog for v124113301
+
+--------------------------------------------------------------------
+
+**v124113301**
+
+- chore: Gitea Action
+- Merge pull request 'chore: Gitea Action' (#164) from runner into master
+- chore: Gitea Action
+- chore: Readme update.
+
+--------------------------------------------------------------------
+
+**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
+# 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)
 
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
@@ -10,10 +10,6 @@ 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>
@@ -22,15 +18,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-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
+2. Check the [Contribution guide](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
 
-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)
+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)
 
 ## Useful links
 
-- [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
-- [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-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
+- [Check what changed](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
+- [See what I'm doing](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
+- [Create an issue, or request a new feature](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
 
 ## Contributors (V1) (Alphabetical order) ❤️

androidApp/.gitignore

@@ -1 +1,2 @@
 /build
+.kotlin/

androidApp/build.gradle.kts

@@ -1,36 +1,49 @@
 import java.io.ByteArrayOutputStream
 
 val ignoreGitVersion: String by project
+val acraVersion = "5.12.0"
 
 plugins {
     id("com.android.application")
     kotlin("android")
     kotlin("kapt")
+    id("com.mikepenz.aboutlibraries.plugin")
+    id("org.jetbrains.kotlinx.kover")
+    id("app.cash.sqldelight") version "2.0.2"
 }
 
-fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
-    var result: String = ByteArrayOutputStream().use { outputStream ->
-        project.exec {
-            commandLine = cmd.split(" ")
-            standardOutput = outputStream
-            isIgnoreExitValue = ignore ?: false
+fun Project.execWithOutput(
+    cmd: String,
+    ignore: Boolean = false,
+): String {
+    val result: String =
+        ByteArrayOutputStream().use { outputStream ->
+            project.exec {
+                commandLine = cmd.split(" ")
+                standardOutput = outputStream
+                isIgnoreExitValue = ignore
+            }
+            outputStream.toString()
         }
-        outputStream.toString()
-    }
     return result
 }
 
 fun gitVersion(): String {
-    var process = ""
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    process = if (maybeTagOfCurrentCommit.isEmpty()) {
-        println("No tag on current commit. Will take the latest one.")
-        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
-    } else {
-        println("Tag found on current commit")
-        execWithOutput("git -C ../ describe --contains HEAD")
-    }
-    return process.replace("'", "").substring(1).replace("\\.", "").trim()
+    val 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")
+        } else {
+            println("Tag found on current commit")
+            execWithOutput("git -C ../ describe --contains HEAD")
+        }
+    return process
+        .replace("^0", "")
+        .replace("'", "")
+        .substring(1)
+        .replace("\\.", "")
+        .trim()
 }
 
 fun versionCodeFromGit(): Int {
@@ -53,20 +66,24 @@ fun versionNameFromGit(): String {
 
 android {
     compileOptions {
-        // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        // Flag to enable support for the new language APIs
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    compileSdk = 31
-    buildToolsVersion = "31.0.0"
+
+    // For Kotlin projects
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    compileSdk = 35
     buildFeatures {
         viewBinding = true
     }
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
-        minSdk = 21
-        targetSdk = 31
+        minSdk = 25
+        targetSdk = 34 // 35 when edge-to-edge is handled
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -78,6 +95,13 @@ android {
 
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments["clearPackageData"] = "true"
+        testInstrumentationRunnerArguments["useTestStorageService"] = "true"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
     }
     buildTypes {
         getByName("release") {
@@ -86,9 +110,11 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
-            buildConfigField("String", "LOGIN_URL", properties["appLoginUrl"] as String)
-            buildConfigField("String", "LOGIN_PASSWORD", properties["appLoginPassword"] as String)
-            buildConfigField("String", "LOGIN_USERNAME", properties["appLoginUsername"] as String)
+            isTestCoverageEnabled = true
+            enableAndroidTestCoverage = true
+            installation {
+                installOptions("-g", "-r")
+            }
         }
     }
     flavorDimensions.add("build")
@@ -98,106 +124,159 @@ android {
             dimension = "build"
         }
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
+    namespace = "bou.amine.apps.readerforselfossv2.android"
+    testOptions {
+        animationsDisabled = true
+        execution = "ANDROIDX_TEST_ORCHESTRATOR"
+        unitTests {
+            isIncludeAndroidResources = true
+        }
     }
-
 }
 
 dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+
     implementation(project(":shared"))
-    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
 
-    implementation("androidx.preference:preference-ktx:1.1.1")
+    implementation("androidx.preference:preference-ktx:1.2.1")
 
-    // Testing
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0-alpha02")
-    androidTestImplementation("androidx.test:runner:1.3.1-alpha02")
-    // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestImplementation("androidx.test.espresso:espresso-contrib:3.4.0-alpha02")
-    // Espresso-intents for validation and stubbing of Intents
-    androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0-alpha02")
     implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
 
     // Android Support
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.5.0")
-    implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01")
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("androidx.recyclerview:recyclerview:1.4.0-rc01")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")
-    implementation("androidx.browser:browser:1.4.0")
+    implementation("androidx.vectordrawable:vectordrawable:1.2.0")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.3.0")
-    implementation("androidx.work:work-runtime-ktx:2.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("org.jsoup:jsoup:1.14.3")
+    implementation("androidx.annotation:annotation:1.9.1")
+    implementation("androidx.work:work-runtime-ktx:2.10.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
+    implementation("org.jsoup:jsoup:1.18.3")
 
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
-
-    //multidex
+    // multidex
     implementation("androidx.multidex:multidex:2.0.1")
 
     // About
-    implementation("com.mikepenz:aboutlibraries-core:8.9.4")
-    implementation("com.mikepenz:aboutlibraries:8.9.4")
-    implementation("com.mikepenz:aboutlibraries-definitions:8.9.4")
-
-    // Async
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
-
-    // Retrofit + http logging + okhttp
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.burgstaller:okhttp-digest:2.5")
+    implementation("com.mikepenz:aboutlibraries-core:10.5.1")
+    implementation("com.mikepenz:aboutlibraries:10.5.1")
 
     // Material-ish things
     implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
-    implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")
 
     // glide
-    kapt("com.github.bumptech.glide:compiler:4.11.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.1.1")
-
-    // Drawer
-    implementation("com.mikepenz:materialdrawer:8.4.5")
+    kapt("com.github.bumptech.glide:compiler:4.16.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0")
 
     // Themes
-    implementation("com.52inc:scoops:1.0.0")
-    implementation("com.jaredrummler:colorpicker:1.1.0")
-    implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
+    implementation("com.leinardi.android:speed-dial:3.3.0")
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
-    implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
+    implementation("androidx.viewpager2:viewpager2:1.1.0")
 
-    //Dependency Injection
-    implementation("org.kodein.di:kodein-di:7.14.0")
-    implementation("org.kodein.di:kodein-di-framework-android-x:7.14.0")
-    implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.14.0")
+    // Dependency Injection
+    implementation("org.kodein.di:kodein-di:7.23.1")
+    implementation("org.kodein.di:kodein-di-framework-android-x:7.23.1")
+    implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.23.1")
 
-    //Settings
-    implementation("com.russhwolf:multiplatform-settings-no-arg:0.9")
+    // Settings
+    implementation("com.russhwolf:multiplatform-settings-no-arg:1.3.0")
 
-    //Logging
-    implementation("io.github.aakira:napier:2.6.1")
+    // Logging
+    implementation("io.github.aakira:napier:2.7.1")
 
-    //PhotoView
+    // PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.core:core-ktx:1.15.0")
 
-    // implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
-    // implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
-    // implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
-    // Network information
-     implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
-
     // SQLDELIGHT
-    implementation("com.squareup.sqldelight:android-driver:1.5.3")
-}
+    implementation("app.cash.sqldelight:android-driver:2.0.2")
+
+    // test
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("io.mockk:mockk:1.13.14")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+    androidTestImplementation("androidx.test:runner:1.7.0-alpha01")
+    androidTestImplementation("androidx.test:rules:1.7.0-alpha01")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+    implementation("androidx.test.espresso:espresso-idling-resource:3.6.1")
+    androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
+    androidTestUtil("androidx.test:orchestrator:1.6.0-alpha02")
+    androidTestUtil("androidx.test.services:test-services:1.6.0-alpha02")
+    testImplementation("org.robolectric:robolectric:4.14.1")
+    testImplementation("androidx.test:core-ktx:1.7.0-alpha01")
+    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
+
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-toast:$acraVersion")
+    implementation("com.google.auto.service:auto-service:1.1.1")
+}
+
+tasks.withType<Test> {
+    outputs.upToDateWhen { false }
+    useJUnit()
+    testLogging {
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+        events =
+            setOf(
+                org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
+                org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,
+                org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR,
+            )
+        showStandardStreams = true
+    }
+}
+
+aboutLibraries {
+    offlineMode = true
+    fetchRemoteLicense = false
+    fetchRemoteFunding = false
+    includePlatform = false
+    strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
+    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+    duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
+}
+
+// Screenshot failure handling
+val reportsDirectory = file("$buildDir/reports/androidTests/connected")
+
+val clearScreenshotsTask =
+    tasks.register<Exec>("clearScreenshots") {
+        println("AMINE : clear")
+        commandLine = listOf("adb", "shell", "rm", "-r", "/sdcard/Pictures/selfoss_tests")
+    }
+
+val createScreenshotDirectoryTask =
+    tasks.register<Exec>("createScreenshotDirectory") {
+        println("AMINE : create directory")
+        group = "reporting"
+        commandLine = listOf("adb", "shell", "mkdir", "-p", "/sdcard/Pictures/selfoss_tests")
+    }
+
+val fetchScreenshotsTask =
+    tasks.register<Exec>("fetchScreenshots") {
+        println("AMINE : fetch")
+        group = "reporting"
+        executable(android.adbExecutable.toString())
+        commandLine = listOf("adb", "pull", "/sdcard/Pictures/selfoss_tests/.", reportsDirectory.toString())
+
+        finalizedBy(clearScreenshotsTask)
+        dependsOn(createScreenshotDirectoryTask)
+
+        doFirst {
+            reportsDirectory.mkdirs()
+        }
+    }
+
+tasks.whenTaskAdded {
+    if (this.name == "connectedGithubConfigDebugAndroidTest") {
+        this.finalizedBy(fetchScreenshotsTask)
+    }
+}

androidApp/proguard-rules.pro

@@ -30,15 +30,8 @@
     <fields>;
 }
 
--dontwarn okio.**
--dontwarn retrofit2.Platform$Java8
--keep class retrofit.** { *; }
--keepclasseswithmembers class * {
-    @retrofit.http.* <methods>;
-}
 -keepattributes *Annotation*,Signature
 -keepattributes Exceptions
--dontwarn okio.**
 -dontwarn javax.annotation.Nullable
 -dontwarn javax.annotation.ParametersAreNonnullByDefault
 
@@ -62,6 +55,7 @@
 # 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.
@@ -90,3 +84,14 @@
 # @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
 -keepattributes RuntimeVisibleAnnotations,AnnotationDefault
 
+-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/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt

@@ -0,0 +1,220 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.os.Environment.DIRECTORY_PICTURES
+import android.os.Environment.getExternalStoragePublicDirectory
+import android.util.Log
+import androidx.annotation.ArrayRes
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.action.ViewActions.typeTextIntoFocusedView
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.base.DefaultFailureHandler
+import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.runner.screenshot.BasicScreenCaptureProcessor
+import androidx.test.runner.screenshot.Screenshot
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.Matchers.hasToString
+import org.junit.BeforeClass
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
+import java.io.File
+import java.io.IOException
+import java.util.Locale
+
+fun performLogin(someUrl: String? = null) {
+    onView(withId(R.id.urlView)).perform(click()).perform(
+        typeTextIntoFocusedView(
+            if (!someUrl.isNullOrEmpty()) someUrl else "http://10.0.2.2:8888",
+        ),
+    )
+    onView(withId(R.id.signInButton)).perform(click())
+}
+
+fun loginAndInitHome() {
+    performLogin()
+    onView(withText(R.string.gdpr_dialog_title)).check(matches(isDisplayed()))
+    onView(withText("OK")).perform(click())
+}
+
+fun changeAndCancelSetting(
+    oldValue: String,
+    newValue: String,
+    openSettingItem: () -> Unit,
+) {
+    openSettingItem()
+    onView(
+        withId(android.R.id.edit),
+    ).perform(replaceText(newValue))
+    onView(
+        withId(android.R.id.button2),
+    ).perform(click())
+    openSettingItem()
+    onView(
+        withId(android.R.id.edit),
+    ).check(matches(withText(oldValue)))
+    onView(
+        withText(newValue),
+    ).check(doesNotExist())
+    onView(
+        withId(android.R.id.button2),
+    ).perform(click())
+}
+
+fun changeAndSaveSetting(
+    oldValue: String,
+    newValue: String,
+    openSettingItem: () -> Unit,
+) {
+    openSettingItem()
+    onView(
+        withId(android.R.id.edit),
+    ).perform(replaceText(newValue))
+    onView(
+        withId(android.R.id.button1),
+    ).perform(click())
+    openSettingItem()
+    onView(
+        withId(android.R.id.edit),
+    ).check(matches(withText(newValue)))
+    if (oldValue.isNotEmpty()) {
+        onView(
+            withText(oldValue),
+        ).check(doesNotExist())
+    }
+    onView(
+        withId(android.R.id.button2),
+    ).perform(click())
+}
+
+fun testPreferencesFromArray(
+    context: Context,
+    @ArrayRes arrayRes: Int,
+    openSettingItem: () -> Unit,
+) {
+    openSettingItem()
+    context.resources.getStringArray(arrayRes).forEach { res ->
+        onView(withText(res)).check(matches(allOf(isDisplayed(), isNotChecked())))
+        onView(withText(res)).perform(click())
+        onView(withText(res)).check(doesNotExist())
+        openSettingItem()
+        onView(withText(res)).check(matches(allOf(isDisplayed(), isChecked())))
+    }
+}
+
+fun testAddSourceWithUrl(
+    url: String,
+    sourceName: String,
+) {
+    onView(withId(R.id.fab))
+        .perform(click())
+    onView(withId(R.id.nameInput))
+        .perform(click())
+        .perform(typeTextIntoFocusedView(sourceName))
+    onView(withId(R.id.sourceUri))
+        .perform(click())
+        .perform(typeTextIntoFocusedView(url))
+    onView(withId(R.id.tags))
+        .perform(click())
+        .perform(typeTextIntoFocusedView("tag1,tag2,tag3"))
+    onView(withId(R.id.spoutsSpinner))
+        .perform(click())
+    onData(hasToString("RSS Feed")).perform(click())
+    onView(withId(R.id.saveBtn))
+        .perform(click())
+    onView(withText(sourceName)).check(matches(isDisplayed()))
+}
+
+open class WithANRException {
+    companion object {
+        // Running count of the number of Android Not Responding dialogues to prevent endless dismissal.
+        private var anrCount = 0
+
+        // `RootViewWithoutFocusException` class is private, need to match the message (instead of using type matching).
+        private val rootViewWithoutFocusExceptionMsg =
+            java.lang.String.format(
+                Locale.ROOT,
+                "Waited for the root of the view hierarchy to have " +
+                    "window focus and not request layout for 10 seconds. If you specified a non " +
+                    "default root matcher, it may be picking a root that never takes focus. " +
+                    "Root:",
+            )
+
+        private fun handleAnrDialogue() {
+            val device = UiDevice.getInstance(getInstrumentation())
+            // If running the device in English Locale
+            val waitButton = device.findObject(UiSelector().textContains("wait"))
+            if (waitButton.exists()) waitButton.click()
+        }
+
+        @JvmStatic
+        @BeforeClass
+        fun setUpHandler() {
+            Espresso.setFailureHandler { error, viewMatcher ->
+
+                if (error.message!!.contains(rootViewWithoutFocusExceptionMsg) && anrCount < 3) {
+                    anrCount++
+                    handleAnrDialogue()
+                } else { // chain all failures down to the default espresso handler
+                    DefaultFailureHandler(getInstrumentation().targetContext).handle(error, viewMatcher)
+                }
+            }
+        }
+    }
+}
+
+class MyScreenCaptureProcessor(
+    parentFolderPath: String,
+) : BasicScreenCaptureProcessor() {
+    init {
+        this.mDefaultScreenshotPath =
+            File(
+                File(
+                    getExternalStoragePublicDirectory(DIRECTORY_PICTURES),
+                    "selfoss_tests",
+                ).absolutePath,
+                "screenshots/$parentFolderPath",
+            )
+    }
+
+    override fun getFilename(prefix: String): String = prefix
+}
+
+fun takeScreenshot(
+    parentFolderPath: String = "",
+    screenShotName: String,
+) {
+    Log.d("Screenshots", "Taking screenshot of '$screenShotName'")
+    val screenCapture = Screenshot.capture()
+    val processors = setOf(MyScreenCaptureProcessor(parentFolderPath))
+    try {
+        screenCapture.apply {
+            name = screenShotName
+            process(processors)
+        }
+        Log.d("Screenshots", "Screenshot taken")
+    } catch (ex: IOException) {
+        Log.e("Screenshots", "Could not take the screenshot", ex)
+    }
+}
+
+class ScreenshotTakingRule : TestWatcher() {
+    override fun failed(
+        e: Throwable?,
+        description: Description,
+    ) {
+        val parentFolderPath = "failures/${description.className}"
+        takeScreenshot(parentFolderPath = parentFolderPath, screenShotName = description.methodName)
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/Helpers.kt

@@ -0,0 +1,110 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.view.View
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.core.graphics.drawable.toBitmap
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.Root
+import androidx.test.espresso.matcher.RootMatchers.isPlatformPopup
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
+import androidx.test.espresso.matcher.ViewMatchers.withChild
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withParent
+import androidx.test.espresso.matcher.ViewMatchers.withResourceName
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers
+import org.hamcrest.TypeSafeMatcher
+
+fun withError(
+    @StringRes id: Int,
+): TypeSafeMatcher<View?> {
+    return object : TypeSafeMatcher<View?>() {
+        override fun matchesSafely(view: View?): Boolean {
+            if (view != null && (view !is EditText || view.error == null)) {
+                return false
+            }
+            val context = view!!.context
+
+            return (view as EditText).error.toString() == context.getString(id)
+        }
+
+        override fun describeTo(description: Description?) {
+            // Nothing
+        }
+    }
+}
+
+fun isPopupWindow(): Matcher<Root> = isPlatformPopup()
+
+fun withDrawable(
+    @DrawableRes id: Int,
+) = object : TypeSafeMatcher<View>() {
+    override fun describeTo(description: Description) {
+        description.appendText("ImageView with drawable same as drawable with id $id")
+    }
+
+    @Suppress("detekt:SwallowedException")
+    override fun matchesSafely(view: View): Boolean {
+        val context = view.context
+        val expectedBitmap = context.getDrawable(id)!!.toBitmap()
+        try {
+            return view is ImageView && view.drawable.toBitmap().sameAs(expectedBitmap)
+        } catch (e: Exception) {
+            return false
+        }
+    }
+}
+
+fun hasBottombarItemText(
+    @StringRes id: Int,
+): Matcher<View>? =
+    allOf(
+        withResourceName("fixed_bottom_navigation_icon"),
+        withParent(
+            allOf(
+                withResourceName("fixed_bottom_navigation_icon_container"),
+                hasSibling(withText(id)),
+            ),
+        ),
+    )
+
+fun withSettingsCheckboxWidget(
+    @StringRes id: Int,
+): Matcher<View>? =
+    allOf(
+        withId(android.R.id.switch_widget),
+        withParent(
+            withSettingsCheckboxFrame(id),
+        ),
+    )
+
+fun withSettingsCheckboxFrame(
+    @StringRes id: Int,
+): Matcher<View>? =
+    allOf(
+        withId(android.R.id.widget_frame),
+        hasSibling(
+            allOf(
+                withClassName(Matchers.equalTo(RelativeLayout::class.java.name)),
+                withChild(
+                    withText(id),
+                ),
+            ),
+        ),
+    )
+
+fun openMenu() {
+    openActionBarOverflowOrOptionsMenu(
+        ApplicationProvider.getApplicationContext<Context>(),
+    )
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt

@@ -0,0 +1,126 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isClickable
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isFocused
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.isSelected
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class HomeActivityTest : WithANRException() {
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
+    @Before
+    fun init() {
+        loginAndInitHome()
+    }
+
+    @Test
+    fun testMenu() {
+        onView(withId(R.id.action_search)).check(matches(not(isDisplayed()))).check(
+            matches(
+                isClickable(),
+            ),
+        )
+        onView(withId(R.id.action_filter)).check(matches(isDisplayed())).check(
+            matches(
+                isClickable(),
+            ),
+        )
+        openMenu()
+        onView(withText(R.string.readAll)).check(matches(isDisplayed()))
+        onView(withText(R.string.menu_home_sources)).check(matches(isDisplayed()))
+        onView(withText(R.string.title_activity_settings)).check(matches(isDisplayed()))
+        onView(withText(R.string.menu_home_refresh)).check(matches(isDisplayed()))
+        onView(withText(R.string.issue_tracker_link)).check(matches(isDisplayed()))
+        onView(withText(R.string.action_disconnect)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun testMenuActions() {
+        onView(withId(R.id.action_search)).perform(click())
+        onView(
+            withId(com.google.android.material.R.id.search_src_text),
+        ).check(matches(isFocused()))
+        onView(isRoot()).perform(ViewActions.pressBack())
+
+        onView(withId(R.id.action_filter)).perform(click())
+        onView(
+            withText(R.string.filter_item_sources),
+        ).check(matches(isDisplayed()))
+        onView(
+            withText(R.string.filter_item_tags),
+        ).check(matches(isDisplayed()))
+        onView(
+            withId(R.id.floatingActionButton2),
+        ).check(matches(isDisplayed()))
+        onView(isRoot()).perform(ViewActions.pressBack())
+
+        openMenu()
+        onView(withText(R.string.readAll)).perform(click())
+        onView(withText(R.string.markall_dialog_message)).check(matches(isDisplayed()))
+        onView(isRoot()).perform(ViewActions.pressBack())
+        openMenu()
+
+        onView(withText(R.string.menu_home_sources)).perform(click())
+        onView(withId(R.id.fab)).check(matches(isDisplayed()))
+        onView(isRoot()).perform(ViewActions.pressBack())
+        openMenu()
+
+        onView(withText(R.string.title_activity_settings)).perform(click())
+        onView(withText(R.string.pref_header_general)).check(matches(isDisplayed()))
+        onView(isRoot()).perform(ViewActions.pressBack())
+        openMenu()
+
+        onView(withText(R.string.menu_home_refresh)).perform(click())
+        onView(withText(R.string.refresh_dialog_message)).check(matches(isDisplayed()))
+        onView(isRoot()).perform(ViewActions.pressBack())
+        openMenu()
+
+        /*onView(withText(R.string.issue_tracker_link)).perform(click())
+        onView(withText(R.string.markall_dialog_message)).check(matches(isDisplayed()))
+        onView(isRoot()).perform(ViewActions.pressBack())
+        openMenu()*/
+
+        onView(withText(R.string.action_disconnect)).perform(click())
+        onView(withText(R.string.confirm_disconnect_title)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun testEmptyView() {
+        onView(withId(R.id.emptyText)).check(matches(isDisplayed()))
+        onView(
+            hasBottombarItemText(R.string.tab_new),
+        ).check(matches(isDisplayed())).check(matches(isSelected()))
+        onView(
+            hasBottombarItemText(R.string.tab_read),
+        ).check(matches(isDisplayed())).check(matches(not(isSelected())))
+        onView(
+            hasBottombarItemText(R.string.tab_favs),
+        ).check(matches(isDisplayed())).check(matches(not(isSelected())))
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/LoginActivityTest.kt

@@ -0,0 +1,101 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isClickable
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class LoginActivityTest : WithANRException() {
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
+    @Before
+    fun registerIdlingResource() {
+        IdlingRegistry
+            .getInstance()
+            .register(CountingIdlingResourceSingleton.countingIdlingResource)
+    }
+
+    @After
+    fun unregisterIdlingResource() {
+        IdlingRegistry
+            .getInstance()
+            .unregister(CountingIdlingResourceSingleton.countingIdlingResource)
+    }
+
+    @Test
+    fun viewIsInitialized() {
+        onView(withId(R.id.urlView)).check(matches(isDisplayed()))
+        onView(withId(R.id.selfSigned))
+            .check(matches(isDisplayed()))
+            .check(matches(isNotChecked()))
+            .check(
+                matches(isClickable()),
+            )
+        onView(withId(R.id.withLogin))
+            .check(matches(isDisplayed()))
+            .check(matches(isNotChecked()))
+            .check(
+                matches(isClickable()),
+            )
+    }
+
+    @Test
+    fun urlError() {
+        performLogin("10.0.2.2:8888")
+        onView(withId(R.id.urlView)).perform(click())
+        onView(withId(R.id.urlView)).check(matches(withError(R.string.login_url_problem)))
+    }
+
+    @Test
+    fun connectError() {
+        performLogin("http://10.0.2.2:8889")
+        onView(withId(R.id.urlView)).perform(click())
+        onView(withId(R.id.urlView)).check(matches(withError(R.string.wrong_infos)))
+    }
+
+    @Test
+    fun urlSlashError() {
+        performLogin("https://google.fr/toto")
+        onView(withId(R.id.urlView)).perform(click())
+        onView(withId(R.id.urlView)).check(matches(withError(R.string.login_url_problem)))
+    }
+
+    @Test
+    fun multiError() {
+        onView(withId(R.id.signInButton)).perform(click())
+        onView(withId(R.id.signInButton)).perform(click())
+        onView(withId(R.id.signInButton)).perform(click())
+        onView(withText(R.string.warning_wrong_url)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun connect() {
+        performLogin()
+        onView(withText(R.string.gdpr_dialog_title)).check(matches(isDisplayed()))
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityGeneralTest.kt

@@ -0,0 +1,163 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.action.ViewActions.swipeUp
+import androidx.test.espresso.action.ViewActions.typeTextIntoFocusedView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
+import androidx.test.espresso.matcher.ViewMatchers.isFocused
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class SettingsActivityGeneralTest : WithANRException() {
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
+    @Before
+    fun init() {
+        loginAndInitHome()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext(),
+        )
+        onView(withText(R.string.title_activity_settings)).perform(click())
+        onView(withText(R.string.pref_header_general)).perform(click())
+    }
+
+    @Suppress("detekt:LongMethod")
+    @Test
+    fun testGeneral() {
+        onView(withText(R.string.pref_api_items_number_title)).check(matches(isDisplayed()))
+        onView(
+            withSettingsCheckboxWidget(R.string.pref_general_infinite_loading_title),
+        ).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+        onView(withText(R.string.pref_general_category_links)).check(matches(isDisplayed()))
+        onView(withSettingsCheckboxWidget(R.string.pref_article_viewer_title)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    isChecked(),
+                ),
+            ),
+        )
+        onView(withText(R.string.pref_general_category_displaying)).check(matches(isDisplayed()))
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_card_view_title)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+        onView(withSettingsCheckboxWidget(R.string.card_height_title)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(
+            matches(
+                not(isEnabled()),
+            ),
+        )
+        onView(withSettingsCheckboxWidget(R.string.switch_unread_count_title)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    isChecked(),
+                ),
+            ),
+        )
+        onView(withId(R.id.settings)).perform(swipeUp())
+        onView(withSettingsCheckboxWidget(R.string.display_all_counts_title)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+    }
+
+    @Suppress("detekt:ForbiddenComment")
+    @Test
+    fun testGeneralActionsNumberItems() {
+        onView(withText(R.string.pref_api_items_number_title)).perform(click())
+        onView(withId(android.R.id.edit)).check(matches(isFocused()))
+
+        // Value check
+        onView(
+            withId(android.R.id.edit),
+        ).perform(replaceText("AVC"))
+            .check(matches(withText("")))
+        // TODO: should check message error. Not working for api level 30+
+        onView(
+            withId(android.R.id.edit),
+        ).perform(replaceText("-1"))
+            .check(matches(withText("")))
+        // TODO: should check message error. Not working for api level 30+
+        onView(
+            withId(android.R.id.edit),
+        ).perform(replaceText("300"))
+            .check(matches(withText("")))
+        onView(
+            withId(android.R.id.edit),
+        ).perform(typeTextIntoFocusedView("300"))
+            .check(matches(withText("30")))
+        onView(
+            withId(android.R.id.edit),
+        ).perform(replaceText("10"))
+            .check(matches(withText("10")))
+        onView(isRoot()).perform(ViewActions.pressBack())
+
+        // Value saving
+        changeAndCancelSetting("20", "10") {
+            onView(withText(R.string.pref_api_items_number_title)).perform(click())
+        }
+        changeAndSaveSetting("20", "10") {
+            onView(withText(R.string.pref_api_items_number_title)).perform(click())
+        }
+    }
+
+    @Test
+    fun testGeneralActionsCheckboxes() {
+        onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(matches(not(isEnabled())))
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_card_view_title)).perform(click())
+        onView(withSettingsCheckboxFrame(R.string.card_height_title)).check(matches(isEnabled()))
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityOfflineTest.kt

@@ -0,0 +1,182 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
+import androidx.test.espresso.matcher.ViewMatchers.isNotEnabled
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class SettingsActivityOfflineTest : WithANRException() {
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
+    lateinit var context: Context
+
+    @Before
+    fun init() {
+        activityRule.scenario.onActivity { activity ->
+            context = activity.window.context
+        }
+        loginAndInitHome()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext(),
+        )
+        onView(withText(R.string.title_activity_settings)).perform(click())
+        onView(withText(R.string.pref_header_offline)).perform(click())
+    }
+
+    @Suppress("detekt:LongMethod")
+    @Test
+    fun testOffline() {
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_periodic_refresh)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_items_caching)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_items_caching)).check(
+            matches(
+                isEnabled(),
+            ),
+        )
+        onView(withText(R.string.pref_periodic_refresh_minutes_title)).check(
+            matches(
+                allOf(isNotEnabled(), isDisplayed()),
+            ),
+        )
+
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_refresh_when_charging)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_refresh_when_charging)).check(
+            matches(
+                isNotEnabled(),
+            ),
+        )
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_notify_new_items)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isChecked()),
+                ),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_notify_new_items)).check(
+            matches(
+                isNotEnabled(),
+            ),
+        )
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_update_sources)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    isChecked(),
+                ),
+            ),
+        )
+    }
+
+    @Suppress("detekt:LongMethod")
+    @Test
+    fun testOfflineActions() {
+        onView(withText(R.string.pref_switch_items_caching_off)).check(matches(isDisplayed()))
+        onView(withText(R.string.pref_switch_items_caching)).perform(click())
+        onView(withText(R.string.pref_switch_items_caching_on)).check(matches(isDisplayed()))
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_items_caching)).check(
+            matches(
+                isEnabled(),
+            ),
+        )
+        onView(withText(R.string.pref_periodic_refresh_minutes_title)).check(
+            matches(
+                isNotEnabled(),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_refresh_when_charging)).check(
+            matches(
+                isNotEnabled(),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_notify_new_items)).check(
+            matches(
+                isNotEnabled(),
+            ),
+        )
+
+        onView(withText(R.string.pref_switch_periodic_refresh_off)).check(
+            matches(
+                isDisplayed(),
+            ),
+        )
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_periodic_refresh)).perform(click())
+        onView(withText(R.string.pref_switch_periodic_refresh_on)).check(
+            matches(
+                isDisplayed(),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_periodic_refresh_minutes_title)).check(
+            matches(
+                isEnabled(),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_refresh_when_charging)).check(
+            matches(
+                isEnabled(),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_notify_new_items)).check(
+            matches(
+                isEnabled(),
+            ),
+        )
+        changeAndCancelSetting("360", "123") {
+            onView(withText(R.string.pref_periodic_refresh_minutes_title)).perform(click())
+        }
+        changeAndSaveSetting("360", "123") {
+            onView(withText(R.string.pref_periodic_refresh_minutes_title)).perform(click())
+        }
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_refresh_when_charging)).perform(click())
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_notify_new_items)).perform(click())
+        onView(withSettingsCheckboxWidget(R.string.pref_switch_update_sources)).perform(click())
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityReaderTest.kt

@@ -0,0 +1,93 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class SettingsActivityReaderTest : WithANRException() {
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
+    lateinit var context: Context
+
+    @Before
+    fun init() {
+        activityRule.scenario.onActivity { activity ->
+            context = activity.window.context
+        }
+        loginAndInitHome()
+        openActionBarOverflowOrOptionsMenu(
+            ApplicationProvider.getApplicationContext(),
+        )
+        onView(withText(R.string.title_activity_settings)).perform(click())
+        onView(withText(R.string.pref_header_viewer)).perform(click())
+    }
+
+    @Test
+    fun testReader() {
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_actions_pager_scroll)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(
+                        isChecked(),
+                    ),
+                ),
+            ),
+        )
+        onView(withText(R.string.pref_content_reader_font_size)).check(matches(isDisplayed()))
+        onView(withText(R.string.settings_reader_font)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun testReaderActions() {
+        onView(withText(R.string.pref_switch_actions_pager_scroll_off)).check(
+            matches(
+                isDisplayed(),
+            ),
+        )
+        onView(withSettingsCheckboxFrame(R.string.pref_switch_actions_pager_scroll)).perform(click())
+        onView(withText(R.string.pref_switch_actions_pager_scroll_on)).check(
+            matches(
+                isDisplayed(),
+            ),
+        )
+
+        onView(withText(R.string.pref_content_reader_font_size)).perform(click())
+        changeAndCancelSetting("16", "10") {
+            onView(withText(R.string.pref_content_reader_font_size)).perform(click())
+        }
+        changeAndSaveSetting("16", "10") {
+            onView(withText(R.string.pref_content_reader_font_size)).perform(click())
+        }
+
+        testPreferencesFromArray(context, R.array.preloaded_fonts_values) {
+            onView(withText(R.string.settings_reader_font)).perform(click())
+        }
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SettingsActivityTest.kt

@@ -0,0 +1,101 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isSelected
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class SettingsActivityTest : WithANRException() {
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
+    lateinit var context: Context
+
+    @Before
+    fun init() {
+        activityRule.scenario.onActivity { activity ->
+            context = activity.window.context
+        }
+        loginAndInitHome()
+        openMenu()
+        onView(withText(R.string.title_activity_settings)).perform(click())
+    }
+
+    @Test
+    fun testAllSettings() {
+        onView(withText(R.string.pref_header_general)).check(matches(isDisplayed()))
+        onView(withText(R.string.pref_header_viewer)).check(matches(isDisplayed()))
+        onView(withText(R.string.pref_header_offline)).check(matches(isDisplayed()))
+        onView(withText(R.string.pref_header_theme)).check(matches(isDisplayed()))
+        onView(withText(R.string.pref_header_links)).check(matches(isDisplayed()))
+        onView(withText(R.string.pref_switch_disable_acra)).check(
+            matches(
+                allOf(
+                    isDisplayed(),
+                    not(isSelected()),
+                ),
+            ),
+        )
+        onView(withText(R.string.action_about)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun testThemes() {
+        testPreferencesFromArray(context, R.array.ModeTitles) {
+            onView(withText(R.string.pref_header_theme)).perform(click())
+        }
+    }
+
+    @Test
+    fun testExperimentail() {
+        onView(withText(R.string.pref_header_experimental)).perform(click())
+        changeAndCancelSetting("", "10") {
+            onView(withText(R.string.pref_api_timeout)).perform(click())
+        }
+        changeAndSaveSetting("", "10") {
+            onView(withText(R.string.pref_api_timeout)).perform(click())
+        }
+    }
+
+    @Test
+    fun testBugReports() {
+        onView(withText(R.string.pref_switch_disable_acra)).perform(click())
+    }
+
+    @Test
+    fun testLinks() {
+        onView(withText(R.string.pref_header_links)).perform(click())
+        onView(withText(R.string.issue_tracker_link)).check(matches(isDisplayed()))
+        onView(withText(R.string.issue_tracker_summary)).check(matches(isDisplayed()))
+        onView(withText(R.string.source_code)).check(matches(isDisplayed()))
+        onView(withText(R.string.translation)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun testAbout() {
+        onView(withText(R.string.action_about)).perform(click())
+        onView(withText("ACRA")).check(matches(isDisplayed()))
+    }
+}

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/SourcesActivityTest.kt

@@ -0,0 +1,92 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import androidx.test.espresso.AmbiguousViewMatcherException
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.swipeDown
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+import java.util.UUID
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class SourcesActivityTest : WithANRException() {
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
+
+    @JvmField
+    @Rule
+    val ruleChain: RuleChain =
+        RuleChain
+            .outerRule(activityRule)
+            .around(ScreenshotTakingRule())
+
+    lateinit var sourceName: String
+
+    @Before
+    fun init() {
+        sourceName = UUID.randomUUID().toString().substring(0, 15)
+
+        loginAndInitHome()
+        goToSources()
+    }
+
+    @Test
+    fun addSource() {
+        testAddSourceWithUrl(
+            "https://lorem-rss.herokuapp.com/feed?unit=year&interval=1&length=10",
+            sourceName,
+        )
+    }
+
+    @Suppress("detekt:SwallowedException")
+    @Test
+    fun addSourceCheckContent() {
+        testAddSourceWithUrl("https://news.google.com/rss?hl=en-US&gl=US&ceid=US:en", sourceName)
+        onView(isRoot()).perform(ViewActions.pressBack())
+        openMenu()
+        onView(withText(R.string.menu_home_refresh)).perform(click())
+        onView(withText(R.string.refresh_dialog_message)).check(matches(isDisplayed()))
+        onView(
+            withId(android.R.id.button1),
+        ).perform(click())
+        Thread.sleep(10000)
+        onView(withId(R.id.swipeRefreshLayout)).perform(swipeDown())
+        Thread.sleep(2000)
+        try {
+            onView(withId(R.id.sourceTitleAndDate)).check(matches(isDisplayed()))
+        } catch (e: AmbiguousViewMatcherException) {
+            assert(true)
+        }
+        goToSources()
+    }
+
+    @After
+    fun deleteTheCreatedSource() {
+        onView(withText(sourceName)).check(matches(isDisplayed()))
+        onView(withId(R.id.deleteBtn)).perform(click())
+        onView(withText(R.string.confirm_delete_title)).check(matches(isDisplayed()))
+        onView(withId(android.R.id.button1)).perform(click())
+        onView(withText(sourceName)).check(doesNotExist())
+    }
+
+    private fun goToSources() {
+        openMenu()
+        onView(withText(R.string.menu_home_sources))
+            .perform(click())
+    }
+}

androidApp/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="bou.amine.apps.readerforselfossv2.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" />
 
@@ -16,7 +16,8 @@
         android:supportsRtl="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/NoBar"
-        android:dataExtractionRules="@xml/data_extraction_rules">
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:configChanges="uiMode">
         <activity
             android:name=".MainActivity"
             android:theme="@style/SplashTheme"
@@ -52,7 +53,7 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity
-            android:name=".AddSourceActivity"
+            android:name=".UpsertSourceActivity"
             android:parentActivityName=".SourcesActivity"
             android:exported="true">
             <meta-data
@@ -69,7 +70,8 @@
             android:name=".ReaderActivity">
         </activity>
         <activity
-            android:name=".ImageActivity">
+            android:name=".ImageActivity"
+            android:theme="@style/Theme.AppCompat.ImageActivity">
         </activity>
 
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"
@@ -79,8 +81,5 @@
             android:value="true" />
 
         <meta-data android:name="android.max_aspect" android:value="2.1" />
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
     </application>
 </manifest>

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

@@ -1,201 +0,0 @@
-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.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
-import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
-import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
-import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.ftinc.scoop.Scoop
-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 appColors: AppColors
-    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?) {
-        appColors = AppColors(this@AddSourceActivity)
-
-        super.onCreate(savedInstanceState)
-        binding = ActivityAddSourceBinding.inflate(layoutInflater)
-        val view = binding.root
-
-        setContentView(view)
-
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
-        val drawable = binding.nameInput.background
-        drawable.setTint(appColors.colorAccent)
-
-
-        // TODO: clean
-        binding.nameInput.background = drawable
-
-        val drawable1 = binding.sourceUri.background
-        drawable1.setTint(appColors.colorAccent)
-
-        binding.sourceUri.background = drawable1
-
-        val drawable2 = binding.tags.background
-        drawable2.setTint(appColors.colorAccent)
-
-        binding.tags.background = drawable2
-
-        setSupportActionBar(binding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
-
-        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
-
-        binding.saveBtn.setTextColor(appColors.colorAccent)
-
-        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.isBaseUrlValid(this@AddSourceActivity)) {
-            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 != null) {
-                    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/ImageActivity.kt

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

@@ -2,7 +2,9 @@ package bou.amine.apps.readerforselfossv2.android
 
 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
@@ -10,37 +12,43 @@ 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
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityLoginBinding
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
+import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
+import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 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
 
-class LoginActivity : AppCompatActivity(), DIAware {
+private const val MAX_INVALID_LOGIN_BEFORE_ALERT_DISPLAYED = 3
 
+class LoginActivity :
+    AppCompatActivity(),
+    DIAware {
     private var inValidCount: Int = 0
     private var isWithLogin = false
 
-    private lateinit var appColors: AppColors
     private lateinit var binding: ActivityLoginBinding
 
     override val di by closestDI()
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(this@LoginActivity)
-
         super.onCreate(savedInstanceState)
+
+        handleTheme()
+
         binding = ActivityLoginBinding.inflate(layoutInflater)
         val view = binding.root
 
@@ -51,14 +59,19 @@ class LoginActivity : AppCompatActivity(), DIAware {
         handleBaseUrlFail()
 
         if (appSettingsService.getBaseUrl().isNotEmpty()) {
+            showProgress(true)
             goToMain()
         }
 
         handleActions()
     }
 
-    private fun handleActions() {
+    @SuppressLint("WrongConstant") // Constant is fetched from the settings
+    private fun handleTheme() {
+        AppCompatDelegate.setDefaultNightMode(appSettingsService.getCurrentTheme())
+    }
 
+    private fun handleActions() {
         binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
@@ -66,7 +79,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
                     return@OnEditorActionListener true
                 }
                 false
-            }
+            },
         )
 
         binding.signInButton.setOnClickListener { attemptLogin() }
@@ -87,19 +100,28 @@ class LoginActivity : AppCompatActivity(), DIAware {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK"
+                "OK",
             ) { dialog, _ -> dialog.dismiss() }
             alertDialog.show()
         }
     }
 
     private fun goToMain() {
+        CountingIdlingResourceSingleton.increment()
+        CoroutineScope(Dispatchers.Main).launch {
+            repository.updateApiInformation()
+            ACRA.errorReporter.putCustomData(
+                "SELFOSS_API_VERSION",
+                appSettingsService.getApiVersion().toString(),
+            )
+            CountingIdlingResourceSingleton.decrement()
+        }
         val intent = Intent(this, HomeActivity::class.java)
         startActivity(intent)
         finish()
     }
 
-    private fun preferenceError(t: Throwable) {
+    private fun preferenceError() {
         appSettingsService.resetLoginInformation()
 
         binding.urlView.error = getString(R.string.wrong_infos)
@@ -108,71 +130,119 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun attemptLogin() {
-
         // Reset errors.
         binding.urlView.error = null
         binding.loginView.error = null
         binding.passwordView.error = null
 
         // Store values at the time of the login attempt.
-        val url = binding.urlView.text.toString()
-        val login = binding.loginView.text.toString()
-        val password = binding.passwordView.text.toString()
+        val url =
+            binding.urlView.text
+                .toString()
+                .trim()
+        val login =
+            binding.loginView.text
+                .toString()
+                .trim()
+        val password =
+            binding.passwordView.text
+                .toString()
+                .trim()
 
-        var cancel = false
-        var focusView: View? = null
+        val cancelUrl = failInvalidUrl(url)
+        if (cancelUrl) return
+        val cancelDetails = failLoginDetails(password, login)
+        if (cancelDetails) return
+        showProgress(true)
 
-        if (!url.isBaseUrlValid(this@LoginActivity)) {
-            binding.urlView.error = getString(R.string.login_url_problem)
-            focusView = binding.urlView
-            cancel = true
-            inValidCount++
-            if (inValidCount == 3) {
-                val alertDialog = AlertDialog.Builder(this).create()
-                alertDialog.setTitle(getString(R.string.warning_wrong_url))
-                alertDialog.setMessage(getString(R.string.text_wrong_url))
-                alertDialog.setButton(
-                    AlertDialog.BUTTON_NEUTRAL,
-                    "OK"
-                ) { dialog, _ -> dialog.dismiss() }
-                alertDialog.show()
-                inValidCount = 0
+        appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
+
+        repository.refreshLoginInformation(url, login, password)
+
+        CountingIdlingResourceSingleton.increment()
+        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)
+            CountingIdlingResourceSingleton.decrement()
         }
+    }
 
+    private fun failLoginDetails(
+        password: String,
+        login: String,
+    ): Boolean {
+        var lastFocusedView: View? = null
+        var cancel = false
         if (isWithLogin) {
             if (TextUtils.isEmpty(password)) {
                 binding.passwordView.error = getString(R.string.error_invalid_password)
-                focusView = binding.passwordView
+                lastFocusedView = binding.passwordView
                 cancel = true
             }
 
             if (TextUtils.isEmpty(login)) {
                 binding.loginView.error = getString(R.string.error_field_required)
-                focusView = binding.loginView
+                lastFocusedView = binding.loginView
                 cancel = true
             }
         }
+        maybeCancelAndFocusView(cancel, lastFocusedView)
+        return cancel
+    }
 
+    private fun failInvalidUrl(url: String): Boolean {
+        val focusView = binding.urlView
+        var cancel = false
+        if (url.isBaseUrlInvalid()) {
+            cancel = true
+            binding.urlView.error = getString(R.string.login_url_problem)
+            inValidCount++
+            if (inValidCount == MAX_INVALID_LOGIN_BEFORE_ALERT_DISPLAYED) {
+                val alertDialog = AlertDialog.Builder(this).create()
+                alertDialog.setTitle(getString(R.string.warning_wrong_url))
+                alertDialog.setMessage(getString(R.string.text_wrong_url))
+                alertDialog.setButton(
+                    AlertDialog.BUTTON_NEUTRAL,
+                    "OK",
+                ) { dialog, _ -> dialog.dismiss() }
+                alertDialog.show()
+                inValidCount = 0
+            }
+        }
+        maybeCancelAndFocusView(cancel, focusView)
+        return cancel
+    }
+
+    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) {
-                    repository.updateApiVersion()
-                    goToMain()
-                } else {
-                    CoroutineScope(Dispatchers.Main).launch {
-                        preferenceError(Exception("Not success"))
-                    }
-                }
-            }
-            showProgress(false)
         }
     }
 
@@ -184,26 +254,28 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 0F else 1F
-            ).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
-            }
-        }
-        )
+                if (show) 0F else 1F,
+            ).setListener(
+                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
         binding.loginProgress
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 1F else 0F
-            ).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
-            }
-        }
-        )
+                if (show) 1F else 0F,
+            ).setListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                    }
+                },
+            )
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -213,13 +285,25 @@ 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.BUG_URL))
+                startActivity(browserIntent)
+                return true
+            }
+
             R.id.about -> {
                 LibsBuilder()
                     .withAboutIconShown(true)
                     .withAboutVersionShown(true)
+                    .withAboutSpecial2("Bug reports")
+                    .withAboutSpecial2Description(AppSettingsService.BUG_URL)
+                    .withAboutSpecial1("Project Page")
+                    .withAboutSpecial1Description(AppSettingsService.SOURCE_URL)
                     .start(this)
                 true
             }
+
             else -> super.onOptionsItemSelected(item)
         }
     }

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

@@ -8,7 +8,6 @@ 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,82 +3,142 @@ 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
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
-import androidx.preference.PreferenceManager
-import bou.amine.apps.readerforselfossv2.DI.networkModule
-import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
+import bou.amine.apps.readerforselfossv2.android.testing.TestingHelper
 import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
+import bou.amine.apps.readerforselfossv2.di.networkModule
 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.ftinc.scoop.Scoop
-import com.github.ln_12.library.ConnectivityStatus
-import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
-import com.mikepenz.materialdrawer.util.DrawerImageLoader
+import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.kodein.di.*
-
-class MyApp : MultiDexApplication(), DIAware {
+import org.acra.ACRA
+import org.acra.ReportField
+import org.acra.config.httpSender
+import org.acra.config.toast
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.bind
+import org.kodein.di.instance
+import org.kodein.di.singleton
 
+class MyApp :
+    MultiDexApplication(),
+    DIAware {
     override val di by DI.lazy {
+        bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess() || TestingHelper().isUnitTest()) }
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus, instance()) }
-        bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
-        bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
+        bind<ConnectivityService>() with singleton { ConnectivityService() }
+        bind<Repository>() with
+            singleton {
+                Repository(
+                    instance(),
+                    instance(),
+                    instance(),
+                    instance(),
+                )
+            }
     }
 
     private val repository: Repository by instance()
-    private val viewModel: AppViewModel by instance()
-    private val connectivityStatus: ConnectivityStatus by instance()
     private val driverFactory: DriverFactory by instance()
+    private val connectivityService: ConnectivityService by instance()
 
     override fun onCreate() {
         super.onCreate()
         Napier.base(DebugAntilog())
 
-        initDrawerImageLoader()
+        if (!ACRA.isACRASenderServiceProcess()) {
+            tryToHandleBug()
 
-        initTheme()
+            handleNotificationChannels()
 
-        tryToHandleBug()
+            ProcessLifecycleOwner.get().lifecycle.addObserver(
+                AppLifeCycleObserver(
+                    connectivityService,
+                ),
+            )
 
-        handleNotificationChannels()
+            CoroutineScope(Dispatchers.Main).launch {
+                connectivityService.networkAvailableProvider.collect { networkAvailable ->
+                    val toastMessage =
+                        if (networkAvailable) {
+                            repository.handleDBActions()
+                            R.string.network_connectivity_retrieved
+                        } else {
+                            R.string.network_connectivity_lost
+                        }
 
-        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
-
-        CoroutineScope(Dispatchers.Main).launch {
-            viewModel.networkAvailableProvider.collect { networkAvailable ->
-                val toastMessage = if (networkAvailable) {
-                    repository.handleDBActions()
-                    R.string.network_connectivity_retrieved
-                } else {
-                    R.string.network_connectivity_lost
+                    Toast
+                        .makeText(
+                            applicationContext,
+                            toastMessage,
+                            Toast.LENGTH_SHORT,
+                        ).show()
                 }
-
-                Toast.makeText(
-                    applicationContext,
-                    toastMessage,
-                    Toast.LENGTH_SHORT
-                ).show()
             }
         }
 
+        repository.migrate(driverFactory)
+    }
+
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+
+        initAcra {
+            sendReportsInDevMode = false
+            reportFormat = StringFormat.JSON
+            reportContent =
+                listOf(
+                    ReportField.REPORT_ID,
+                    ReportField.INSTALLATION_ID,
+                    ReportField.APP_VERSION_CODE,
+                    ReportField.APP_VERSION_NAME,
+                    ReportField.BUILD,
+                    ReportField.ANDROID_VERSION,
+                    ReportField.BRAND,
+                    ReportField.PHONE_MODEL,
+                    ReportField.AVAILABLE_MEM_SIZE,
+                    ReportField.TOTAL_MEM_SIZE,
+                    ReportField.STACK_TRACE,
+                    ReportField.APPLICATION_LOG,
+                    ReportField.LOGCAT,
+                    ReportField.INITIAL_CONFIGURATION,
+                    ReportField.CRASH_CONFIGURATION,
+                    ReportField.IS_SILENT,
+                    ReportField.USER_APP_START_DATE,
+                    ReportField.USER_COMMENT,
+                    ReportField.USER_CRASH_DATE,
+                    ReportField.USER_EMAIL,
+                    ReportField.CUSTOM_DATA,
+                )
+            toast {
+                // required
+                text = getString(R.string.crash_toast_text)
+                length = Toast.LENGTH_SHORT
+            }
+            httpSender {
+                uri =
+                    "https://bugs.amine-bouabdallaoui.fr/report" // best guess, you may need to adjust this
+                basicAuthLogin = "qMEscjj89Gwt6cPR"
+                basicAuthPassword = "Yo58QFlGzFaWlBzP"
+                httpMethod = HttpSender.Method.POST
+            }
+        }
     }
 
     private fun handleNotificationChannels() {
@@ -87,70 +147,49 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val name = getString(R.string.notification_channel_sync)
             val importance = NotificationManager.IMPORTANCE_LOW
-            val mChannel = NotificationChannel(AppSettingsService.syncChannelId, name, importance)
+            val mChannel = NotificationChannel(AppSettingsService.SYNC_CHANNEL_ID, name, importance)
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel = NotificationChannel(AppSettingsService.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
+            val newItemsChannelmChannel =
+                NotificationChannel(
+                    AppSettingsService.NEW_ITEMS_CHANNEL,
+                    newItemsChannelname,
+                    newItemsChannelimportance,
+                )
 
             notificationManager.createNotificationChannel(mChannel)
             notificationManager.createNotificationChannel(newItemsChannelmChannel)
         }
     }
 
-    private fun initDrawerImageLoader() {
-        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                Glide.with(imageView.context)
-                    .load(uri.toString())
-                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
-                    .into(imageView)
-            }
-
-            override fun cancel(imageView: ImageView) {
-                Glide.with(imageView.context).clear(imageView)
-            }
-
-            override fun placeholder(ctx: Context, tag: String?): Drawable {
-                return baseContext.resources.getDrawable(R.mipmap.ic_launcher)
-            }
-        })
-    }
-
-    private fun initTheme() {
-        Scoop.waffleCone()
-            .addFlavor(getString(R.string.default_theme), R.style.NoBar, true)
-            .addFlavor(getString(R.string.default_dark_theme), R.style.NoBarDark, false)
-            .setSharedPreferences(PreferenceManager.getDefaultSharedPreferences(this))
-            .initialize()
-    }
-
     private fun tryToHandleBug() {
         val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
+            if (e is NoClassDefFoundError &&
+                e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
-                }) {
-                Unit
+                }
+            ) {
+                // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
-
+    class AppLifeCycleObserver(
+        val connectivityService: ConnectivityService,
+    ) : DefaultLifecycleObserver {
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
-            repository.connectionMonitored = true
-            connectivityStatus.start()
+            connectivityService.start()
         }
 
         override fun onPause(owner: LifecycleOwner) {
-            repository.connectionMonitored = false
-            connectivityStatus.stop()
+            connectivityService.stop()
             super.onPause(owner)
         }
     }
-}
+}

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

@@ -12,12 +12,9 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityReaderBinding
 import bou.amine.apps.readerforselfossv2.android.fragments.ArticleFragment
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.ftinc.scoop.Scoop
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -25,61 +22,56 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class ReaderActivity : AppCompatActivity(), DIAware {
-
+class ReaderActivity :
+    AppCompatActivity(),
+    DIAware {
     private var currentItem: Int = 0
-    private lateinit var appColors: AppColors
 
     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()
 
-    private fun showMenuItem(willAddToFavorite: Boolean) {
-        if (willAddToFavorite) {
-            toolbarMenu.findItem(R.id.star).icon.setTint(Color.WHITE)
-        } else {
-            toolbarMenu.findItem(R.id.star).icon.setTint(Color.RED)
-        }
-    }
-
-    private fun canFavorite() {
-        showMenuItem(true)
-    }
-
-    private fun canRemoveFromFavorite() {
-        showMenuItem(false)
-    }
-
+    @Suppress("detekt:SwallowedException")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        appColors = AppColors(this)
         binding = ActivityReaderBinding.inflate(layoutInflater)
         val view = binding.root
 
         setContentView(view)
 
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
         setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        if (allItems.isEmpty()) {
+        currentItem = intent.getIntExtra("currentItem", 0)
+
+        allItems = repository.getReaderItems()
+
+        if (allItems.isEmpty() || currentItem > allItems.size) {
             finish()
         }
 
-        currentItem = intent.getIntExtra("currentItem", 0)
-
-        readItem(allItems[currentItem])
+        readItem()
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
+
+        binding.pager.registerOnPageChangeCallback(
+            object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
+                    currentItem = position
+                    updateStarIcon()
+                    readItem()
+                }
+            },
+        )
     }
 
     override fun onResume() {
@@ -88,48 +80,56 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         binding.indicator.setViewPager(binding.pager)
     }
 
-    private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled()) {
+    private fun readItem() {
+        val item = allItems.getOrNull(currentItem)
+        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess() && item != null) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
         }
     }
 
+    private fun updateStarIcon() {
+        val isStarred = allItems.getOrNull(currentItem)?.starred ?: false
+        toolbarMenu.findItem(R.id.star)?.icon?.setTint(if (isStarred) Color.RED else Color.WHITE)
+    }
+
     override fun onSaveInstanceState(oldInstanceState: Bundle) {
         super.onSaveInstanceState(oldInstanceState)
         oldInstanceState.clear()
     }
 
-    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
-        FragmentStateAdapter(fa) {
-
+    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(keyCode: Int, event: KeyEvent?): Boolean {
-        return when (keyCode) {
+    override fun onKeyDown(
+        keyCode: Int,
+        event: KeyEvent?,
+    ): Boolean =
+        when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
                 val currentFragment =
                     supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
-                currentFragment.scrollDown()
+                currentFragment.volumeButtonScrollDown()
                 true
             }
+
             KeyEvent.KEYCODE_VOLUME_UP -> {
                 val currentFragment =
                     supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
-                currentFragment.scrollUp()
+                currentFragment.volumeButtonScrollUp()
                 true
             }
+
             else -> {
                 super.onKeyDown(keyCode, event)
             }
         }
-    }
 
     private fun alignmentMenu() {
         val showJustify = appSettingsService.getActiveAllignment() == AppSettingsService.ALIGN_LEFT
@@ -138,93 +138,58 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        val inflater = menuInflater
-        inflater.inflate(R.menu.reader_menu, menu)
+        menuInflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
-        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
-            canRemoveFromFavorite()
-        } else {
-            canFavorite()
-        }
         alignmentMenu()
 
-        binding.pager.registerOnPageChangeCallback(
-            object : ViewPager2.OnPageChangeCallback() {
-
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-
-                    if (allItems[position].starred) {
-                        canRemoveFromFavorite()
-                    } else {
-                        canFavorite()
-                    }
-                    readItem(allItems[position])
-                }
-            }
-        )
+        if (appSettingsService.getPublicAccess()) {
+            menu.removeItem(R.id.star)
+        } else {
+            updateStarIcon()
+        }
 
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        fun afterSave() {
-            allItems[binding.pager.currentItem] =
-                allItems[binding.pager.currentItem].toggleStar()
-            canRemoveFromFavorite()
-        }
-
-        fun afterUnsave() {
-            allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
-            canFavorite()
-        }
-
         when (item.itemId) {
-            android.R.id.home -> {
-                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()
-                }
-            }
-            R.id.align_left -> {
-                switchAlignmentSetting(AppSettingsService.ALIGN_LEFT)
-                refreshFragment()
-            }
-            R.id.align_justify -> {
-                switchAlignmentSetting(AppSettingsService.JUSTIFY)
-                refreshFragment()
-            }
+            android.R.id.home -> onBackPressedDispatcher.onBackPressed()
+            R.id.star -> toggleFavorite()
+            R.id.align_left -> switchAlignmentSetting(AppSettingsService.ALIGN_LEFT)
+            R.id.align_justify -> switchAlignmentSetting(AppSettingsService.JUSTIFY)
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun switchAlignmentSetting(allignment: Int) {
-        appSettingsService.changeAllignment(allignment)
+    private fun toggleFavorite() {
+        val item = allItems.getOrNull(currentItem) ?: return
+
+        val starred = item.starred
+
+        CoroutineScope(Dispatchers.IO).launch {
+            if (starred) {
+                repository.unstarr(item)
+            } else {
+                repository.starr(item)
+            }
+        }
+
+        item.toggleStar()
+        updateStarIcon()
+    }
+
+    private fun switchAlignmentSetting(alignment: Int) {
+        appSettingsService.changeAllignment(alignment)
         alignmentMenu()
-    }
 
-    private fun refreshFragment() {
-        finish()
-        overridePendingTransition(0, 0)
-        startActivity(intent)
-        overridePendingTransition(0, 0)
-    }
+        val fragmentManager = supportFragmentManager
+        val fragments = fragmentManager.fragments
 
-    companion object {
-        var allItems: ArrayList<SelfossModel.Item> = ArrayList()
+        for (fragment in fragments) {
+            if (fragment is ArticleFragment) {
+                fragment.refreshAlignment()
+            }
+        }
     }
 }

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

@@ -8,11 +8,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import bou.amine.apps.readerforselfossv2.android.adapters.SourcesListAdapter
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySourcesBinding
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import com.ftinc.scoop.Scoop
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -20,23 +18,18 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class SourcesActivity : AppCompatActivity(), DIAware {
-
-    private lateinit var appColors: AppColors
+class SourcesActivity :
+    AppCompatActivity(),
+    DIAware {
     private lateinit var binding: ActivitySourcesBinding
 
     override val di by closestDI()
-    private val repository : Repository by instance()
+    private val repository: Repository by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(this@SourcesActivity)
         binding = ActivitySourcesBinding.inflate(layoutInflater)
         val view = binding.root
 
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
         super.onCreate(savedInstanceState)
 
         setContentView(view)
@@ -45,8 +38,9 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        binding.fab.rippleColor = appColors.colorAccentDark
-        binding.fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+        binding.fab.rippleColor = resources.getColor(R.color.colorAccentDark)
+        binding.fab.backgroundTintList =
+            ColorStateList.valueOf(resources.getColor(R.color.colorAccent))
     }
 
     override fun onStop() {
@@ -58,38 +52,36 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         super.onResume()
         val mLayoutManager = LinearLayoutManager(this)
 
-        var items: ArrayList<SelfossModel.Source>
+        var items: ArrayList<SelfossModel.SourceDetail>
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
+        CountingIdlingResourceSingleton.increment()
         CoroutineScope(Dispatchers.Main).launch {
-            val response = repository.getSources()
-            if (response != null) {
+            val response = repository.getSourcesDetails()
+            if (response.isNotEmpty()) {
                 items = response
-                val mAdapter = SourcesListAdapter(
-                    this@SourcesActivity, items
-                )
+                val mAdapter =
+                    SourcesListAdapter(
+                        this@SourcesActivity,
+                        items,
+                    )
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
-                if (items.isEmpty()) {
-                    Toast.makeText(
-                        this@SourcesActivity,
-                        R.string.nothing_here,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
             } else {
-                Toast.makeText(
-                    this@SourcesActivity,
-                    R.string.cant_get_sources,
-                    Toast.LENGTH_SHORT
-                ).show()
+                Toast
+                    .makeText(
+                        this@SourcesActivity,
+                        R.string.cant_get_sources,
+                        Toast.LENGTH_SHORT,
+                    ).show()
             }
+            CountingIdlingResourceSingleton.decrement()
         }
 
         binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
         }
     }
 }

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

@@ -0,0 +1,200 @@
+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.model.NetworkUnavailableException
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.repository.Repository
+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()
+
+    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()
+        handleSpoutsSpinner()
+    }
+
+    @Suppress("detekt:SwallowedException")
+    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 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,7 +1,6 @@
 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
@@ -9,20 +8,18 @@ import android.widget.ImageView.ScaleType
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
-import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.utils.*
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
+import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 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 com.bumptech.glide.Glide
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -33,37 +30,82 @@ import org.kodein.di.instance
 
 class ItemCardAdapter(
     override val app: Activity,
-    override var items: ArrayList<SelfossModel.Item>,
-    private val helper: CustomTabActivityHelper,
-    override val appColors: AppColors,
-    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
+    override val items: ArrayList<SelfossModel.Item>,
+    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
-    private val c: Context = app.baseContext
-    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    override lateinit var binding: CardItemBinding
     private val imageMaxHeight: Int =
         c.resources.getDimension(R.dimen.card_image_max_height).toInt()
 
     override val di: DI by closestDI(app)
-    override val repository : Repository by instance()
-    override val appSettingsService : AppSettingsService by instance()
+    override val repository: Repository by instance()
+    override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder {
+        binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    private fun handleClickListeners(
+        holderBinding: CardItemBinding,
+        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.openItemUrlInBrowserAsNewTask(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(appColors.colorAccent)
+            binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
+            binding.sourceTitleAndDate.text =
+                try {
+                    itm.sourceAuthorAndDate()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("ItemCardAdapter parse date")
+                    itm.sourceAuthorOnly()
+                }
 
             if (!appSettingsService.isFullHeightCardsEnabled()) {
                 binding.itemImage.maxHeight = imageMaxHeight
@@ -76,80 +118,18 @@ class ItemCardAdapter(
                 binding.itemImage.setImageDrawable(null)
             } else {
                 binding.itemImage.visibility = View.VISIBLE
-                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage, appSettingsService)
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                val color = generator.getColor(itm.title.getHtmlDecoded())
-
-                val drawable =
-                        TextDrawable
-                                .builder()
-                                .round()
-                                .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-                binding.sourceImage.setImageDrawable(drawable)
+                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
             } else {
-                c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
+                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage, appSettingsService)
             }
         }
     }
 
-    override fun getItemCount(): Int {
-        return items.size
-    }
-
-    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
-            handleClickListeners()
-            handleCustomTabActions()
-        }
-
-        private fun handleClickListeners() {
-
-            binding.favButton.setOnClickListener {
-                val item = items[bindingAdapterPosition]
-                if (item.starred) {
-                    CoroutineScope(Dispatchers.IO).launch {
-                        repository.unstarr(item)
-                        // TODO: Handle failure
-                    }
-                    item.starred = false
-                    binding.favButton.isSelected = false
-                } else {
-                    CoroutineScope(Dispatchers.IO).launch {
-                        repository.starr(item)
-                        // TODO: Handle failure
-                    }
-                    item.starred = true
-                    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 handleCustomTabActions() {
-            val customTabsIntent = c.buildCustomTabsIntent()
-            helper.bindCustomTabsService(app)
-
-            binding.root.setOnClickListener {
-                c.openItemUrl(
-                    items,
-                    bindingAdapterPosition,
-                    items[bindingAdapterPosition].getLinkDecoded(),
-                    customTabsIntent,
-                    appSettingsService.isInternalBrowserEnabled(),
-                    appSettingsService.isArticleViewerEnabled(),
-                    app
-                )
-            }
-        }
-    }
+    inner class ViewHolder(
+        val binding: CardItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root)
 }

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

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

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

@@ -1,11 +1,13 @@
 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.themes.AppColors
+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
@@ -16,32 +18,38 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 
-abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
-    abstract var items: ArrayList<SelfossModel.Item>
+abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
+    RecyclerView.Adapter<VH>(),
+    DIAware {
+    abstract val items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
+    abstract val binding: ViewBinding
     abstract val appSettingsService: AppSettingsService
     abstract val app: Activity
-    abstract val appColors: AppColors
-    abstract val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
+    abstract val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit
+
+    protected val c: Context get() = app.baseContext
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items = items
+        this.items.clear()
+        this.items.addAll(items)
+        updateHomeItems(items)
         notifyDataSetChanged()
-        updateItems(this.items)
     }
 
-    private fun unmarkSnackbar(i: SelfossModel.Item, position: Int) {
-        val s = Snackbar
-            .make(
-                app.findViewById(R.id.coordLayout),
-                R.string.marked_as_read,
-                Snackbar.LENGTH_LONG
-            )
-            .setAction(R.string.undo_string) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    unreadItemAtIndex(position, false)
+    private fun unmarkSnackbar(
+        item: SelfossModel.Item,
+        position: Int,
+    ) {
+        val s =
+            Snackbar
+                .make(
+                    app.findViewById(R.id.coordLayout),
+                    R.string.marked_as_read,
+                    Snackbar.LENGTH_LONG,
+                ).setAction(R.string.undo_string) {
+                    unreadItemAtIndex(item, position, false)
                 }
-            }
 
         val view = s.view
         val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
@@ -49,16 +57,19 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(position: Int) {
-        val s = Snackbar
-            .make(
-                app.findViewById(R.id.coordLayout),
-                R.string.marked_as_unread,
-                Snackbar.LENGTH_LONG
-            )
-            .setAction(R.string.undo_string) {
-                readItemAtIndex(position)
-            }
+    private fun markSnackbar(
+        item: SelfossModel.Item,
+        position: Int,
+    ) {
+        val s =
+            Snackbar
+                .make(
+                    app.findViewById(R.id.coordLayout),
+                    R.string.marked_as_unread,
+                    Snackbar.LENGTH_LONG,
+                ).setAction(R.string.undo_string) {
+                    readItemAtIndex(item, position, false)
+                }
 
         val view = s.view
         val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
@@ -66,54 +77,79 @@ 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(position)
+            readItemAtIndex(items[position], position)
         } else {
-            unreadItemAtIndex(position)
+            unreadItemAtIndex(items[position], position)
         }
     }
 
-    private fun readItemAtIndex(position: Int, showSnackbar: Boolean = true) {
-        val i = items[position]
+    private fun readItemAtIndex(
+        item: SelfossModel.Item,
+        position: Int,
+        showSnackbar: Boolean = true,
+    ) {
         CoroutineScope(Dispatchers.IO).launch {
-            repository.markAsRead(i)
+            repository.markAsRead(item)
         }
         if (repository.displayedItems == ItemType.UNREAD) {
-            items.remove(i)
+            items.remove(item)
             notifyItemRemoved(position)
-            updateItems(items)
+            notifyItemRangeChanged(position, itemCount)
+            updateHomeItems(items)
         } else {
             notifyItemChanged(position)
         }
         if (showSnackbar) {
-            unmarkSnackbar(i, position)
+            unmarkSnackbar(item, position)
         }
     }
 
-    private fun unreadItemAtIndex(position: Int, showSnackbar: Boolean = true) {
+    private fun unreadItemAtIndex(
+        item: SelfossModel.Item,
+        position: Int,
+        showSnackbar: Boolean = true,
+    ) {
         CoroutineScope(Dispatchers.IO).launch {
-            repository.unmarkAsRead(items[position])
-
+            repository.unmarkAsRead(item)
         }
         notifyItemChanged(position)
         if (showSnackbar) {
-            markSnackbar(position)
+            markSnackbar(item, position)
         }
     }
 
-    fun addItemAtIndex(item: SelfossModel.Item, position: Int) {
+    fun addItemAtIndex(
+        item: SelfossModel.Item,
+        position: Int,
+    ) {
         items.add(position, item)
         notifyItemInserted(position)
-        updateItems(items)
-
+        updateHomeItems(items)
     }
 
     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
         val oldSize = items.size
         items.addAll(newItems)
         notifyItemRangeInserted(oldSize, newItems.size)
-        updateItems(items)
-
+        updateHomeItems(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.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
-import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 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,65 +28,96 @@ import org.kodein.di.instance
 
 class SourcesListAdapter(
     private val app: Activity,
-    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
-
+    private val items: ArrayList<SelfossModel.SourceDetail>,
+) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(),
+    DIAware {
     override val di: DI by closestDI(app)
-    private val repository : Repository by instance()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ViewHolder(binding.root)
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder {
+        val binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val itm = items[position]
-
-        if (itm.getIcon(repository.baseUrl).isEmpty()) {
-            val color = generator.getColor(itm.title.getHtmlDecoded())
-
-            val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
-            binding.itemImage.setImageDrawable(drawable)
-        } else {
-            c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
-        }
-
-        binding.sourceTitle.text = itm.title.getHtmlDecoded()
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int,
+    ) {
+        holder.bind(items[position], position)
     }
 
+    override fun getItemId(position: Int) = position.toLong()
+
+    override fun getItemViewType(position: Int) = position
+
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(
+        val binding: SourceListItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
+        private val context: Context = app.applicationContext
+        private val repository: Repository by instance()
+        private val appSettingsService: AppSettingsService by instance()
 
-        init {
-            handleClickListeners()
+        fun bind(
+            source: SelfossModel.SourceDetail,
+            position: Int,
+        ) {
+            binding.apply {
+                sourceTitle.text = source.title.getHtmlDecoded()
+                if (source.getIcon(repository.baseUrl).isEmpty()) {
+                    itemImage.setBackgroundAndText(source.title.getHtmlDecoded())
+                } else {
+                    context.circularDrawable(source.getIcon(repository.baseUrl), itemImage, appSettingsService)
+                }
+
+                errorText.apply {
+                    visibility = if (!source.error.isNullOrBlank()) View.VISIBLE else View.GONE
+                    text = source.error
+                }
+
+                deleteBtn.setOnClickListener { showDeleteConfirmationDialog(source, position) }
+
+                root.setOnClickListener {
+                    repository.setSelectedSource(source)
+                    app.startActivity(Intent(app, UpsertSourceActivity::class.java))
+                }
+            }
         }
 
-        private fun handleClickListeners() {
+        private fun showDeleteConfirmationDialog(
+            source: SelfossModel.SourceDetail,
+            position: Int,
+        ) {
+            AlertDialog
+                .Builder(app)
+                .setTitle(app.getString(R.string.confirm_delete_title))
+                .setMessage(app.getString(R.string.confirm_delete_message, source.title))
+                .setPositiveButton(android.R.string.ok) { _, _ -> deleteSource(source, position) }
+                .setNegativeButton(android.R.string.cancel, null)
+                .show()
+        }
 
-            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
-
-            deleteBtn.setOnClickListener {
-                val (id) = items[adapterPosition]
-                CoroutineScope(Dispatchers.IO).launch {
-                    val successfullyDeletedSource = repository.deleteSource(id)
+        private fun deleteSource(
+            source: SelfossModel.SourceDetail,
+            position: Int,
+        ) {
+            CoroutineScope(Dispatchers.IO).launch {
+                val successfullyDeletedSource = repository.deleteSource(source.id, source.title)
+                launch(Dispatchers.Main) {
                     if (successfullyDeletedSource) {
-                        items.removeAt(adapterPosition)
-                        notifyItemRemoved(adapterPosition)
-                        notifyItemRangeChanged(adapterPosition, itemCount)
+                        items.removeAt(position)
+                        notifyItemRemoved(position)
+                        notifyItemRangeChanged(position, itemCount)
                     } else {
-                        Toast.makeText(
-                            app,
-                            R.string.can_delete_source,
-                            Toast.LENGTH_SHORT
-                        ).show()
+                        Toast
+                            .makeText(
+                                app,
+                                R.string.can_delete_source,
+                                Toast.LENGTH_SHORT,
+                            ).show()
                     }
                 }
             }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryApi.kt

@@ -1,35 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import com.google.gson.GsonBuilder
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Call
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class MercuryApi() {
-    private val service: MercuryService
-
-    init {
-
-        val interceptor = HttpLoggingInterceptor()
-        interceptor.level = HttpLoggingInterceptor.Level.NONE
-        val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
-
-        val gson = GsonBuilder()
-            .setLenient()
-            .create()
-        val retrofit =
-            Retrofit
-                .Builder()
-                .baseUrl("https://www.amine-louveau.fr")
-                .client(client)
-                .addConverterFactory(GsonConverterFactory.create(gson))
-                .build()
-        service = retrofit.create(MercuryService::class.java)
-    }
-
-    fun parseUrl(url: String): Call<ParsedContent> {
-        return service.parseUrl(url)
-    }
-}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryModels.kt

@@ -1,59 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.google.gson.annotations.SerializedName
-
-class ParsedContent(
-    @SerializedName("title") val title: String,
-    @SerializedName("content") val content: String?,
-    @SerializedName("date_published") val date_published: String,
-    @SerializedName("lead_image_url") val lead_image_url: String?,
-    @SerializedName("dek") val dek: String,
-    @SerializedName("url") val url: String,
-    @SerializedName("domain") val domain: String,
-    @SerializedName("excerpt") val excerpt: String,
-    @SerializedName("total_pages") val total_pages: Int,
-    @SerializedName("rendered_pages") val rendered_pages: Int,
-    @SerializedName("next_page_url") val next_page_url: String
-) : Parcelable {
-
-    companion object {
-        @JvmField
-        val CREATOR: Parcelable.Creator<ParsedContent> =
-            object : Parcelable.Creator<ParsedContent> {
-                override fun createFromParcel(source: Parcel): ParsedContent = ParsedContent(source)
-                override fun newArray(size: Int): Array<ParsedContent?> = arrayOfNulls(size)
-            }
-    }
-
-    constructor(source: Parcel) : this(
-        title = source.readString().orEmpty(),
-        content = source.readString(),
-        date_published = source.readString().orEmpty(),
-        lead_image_url = source.readString(),
-        dek = source.readString().orEmpty(),
-        url = source.readString().orEmpty(),
-        domain = source.readString().orEmpty(),
-        excerpt = source.readString().orEmpty(),
-        total_pages = source.readInt(),
-        rendered_pages = source.readInt(),
-        next_page_url = source.readString().orEmpty()
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(title)
-        dest.writeString(content)
-        dest.writeString(date_published)
-        dest.writeString(lead_image_url)
-        dest.writeString(dek)
-        dest.writeString(url)
-        dest.writeString(domain)
-        dest.writeString(excerpt)
-        dest.writeInt(total_pages)
-        dest.writeInt(rendered_pages)
-        dest.writeString(next_page_url)
-    }
-}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryService.kt

@@ -1,10 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-interface MercuryService {
-    @GET("parser.php")
-    fun parseUrl(@Query("link") link: String): Call<ParsedContent>
-}

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

@@ -0,0 +1,120 @@
+package bou.amine.apps.readerforselfossv2.android.background
+
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
+import androidx.core.app.NotificationCompat.PRIORITY_LOW
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import bou.amine.apps.readerforselfossv2.android.MainActivity
+import bou.amine.apps.readerforselfossv2.android.MyApp
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.model.preloadImages
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+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.instance
+import java.util.Timer
+import kotlin.concurrent.schedule
+
+private const val NOTIFICATION_DELAY = 4000L
+
+class LoadingWorker(
+    val context: Context,
+    params: WorkerParameters,
+) : Worker(context, params),
+    DIAware {
+    override val di by lazy { (applicationContext as MyApp).di }
+    private val repository: Repository by instance()
+    private val appSettingsService: AppSettingsService by instance()
+
+    override fun doWork(): Result {
+        if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+            CoroutineScope(Dispatchers.IO).launch {
+                val notificationManager =
+                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+                val notification =
+                    NotificationCompat
+                        .Builder(applicationContext, AppSettingsService.SYNC_CHANNEL_ID)
+                        .setContentTitle(context.getString(R.string.loading_notification_title))
+                        .setContentText(context.getString(R.string.loading_notification_text))
+                        .setOngoing(true)
+                        .setPriority(PRIORITY_LOW)
+                        .setChannelId(AppSettingsService.SYNC_CHANNEL_ID)
+                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+
+                notificationManager.notify(1, notification.build())
+
+                repository.handleDBActions()
+
+                val apiItems = repository.tryToCacheItemsAndGetNewOnes()
+                if (appSettingsService.isNotifyNewItemsEnabled()) {
+                    launch {
+                        handleNewItemsNotification(apiItems, notificationManager)
+                    }
+                }
+                apiItems.map { it.preloadImages(context, appSettingsService) }
+            }
+        }
+        return Result.success()
+    }
+
+    private fun handleNewItemsNotification(
+        newItems: List<SelfossModel.Item>?,
+        notificationManager: NotificationManager,
+    ) {
+        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 {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    }
+                val pflags =
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        PendingIntent.FLAG_IMMUTABLE
+                    } else {
+                        0
+                    }
+                val pendingIntent: PendingIntent =
+                    PendingIntent.getActivity(context, 0, intent, pflags)
+
+                val newItemsNotification =
+                    NotificationCompat
+                        .Builder(
+                            applicationContext,
+                            AppSettingsService.NEW_ITEMS_CHANNEL,
+                        ).setContentTitle(context.getString(R.string.new_items_notification_title))
+                        .setContentText(
+                            context.getString(
+                                R.string.new_items_notification_text,
+                                newSize,
+                            ),
+                        ).setPriority(PRIORITY_DEFAULT)
+                        .setChannelId(AppSettingsService.NEW_ITEMS_CHANNEL)
+                        .setContentIntent(pendingIntent)
+                        .setAutoCancel(true)
+                        .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
+
+                Timer("", false).schedule(NOTIFICATION_DELAY) {
+                    notificationManager.notify(2, newItemsNotification.build())
+                }
+            }
+            Timer("", false).schedule(NOTIFICATION_DELAY) {
+                notificationManager.cancel(1)
+            }
+        }
+    }
+}

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

@@ -1,111 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.background
-
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
-import androidx.core.app.NotificationCompat.PRIORITY_LOW
-import androidx.work.Worker
-import androidx.work.WorkerParameters
-import bou.amine.apps.readerforselfossv2.android.MainActivity
-import bou.amine.apps.readerforselfossv2.android.MyApp
-import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.model.preloadImages
-import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
-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.instance
-import java.util.*
-import kotlin.concurrent.schedule
-
-class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {
-
-    override val di by lazy { (applicationContext as MyApp).di }
-    private val repository : Repository by instance()
-    private val appSettingsService : AppSettingsService by instance()
-
-override fun doWork(): Result {
-    if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
-
-        CoroutineScope(Dispatchers.IO).launch {
-            val notificationManager =
-                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-            val notification =
-                NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
-                    .setContentTitle(context.getString(R.string.loading_notification_title))
-                    .setContentText(context.getString(R.string.loading_notification_text))
-                    .setOngoing(true)
-                    .setPriority(PRIORITY_LOW)
-                    .setChannelId(AppSettingsService.syncChannelId)
-                    .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
-
-            notificationManager.notify(1, notification.build())
-
-            repository.handleDBActions()
-
-            if (appSettingsService.isNotifyNewItemsEnabled()) {
-                launch {
-                    handleNewItemsNotification(repository.tryToCacheItemsAndGetNewOnes(), notificationManager)
-                }
-            }
-        }
-    }
-    return Result.success()
-}
-
-    private fun handleNewItemsNotification(
-        newItems: List<SelfossModel.Item>?,
-        notificationManager: NotificationManager
-    ) {
-        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 {
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                    }
-                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        PendingIntent.FLAG_IMMUTABLE
-                    } else {
-                        0
-                    }
-                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
-
-                    val newItemsNotification =
-                        NotificationCompat.Builder(applicationContext, AppSettingsService.newItemsChannelId)
-                            .setContentTitle(context.getString(R.string.new_items_notification_title))
-                            .setContentText(
-                                context.getString(
-                                    R.string.new_items_notification_text,
-                                    newSize
-                                )
-                            )
-                            .setPriority(PRIORITY_DEFAULT)
-                            .setChannelId(AppSettingsService.newItemsChannelId)
-                            .setContentIntent(pendingIntent)
-                            .setAutoCancel(true)
-                            .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
-
-                    Timer("", false).schedule(4000) {
-                        notificationManager.notify(2, newItemsNotification.build())
-                    }
-                }
-                apiItems.map { it.preloadImages(context) }
-            Timer("", false).schedule(4000) {
-                notificationManager.cancel(1)
-            }
-        }
-    }
-}

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

@@ -1,101 +1,103 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
+import android.content.Context
 import android.content.Intent
-import android.content.res.ColorStateList
 import android.content.res.TypedArray
 import android.graphics.Bitmap
 import android.graphics.Typeface
-import android.graphics.drawable.ColorDrawable
-import android.net.Uri
 import android.os.Bundle
-import android.view.*
+import android.util.TypedValue.DATA_NULL_UNDEFINED
+import android.view.GestureDetector
+import android.view.InflateException
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
 import android.webkit.WebResourceResponse
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.browser.customtabs.CustomTabsIntent
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.ImageActivity
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.api.mercury.MercuryApi
-import bou.amine.apps.readerforselfossv2.android.api.mercury.ParsedContent
 import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBinding
 import bou.amine.apps.readerforselfossv2.android.model.ParecelableItem
 import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.utils.buildCustomTabsIntent
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.bottombar.addHomeMadeActionItem
+import bou.amine.apps.readerforselfossv2.android.utils.getColorFromAttr
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapFitCenter
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
-import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInternalBrowser
+import bou.amine.apps.readerforselfossv2.android.utils.glide.getGlideImageForResource
+import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
+import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask
 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
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
 import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.RequestOptions
-import com.github.rubensousa.floatingtoolbar.FloatingToolbar
-import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.leinardi.android.speeddial.SpeedDialView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.acra.ktx.sendSilentlyWithAcra
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
-import java.util.*
+import java.util.Locale
 import java.util.concurrent.ExecutionException
 
-class ArticleFragment : Fragment(), DIAware {
-    private var fontSize: Int = 16
+private const val IMAGE_JPG = "image/jpg"
+private const val IMAGE_PNG = "image/png"
+private const val IMAGE_WEBP = "image/webp"
+
+private const val WHITE_COLOR_HEX = 0xFFFFFF
+
+private const val DEFAULT_FONT_SIZE = 16
+
+class ArticleFragment :
+    Fragment(),
+    DIAware {
+    private var colorOnSurface: Int = 0
+    private var colorSurface: Int = 0
+    private var fontSize: Int = DEFAULT_FONT_SIZE
     private lateinit var item: SelfossModel.Item
-    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null
-    private lateinit var url: String
+    private var url: String? = null
     private lateinit var contentText: String
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
-    private lateinit var allImages : ArrayList<String>
-    private lateinit var fab: FloatingActionButton
-    private lateinit var appColors: AppColors
+    private lateinit var allImages: ArrayList<String>
+    private lateinit var fab: SpeedDialView
     private lateinit var textAlignment: String
-    private var _binding: FragmentArticleBinding? = null
-    private val binding get() = _binding!!
+    private lateinit var binding: FragmentArticleBinding
 
-    override val di : DI by closestDI()
+    override val di: DI by closestDI()
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
+    private val connectivityService: ConnectivityService by instance()
 
     private var typeface: Typeface? = null
     private var resId: Int = 0
     private var font = ""
-    private var staticBar = false
 
-    override fun onStop() {
-        super.onStop()
-        if (mCustomTabActivityHelper != null) {
-            mCustomTabActivityHelper!!.unbindCustomTabsService(activity)
-        }
-    }
+    private val mercuryApi: MercuryApi by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(requireActivity())
-
         super.onCreate(savedInstanceState)
 
         val pi: ParecelableItem = requireArguments().getParcelable(ARG_ITEMS)!!
@@ -103,351 +105,366 @@ class ArticleFragment : Fragment(), DIAware {
         item = pi.toModel()
     }
 
+    @Suppress("detekt:LongMethod")
     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)
+
+            try {
+                url = item.getLinkDecoded()
+            } catch (e: Exception) {
+                e.sendSilentlyWithAcra()
+            }
+
+            colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
+            colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
 
-            url = item.getLinkDecoded()
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = item.sourceAndDateText(repository.dateUtils)
+            contentSource =
+                try {
+                    item.sourceAuthorAndDate()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("Article Fragment parse date")
+                    item.sourceAuthorOnly()
+                }
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()
-            staticBar = appSettingsService.isStaticBarEnabled()
             font = appSettingsService.getFont()
 
-            if (font.isNotEmpty()) {
-                resId = requireContext().resources.getIdentifier(font, "font", requireContext().packageName)
-                typeface = try {
-                    ResourcesCompat.getFont(requireContext(), resId)!!
-                } catch (e: java.lang.Exception) {
-                    // Just to be sure
-                    null
-                }
-            }
-
             refreshAlignment()
 
-            fab = binding.fab
-
-            fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
-
-            fab.rippleColor = appColors.colorAccentDark
-
-            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
-            floatingToolbar.attachFab(fab)
-
-            floatingToolbar.background = ColorDrawable(appColors.colorAccent)
-
-            val customTabsIntent = requireActivity().buildCustomTabsIntent()
-            mCustomTabActivityHelper = CustomTabActivityHelper()
-            mCustomTabActivityHelper!!.bindCustomTabsService(activity)
-
-
-            floatingToolbar.setClickListener(
-                object : FloatingToolbar.ItemClickListener {
-                    override fun onItemClick(item: MenuItem) {
-                        when (item.itemId) {
-                            R.id.more_action -> getContentFromMercury(customTabsIntent)
-                            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()
-                floatingToolbar.show()
-            }
+            handleFloatingToolbar()
 
             binding.source.text = contentSource
             if (typeface != null) {
                 binding.source.typeface = typeface
             }
 
-            if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury(customTabsIntent)
-            } else {
-                binding.titleView.text = contentTitle
-                if (typeface != null) {
-                    binding.titleView.typeface = typeface
-                }
-
-                htmlToWebview()
-
-                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                    binding.imageView.visibility = View.VISIBLE
-                    Glide
-                        .with(requireContext())
-                        .asBitmap()
-                        .load(contentImage)
-                        .apply(RequestOptions.fitCenterTransform())
-                        .into(binding.imageView)
-                } else {
-                    binding.imageView.visibility = View.GONE
-                }
-            }
-
-            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()
-                        }
-                    }
-                }
-            )
-
+            handleContent()
         } catch (e: InflateException) {
-            AlertDialog.Builder(requireContext())
-                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                .setPositiveButton(android.R.string.ok
-                ) { _, _ ->
-                    appSettingsService.disableArticleViewer()
-                    requireActivity().finish()
-                }
-                .create()
-                .show()
+            e.sendSilentlyWithAcraWithName("webview not available")
+            maybeIfContext {
+                AlertDialog
+                    .Builder(it)
+                    .setMessage(it.getString(R.string.webview_dialog_issue_message))
+                    .setTitle(it.getString(R.string.webview_dialog_issue_title))
+                    .setPositiveButton(
+                        android.R.string.ok,
+                    ) { _, _ ->
+                        appSettingsService.disableArticleViewer()
+                        requireActivity().finish()
+                    }.create()
+                    .show()
+            }
         }
 
         return binding.root
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
+    private fun handleContent() {
+        if (contentText.isEmptyOrNullOrNullString()) {
+            if (connectivityService.isNetworkAvailable() && url.isUrlValid()) {
+                getContentFromMercury(url!!)
+            }
+        } else {
+            binding.titleView.text = contentTitle
+            if (typeface != null) {
+                binding.titleView.typeface = typeface
+            }
 
-    private fun refreshAlignment() {
-        textAlignment = when (appSettingsService.getActiveAllignment()) {
-            1 -> "justify"
-            2 -> "left"
-            else -> "justify"
+            htmlToWebview()
+
+            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                binding.imageView.visibility = View.VISIBLE
+                maybeIfContext { it.bitmapFitCenter(contentImage, binding.imageView, appSettingsService) }
+            } else {
+                binding.imageView.visibility = View.GONE
+            }
         }
     }
 
-    private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
-        if (repository.isNetworkAvailable()) {
-        binding.progressBar.visibility = View.VISIBLE
-        val parser = MercuryApi()
+    private fun handleFloatingToolbar() {
+        fab = binding.speedDial
+        fab.mainFabClosedIconColor = colorOnSurface
+        fab.mainFabOpenedIconColor = colorOnSurface
 
-            parser.parseUrl(url).enqueue(
-                object : Callback<ParsedContent> {
-                    override fun onResponse(
-                        call: Call<ParsedContent>,
-                        response: Response<ParsedContent>
-                    ) {
-                        // TODO: clean all the following after finding the mercury content issue
-                        try {
-                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
-                                try {
-                                    binding.titleView.text = response.body()!!.title
-                                    if (typeface != null) {
-                                        binding.titleView.typeface = typeface
-                                    }
-                                    try {
-                                        // Note: Mercury may return relative urls... If it does the url val will not be changed.
-                                        URL(response.body()!!.url)
-                                        url = response.body()!!.url
-                                    } catch (e: MalformedURLException) {
-                                        // Mercury returned a relative url. We do nothing.
-                                    }
-                                } catch (e: Exception) {
-                                }
+        maybeIfContext { handleFloatingToolbarActionItems(it) }
 
-                                try {
-                                    contentText = response.body()!!.content.orEmpty()
-                                    htmlToWebview()
-                                } catch (e: Exception) {
-                                }
-
-                                try {
-                                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                        binding.imageView.visibility = View.VISIBLE
-                                        try {
-                                            Glide
-                                                .with(requireContext())
-                                                .asBitmap()
-                                                .load(
-                                                    response.body()!!.lead_image_url.orEmpty()
-                                                )
-                                                .apply(RequestOptions.fitCenterTransform())
-                                                .into(binding.imageView)
-                                        } catch (e: Exception) {
-                                        }
-                                    } else {
-                                        binding.imageView.visibility = View.GONE
-                                    }
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-
-                                try {
-                                    binding.nestedScrollView.scrollTo(0, 0)
-
-                                    binding.progressBar.visibility = View.GONE
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-                            } else {
-                                try {
-                                    openInBrowserAfterFailing(customTabsIntent)
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-                            }
-                        } catch (e: Exception) {
-                            if (context != null) {
-                            }
+        fab.setOnActionSelectedListener { actionItem ->
+            when (actionItem.id) {
+                R.id.share_action -> requireActivity().shareLink(url, contentTitle)
+                R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+                R.id.unread_action ->
+                    if (this@ArticleFragment.item.unread) {
+                        CoroutineScope(Dispatchers.IO).launch {
+                            repository.markAsRead(this@ArticleFragment.item)
+                        }
+                        this@ArticleFragment.item.unread = false
+                        maybeIfContext {
+                            Toast
+                                .makeText(
+                                    it,
+                                    R.string.marked_as_read,
+                                    Toast.LENGTH_LONG,
+                                ).show()
+                        }
+                    } else {
+                        CoroutineScope(Dispatchers.IO).launch {
+                            repository.unmarkAsRead(this@ArticleFragment.item)
+                        }
+                        this@ArticleFragment.item.unread = true
+                        maybeIfContext {
+                            Toast
+                                .makeText(
+                                    it,
+                                    R.string.marked_as_unread,
+                                    Toast.LENGTH_LONG,
+                                ).show()
                         }
                     }
 
-                    override fun onFailure(
-                        call: Call<ParsedContent>,
-                        t: Throwable
-                    ) = openInBrowserAfterFailing(customTabsIntent)
-                }
-            )
+                else -> Unit
+            }
+            false
         }
     }
 
+    private fun handleFloatingToolbarActionItems(c: Context) {
+        fab.addHomeMadeActionItem(
+            R.id.share_action,
+            resources.getDrawable(R.drawable.ic_share_white_24dp),
+            R.string.reader_action_share,
+            colorOnSurface,
+            colorSurface,
+            c,
+        )
+        fab.addHomeMadeActionItem(
+            R.id.open_action,
+            resources.getDrawable(R.drawable.ic_open_in_browser_white_24dp),
+            R.string.reader_action_open,
+            colorOnSurface,
+            colorSurface,
+            c,
+        )
+        fab.addHomeMadeActionItem(
+            R.id.unread_action,
+            resources.getDrawable(R.drawable.ic_baseline_white_eye_24dp),
+            R.string.unmark,
+            colorOnSurface,
+            colorSurface,
+            c,
+        )
+    }
+
+    fun refreshAlignment() {
+        textAlignment =
+            when (appSettingsService.getActiveAllignment()) {
+                1 -> "justify"
+                2 -> "left"
+                else -> "justify"
+            }
+
+        htmlToWebview()
+    }
+
+    @Suppress("detekt:SwallowedException")
+    private fun getContentFromMercury(url: String) {
+        binding.progressBar.visibility = View.VISIBLE
+
+        CoroutineScope(Dispatchers.Main).launch {
+            try {
+                val response = mercuryApi.query(url)
+                if (response.success && response.data != null) {
+                    handleMercuryData(response.data!!)
+                } else {
+                    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)
+            url = data.url!!
+
+            contentText = data.content.orEmpty()
+            htmlToWebview()
+
+            handleLeadImage(data.lead_image_url)
+
+            binding.nestedScrollView.scrollTo(0, 0)
+            binding.progressBar.visibility = View.GONE
+        }
+    }
+
+    private fun handleLeadImage(leadImageUrl: String?) {
+        if (!leadImageUrl.isNullOrEmpty()) {
+            maybeIfContext {
+                binding.imageView.visibility = View.VISIBLE
+                it.bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
+            }
+        } else {
+            binding.imageView.visibility = View.GONE
+        }
+    }
+
+    private fun handleImageLoading() {
+        binding.webcontent.webViewClient =
+            object : WebViewClient() {
+                @Deprecated("Deprecated in Java")
+                override fun shouldOverrideUrlLoading(
+                    view: WebView?,
+                    url: String,
+                ): Boolean =
+                    if (url.isUrlValid() &&
+                        binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+                    ) {
+                        maybeIfContext { it.openUrlInBrowserAsNewTask(url) }
+                        true
+                    } else {
+                        false
+                    }
+
+                @Suppress("detekt:SwallowedException", "detekt:ReturnCount")
+                @Deprecated("Deprecated in Java")
+                override fun shouldInterceptRequest(
+                    view: WebView,
+                    url: String,
+                ): WebResourceResponse? {
+                    val (mime: String?, compression: Bitmap.CompressFormat) =
+                        if (url
+                                .lowercase(Locale.US)
+                                .contains(".jpg") ||
+                            url.lowercase(Locale.US).contains(".jpeg")
+                        ) {
+                            Pair(IMAGE_JPG, Bitmap.CompressFormat.JPEG)
+                        } else if (url.lowercase(Locale.US).contains(".png")) {
+                            Pair(IMAGE_PNG, Bitmap.CompressFormat.PNG)
+                        } else if (url.lowercase(Locale.US).contains(".webp")) {
+                            Pair(IMAGE_WEBP, Bitmap.CompressFormat.WEBP)
+                        } else {
+                            return super.shouldInterceptRequest(view, url)
+                        }
+
+                    try {
+                        val image = view.getGlideImageForResource(url, appSettingsService)
+                        return WebResourceResponse(
+                            mime,
+                            "UTF-8",
+                            getBitmapInputStream(image, compression),
+                        )
+                    } catch (e: ExecutionException) {
+                        return super.shouldInterceptRequest(view, url)
+                    }
+                }
+            }
+    }
+
+    @Suppress("detekt:LongMethod", "detekt:ImplicitDefaultLocale")
     private fun htmlToWebview() {
-        val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
+        maybeIfContext {
+            val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+            val a: TypedArray = it.obtainStyledAttributes(resId, attrs)
 
-        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
-
-
-        binding.webcontent.settings.standardFontFamily = a.getString(0)
+            binding.webcontent.settings.standardFontFamily = a.getString(0)
+            ""
+        }
         binding.webcontent.visibility = View.VISIBLE
 
-        // TODO: Set the color strings programmatically
-        val (stringTextColor, stringBackgroundColor) = if (appColors.isDarkTheme) {
-            Pair("#FFFFFF", "#303030")
-        } else {
-            Pair("#212121", "#FAFAFA")
-        }
+        val colorSurfaceString =
+            String.format(
+                "#%06X",
+                WHITE_COLOR_HEX and (if (colorSurface != DATA_NULL_UNDEFINED) colorSurface else WHITE_COLOR_HEX),
+            )
+
+        val colorOnSurfaceString =
+            String.format(
+                "#%06X",
+                WHITE_COLOR_HEX and (if (colorOnSurface != DATA_NULL_UNDEFINED) colorOnSurface else 0),
+            )
 
         binding.webcontent.settings.useWideViewPort = true
         binding.webcontent.settings.loadWithOverviewMode = true
         binding.webcontent.settings.javaScriptEnabled = false
 
-        binding.webcontent.webViewClient = object : WebViewClient() {
-            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
-            }
+        handleImageLoading()
+        try {
+            val gestureDetector =
+                GestureDetector(
+                    activity,
+                    object : GestureDetector.SimpleOnGestureListener() {
+                        override fun onSingleTapUp(e: MotionEvent): Boolean = performClick()
+                    },
+                )
 
-            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) {}
-                }
-                else if (url.lowercase(Locale.US).contains(".png")) {
-                    try {
-                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
-                    }catch ( e : ExecutionException) {}
-                }
-                else if (url.lowercase(Locale.US).contains(".webp")) {
-                    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) {}
-                }
-
-                return super.shouldInterceptRequest(view, url)
+            binding.webcontent.setOnTouchListener { _, event ->
+                gestureDetector.onTouchEvent(
+                    event,
+                )
             }
+        } catch (e: IllegalStateException) {
+            e.sendSilentlyWithAcraWithName("Gesture detector issue ?")
+            return
         }
 
-        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onSingleTapUp(e: MotionEvent?): Boolean {
-                return performClick()
-            }
-        })
-
-        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
-
         binding.webcontent.settings.layoutAlgorithm =
-                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+            WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
         var baseUrl: String? = null
-
         try {
-            val itemUrl = URL(url)
+            val itemUrl = URL(url.orEmpty())
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
+            e.sendSilentlyWithAcraWithName("htmlToWebview > ${url.orEmpty()}")
         }
 
-        val fontName =  when (font) {
-            getString(R.string.open_sans_font_id) -> "Open Sans"
-            getString(R.string.roboto_font_id) -> "Roboto"
-            else -> ""
-        }
+        val fontName: String =
+            maybeIfContext {
+                when (font) {
+                    it.getString(R.string.open_sans_font_id) -> "Open Sans"
+                    it.getString(R.string.roboto_font_id) -> "Roboto"
+                    it.getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+                    else -> ""
+                }
+            }?.toString().orEmpty()
 
-        val fontLinkAndStyle = if (font.isNotEmpty()) {
-            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
+        val fontLinkAndStyle =
+            if (fontName.isNotEmpty()) {
+                """<link href="https://fonts.googleapis.com/css?family=${
+                    fontName.replace(
+                        " ",
+                        "+",
+                    )
+                }" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
                 |   }
                 |</style>
-            """.trimMargin()
-        } else {
-            ""
-        }
-
-        binding.webcontent.loadDataWithBaseURL(
-            baseUrl,
-            """<html>
+                """.trimMargin()
+            } else {
+                ""
+            }
+        try {
+            binding.webcontent.loadDataWithBaseURL(
+                baseUrl,
+                """<html>
                 |<head>
                 |   <meta name="viewport" content="width=device-width, initial-scale=1">
                 |   <style>
@@ -458,10 +475,15 @@ class ArticleFragment : Fragment(), DIAware {
                 |        max-width: 100%;
                 |      }
                 |      a {
-                |        color: $stringColor !important;
+                |        color: ${
+                    String.format(
+                        "#%06X",
+                        WHITE_COLOR_HEX and (maybeIfContext { it.resources.getColor(R.color.colorAccent) } as Int),
+                    )
+                } !important;
                 |      }
                 |      *:not(a) {
-                |        color: $stringTextColor;
+                |        color: $colorOnSurfaceString;
                 |      }
                 |      * {
                 |        font-size: ${fontSize}px;
@@ -469,11 +491,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: $stringBackgroundColor;
+                |        background-color: $colorSurfaceString;
                 |      }
                 |      body, html {
-                |        background-color: $stringBackgroundColor !important;
-                |        border-color: $stringBackgroundColor  !important;
+                |        background-color: $colorSurfaceString !important;
+                |        border-color: $colorSurfaceString  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -483,45 +505,45 @@ class ArticleFragment : Fragment(), DIAware {
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: $stringBackgroundColor;
+                |        background-color: $colorSurfaceString;
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
                 |</head>
                 |<body>
                 |   $contentText
-                |</body>""".trimMargin(),
-            "text/html",
-            "utf-8",
-            null
-        )
+                |</body>
+                """.trimMargin(),
+                "text/html",
+                "utf-8",
+                null,
+            )
+        } catch (e: IllegalStateException) {
+            e.sendSilentlyWithAcraWithName("Context required is still null ?")
+        }
     }
 
-    fun scrollDown() {
+    fun volumeButtonScrollDown() {
         val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, height/2)
+        binding.nestedScrollView.smoothScrollBy(0, height / 2)
     }
 
-    fun scrollUp() {
+    fun volumeButtonScrollUp() {
         val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, -height/2)
+        binding.nestedScrollView.smoothScrollBy(0, -height / 2)
     }
 
-    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
+    private fun openInBrowserAfterFailing() {
         binding.progressBar.visibility = View.GONE
-        requireActivity().openItemUrlInternalBrowser(
-                url,
-                customTabsIntent,
-                requireActivity()
-        )
+        maybeIfContext {
+            it.openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+        }
     }
 
     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())
@@ -531,10 +553,13 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-
-            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
+        if (allImages != null &&
+            (
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                    binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+            )
+        ) {
+            val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
             intent.putExtra("allImages", allImages)
@@ -544,6 +569,4 @@ class ArticleFragment : Fragment(), DIAware {
         }
         return false
     }
-
-
 }

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

@@ -0,0 +1,213 @@
+package bou.amine.apps.readerforselfossv2.android.fragments
+
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import android.os.Build
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
+import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget
+import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
+import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
+import bou.amine.apps.readerforselfossv2.utils.getIcon
+import com.bumptech.glide.request.target.ViewTarget
+import com.bumptech.glide.request.transition.Transition
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.chip.Chip
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.android.x.closestDI
+import org.kodein.di.instance
+
+private const val DRAWABLE_SIZE = 30
+
+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
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        binding =
+            FilterFragmentBinding.inflate(
+                inflater,
+                container,
+                false,
+            )
+
+        try {
+            CoroutineScope(Dispatchers.Main).launch {
+                handleTagChips()
+                handleSourceChips()
+
+                binding.progressBar2.visibility = GONE
+                binding.filterView.visibility = VISIBLE
+            }
+        } catch (e: IllegalStateException) {
+            dismiss()
+            e.sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
+        }
+
+        binding.floatingActionButton2.setOnClickListener {
+            (activity as HomeActivity).getElementsAccordingToTab()
+            (activity as HomeActivity).fetchOnEmptyList()
+            dismiss()
+        }
+        return binding.root
+    }
+
+    private suspend fun handleSourceChips() {
+        val sourceGroup = binding.sourcesGroup
+
+        repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
+            val c: Chip? =
+                maybeIfContext {
+                    Chip(it)
+                } as Chip?
+
+            if (c == null) {
+                return
+            }
+
+            c.ellipsize = TextUtils.TruncateAt.END
+
+            maybeIfContext {
+                it.imageIntoViewTarget(
+                    source.getIcon(repository.baseUrl),
+                    object : ViewTarget<Chip?, Drawable?>(c) {
+                        override fun onResourceReady(
+                            resource: Drawable,
+                            transition: Transition<in Drawable?>?,
+                        ) {
+                            try {
+                                c.chipIcon = resource
+                            } catch (e: Exception) {
+                                e.sendSilentlyWithAcraWithName("sources > onResourceReady")
+                            }
+                        }
+                    },
+                    appSettingsService,
+                )
+            }
+
+            c.text = source.title.getHtmlDecoded()
+
+            c.setOnCloseIconClickListener {
+                (it as Chip).isCloseIconVisible = false
+                selectedChip = null
+                repository.setSourceFilter(null)
+            }
+
+            c.setOnClickListener {
+                if (selectedChip != null) {
+                    selectedChip!!.isCloseIconVisible = false
+                }
+                (it as Chip).isCloseIconVisible = true
+                selectedChip = it
+                repository.setSourceFilter(source)
+
+                repository.setTagFilter(null)
+            }
+
+            if (repository.sourceFilter.value?.equals(source) == true) {
+                c.isCloseIconVisible = true
+                selectedChip = c
+            }
+
+            c.isEnabled = source.error.isNullOrBlank()
+
+            if (!source.error.isNullOrBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                c.tooltipText = source.error
+            }
+
+            sourceGroup.addView(c)
+        }
+    }
+
+    private suspend fun handleTagChips() {
+        val tagGroup = binding.tagsGroup
+
+        val tags = repository.getTags()
+
+        tags.forEachIndexed { _, tag ->
+            val c: Chip? = maybeIfContext { Chip(it) } as Chip?
+            if (c == null) {
+                return
+            }
+
+            c.ellipsize = TextUtils.TruncateAt.END
+            c.text = tag.tag
+
+            if (tag.color.isNotEmpty()) {
+                try {
+                    val gd = GradientDrawable()
+                    val gdColor =
+                        try {
+                            Color.parseColor(tag.getColorHexCode())
+                        } catch (e: IllegalArgumentException) {
+                            e.sendSilentlyWithAcraWithName("color issue " + tag.color + " / " + tag.getColorHexCode())
+                            resources.getColor(R.color.colorPrimary)
+                        }
+                    gd.setColor(gdColor)
+                    gd.shape = GradientDrawable.RECTANGLE
+                    gd.setSize(DRAWABLE_SIZE, DRAWABLE_SIZE)
+                    gd.cornerRadius = DRAWABLE_SIZE.toFloat()
+                    c.chipIcon = gd
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
+                }
+            }
+
+            c.setOnCloseIconClickListener {
+                (it as Chip).isCloseIconVisible = false
+                selectedChip = null
+                repository.setTagFilter(null)
+            }
+
+            c.setOnClickListener {
+                if (selectedChip != null) {
+                    selectedChip!!.isCloseIconVisible = false
+                }
+                (it as Chip).isCloseIconVisible = true
+                selectedChip = it
+                repository.setTagFilter(tag)
+
+                repository.setSourceFilter(null)
+            }
+
+            if (repository.tagFilter.value?.equals(tag) == true) {
+                c.isCloseIconVisible = true
+                selectedChip = c
+            }
+
+            tagGroup.addView(c)
+        }
+    }
+
+    companion object {
+        const val TAG = "FilterModalBottomSheet"
+    }
+}

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

@@ -6,16 +6,21 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.databinding.FragmentImageBinding
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.RequestOptions
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapWithCache
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.android.x.closestDI
+import org.kodein.di.instance
 
-class ImageFragment : Fragment() {
-
-    private lateinit var imageUrl : String
-    private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+class ImageFragment :
+    Fragment(),
+    DIAware {
+    override val di: DI by closestDI()
+    private val appSettingsService: AppSettingsService by instance()
+    private lateinit var imageUrl: String
     private var _binding: FragmentImageBinding? = null
-    private val binding get() = _binding
+    val binding get() = _binding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -23,16 +28,16 @@ class ImageFragment : Fragment() {
         imageUrl = requireArguments().getString("imageUrl")!!
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
         _binding = FragmentImageBinding.inflate(inflater, container, false)
         val view = binding?.root
 
         binding!!.photoView.visibility = View.VISIBLE
-        Glide.with(activity)
-                .asBitmap()
-                .apply(glideOptions)
-                .load(imageUrl)
-                .into(binding!!.photoView)
+        requireActivity().bitmapWithCache(imageUrl, binding!!.photoView, appSettingsService)
 
         return view
     }
@@ -45,9 +50,7 @@ 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)
@@ -55,4 +58,4 @@ class ImageFragment : Fragment() {
             return fragment
         }
     }
-}
+}

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

@@ -2,27 +2,26 @@ package bou.amine.apps.readerforselfossv2.android.model
 
 import android.content.Context
 import android.webkit.URLUtil
+import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.glide.preloadImage
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 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
 
-fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
+fun SelfossModel.Item.preloadImages(
+    context: Context,
+    appSettingsService: AppSettingsService,
+): Boolean {
     val imageUrls = this.getImages()
 
-    val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
-
-
     try {
         for (url in imageUrls) {
-            if ( URLUtil.isValidUrl(url)) {
-                Glide.with(context).asBitmap()
-                    .apply(glideOptions)
-                    .load(url).submit()
+            if (URLUtil.isValidUrl(url)) {
+                context.preloadImage(url, appSettingsService)
             }
         }
-    } catch (e : Error) {
+    } catch (e: Error) {
+        e.sendSilentlyWithAcraWithName("preloadImages")
         return false
     }
 
@@ -35,8 +34,8 @@ fun String.toTextDrawableString(): String {
         try {
             textDrawable.append(s[0])
         } catch (e: StringIndexOutOfBoundsException) {
-            // We do nothing
+            e.sendSilentlyWithAcraWithName("toTextDrawableString")
         }
     }
     return textDrawable.toString()
-}
+}

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

@@ -3,9 +3,8 @@ package bou.amine.apps.readerforselfossv2.android.model
 import android.os.Parcel
 import android.os.Parcelable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import com.google.gson.annotations.SerializedName
 
-fun SelfossModel.Item.toParcelable() : ParecelableItem =
+fun SelfossModel.Item.toParcelable(): ParecelableItem =
     ParecelableItem(
         this.id,
         this.datetime,
@@ -17,9 +16,11 @@ fun SelfossModel.Item.toParcelable() : ParecelableItem =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags.joinToString(",")
+        this.tags.joinToString(","),
+        this.author,
     )
-fun ParecelableItem.toModel() : SelfossModel.Item =
+
+fun ParecelableItem.toModel(): SelfossModel.Item =
     SelfossModel.Item(
         this.id,
         this.datetime,
@@ -31,28 +32,32 @@ fun ParecelableItem.toModel() : SelfossModel.Item =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags.split(",")
+        this.tags.split(","),
+        this.author,
     )
-data class ParecelableItem(
-    @SerializedName("id") val id: Int,
-    @SerializedName("datetime") val datetime: String,
-    @SerializedName("title") val title: String,
-    @SerializedName("content") val content: String,
-    @SerializedName("unread") var unread: Boolean,
-    @SerializedName("starred") var starred: Boolean,
-    @SerializedName("thumbnail") val thumbnail: String?,
-    @SerializedName("icon") val icon: String?,
-    @SerializedName("link") val link: String,
-    @SerializedName("sourcetitle") val sourcetitle: String,
-    @SerializedName("tags") val tags: String
-) : Parcelable {
 
+data class ParecelableItem(
+    val id: Int,
+    val datetime: String,
+    val title: String,
+    val content: String,
+    var unread: Boolean,
+    var starred: Boolean,
+    val thumbnail: String?,
+    val icon: String?,
+    val link: String,
+    val sourcetitle: String,
+    val tags: String,
+    val author: String?,
+) : Parcelable {
     companion object {
         @JvmField
-        val CREATOR: Parcelable.Creator<ParecelableItem> = object : Parcelable.Creator<ParecelableItem> {
-            override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source)
-            override fun newArray(size: Int): Array<ParecelableItem?> = arrayOfNulls(size)
-        }
+        val CREATOR: Parcelable.Creator<ParecelableItem> =
+            object : Parcelable.Creator<ParecelableItem> {
+                override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source)
+
+                override fun newArray(size: Int): Array<ParecelableItem?> = arrayOfNulls(size)
+            }
     }
 
     constructor(source: Parcel) : this(
@@ -66,12 +71,16 @@ 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(dest: Parcel, flags: Int) {
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
         dest.writeInt(id)
         dest.writeString(datetime)
         dest.writeString(title)
@@ -83,5 +92,6 @@ data class ParecelableItem(
         dest.writeString(link)
         dest.writeString(sourcetitle)
         dest.writeString(tags)
+        dest.writeString(author)
     }
-}
+}

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

@@ -1,51 +1,51 @@
 package bou.amine.apps.readerforselfossv2.android.settings
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
 import android.text.InputFilter
 import android.text.InputType
 import android.text.TextWatcher
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.widget.addTextChangedListener
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.ftinc.scoop.Scoop
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.API_ITEMS_NUMBER
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.CURRENT_THEME
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.READER_FONT_SIZE
+import com.mikepenz.aboutlibraries.LibsBuilder
+import org.kodein.di.DIAware
+import org.kodein.di.android.closestDI
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
-class SettingsActivity : AppCompatActivity(),
-        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+const val MAX_ITEMS_NUMBER = 200
+
+private const val MIN_ITEMS_NUMBER = 1
+
+class SettingsActivity :
+    AppCompatActivity(),
+    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
+    DIAware {
+    override val di by closestDI()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("dark_theme", false)) {
-            setTheme(R.style.NoBarDark)
-        }
         val binding = ActivitySettingsBinding.inflate(layoutInflater)
 
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
         setContentView(binding.root)
         if (savedInstanceState == null) {
             supportFragmentManager
-                    .beginTransaction()
-                    .replace(R.id.settings, MainPreferenceFragment())
-                    .commit()
+                .beginTransaction()
+                .replace(R.id.settings, MainPreferenceFragment())
+                .commit()
         } else {
             title = savedInstanceState.getCharSequence(TITLE_TAG)
         }
@@ -68,154 +68,202 @@ class SettingsActivity : AppCompatActivity(),
         outState.putCharSequence(TITLE_TAG, title)
     }
 
-    override fun onSupportNavigateUp(): Boolean {
-        return if (supportFragmentManager.popBackStackImmediate()) {
+    override fun onSupportNavigateUp(): Boolean =
+        if (supportFragmentManager.popBackStackImmediate()) {
             supportActionBar?.title = getText(R.string.title_activity_settings)
             false
         } else {
             super.onBackPressed()
             true
         }
-    }
 
     override fun onPreferenceStartFragment(
-            caller: PreferenceFragmentCompat,
-            pref: Preference
+        caller: PreferenceFragmentCompat,
+        pref: Preference,
     ): Boolean {
         // Instantiate the new Fragment
         val args = pref.extras
-        val fragment = supportFragmentManager.fragmentFactory.instantiate(
-                classLoader,
-                pref.fragment
-        ).apply {
-            arguments = args
-            setTargetFragment(caller, 0)
-        }
+        val fragment =
+            supportFragmentManager.fragmentFactory
+                .instantiate(
+                    classLoader,
+                    pref.fragment.toString(),
+                ).apply {
+                    arguments = args
+                    setTargetFragment(caller, 0)
+                }
         // Replace the existing Fragment with the new Fragment
-        supportFragmentManager.beginTransaction()
-                .replace(R.id.settings, fragment)
-                .addToBackStack(null)
-                .commit()
+        supportFragmentManager
+            .beginTransaction()
+            .replace(R.id.settings, fragment)
+            .addToBackStack(null)
+            .commit()
         title = pref.title
         supportActionBar?.title = title
         return true
     }
 
     class MainPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
+
+            preferenceManager.findPreference<Preference>(CURRENT_THEME)?.onPreferenceChangeListener =
+                Preference.OnPreferenceChangeListener { _, newValue ->
+                    AppCompatDelegate.setDefaultNightMode(
+                        newValue.toString().toInt(),
+                    ) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                    true
+                }
+
+            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener { _ ->
+                    context?.let {
+                        LibsBuilder()
+                            .withAboutIconShown(true)
+                            .withAboutVersionShown(true)
+                            .start(it)
+                    }
+                    true
+                }
         }
     }
 
     class GeneralPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_general, rootKey)
 
-            val editTextPreference = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
+            val editTextPreference =
+                preferenceManager.findPreference<EditTextPreference>(API_ITEMS_NUMBER)
             editTextPreference?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.filters = arrayOf(
+                editText.filters =
+                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input: Int = (dest.toString() + source.toString()).toInt()
-                                if (input in 1..200) return@InputFilter null
+                                if (input in MIN_ITEMS_NUMBER..MAX_ITEMS_NUMBER) return@InputFilter null
                             } catch (nfe: NumberFormatException) {
-                                Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
+                                Toast
+                                    .makeText(
+                                        activity,
+                                        R.string.items_number_should_be_number,
+                                        Toast.LENGTH_LONG,
+                                    ).show()
                             }
                             ""
-                        }
-                )
+                        },
+                    )
             }
         }
     }
 
     class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_viewer, rootKey)
 
-            val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
+            val fontSize = preferenceManager.findPreference<EditTextPreference>(READER_FONT_SIZE)
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.addTextChangedListener { object : TextWatcher {
-                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                    override fun afterTextChanged(editable: Editable) {
-                        try {
-                            editText.textSize = editable.toString().toInt().toFloat()
-                        } catch (e: NumberFormatException) {
+                editText.addTextChangedListener {
+                    object : TextWatcher {
+                        override fun beforeTextChanged(
+                            charSequence: CharSequence,
+                            i: Int,
+                            i1: Int,
+                            i2: Int,
+                        ) {
+                            // We do nothing
+                        }
+
+                        override fun onTextChanged(
+                            charSequence: CharSequence,
+                            i: Int,
+                            i1: Int,
+                            i2: Int,
+                        ) {
+                            // We do nothing
+                        }
+
+                        override fun afterTextChanged(editable: Editable) {
+                            try {
+                                editText.textSize = editable.toString().toInt().toFloat()
+                            } catch (e: NumberFormatException) {
+                                e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
+                            }
                         }
                     }
-                } }
-                editText.filters = arrayOf(
+                }
+                editText.filters =
+                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input = (dest.toString() + source.toString()).toInt()
                                 if (input > 0) return@InputFilter null
                             } catch (nfe: NumberFormatException) {
+                                nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                             }
                             ""
-                        }
-                )
+                        },
+                    )
             }
         }
     }
 
     class OfflinePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_offline, rootKey)
         }
     }
 
-    class ThemePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            setPreferencesFromResource(R.xml.pref_theme, rootKey)
-            setHasOptionsMenu(true)
-        }
-
-        override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-            super.onCreateOptionsMenu(menu, inflater)
-            inflater.inflate(R.menu.settings_theme, menu)
-        }
-
-        override fun onOptionsItemSelected(item: MenuItem): Boolean {
-            val id = item.itemId
-            if (id == R.id.clear) {
-                AppColors.resetColors()
-                requireActivity().recreate()
-            }
-            return super.onOptionsItemSelected(item)
-        }
-    }
-
     class LinksPreferenceFragment : PreferenceFragmentCompat() {
-        private fun openUrl(uri: Uri?) {
-            val browserIntent = Intent(Intent.ACTION_VIEW, uri)
-            startActivity(browserIntent)
+        private fun openUrl(url: String) {
+            context?.openUrlInBrowser(url)
         }
 
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_links, rootKey)
 
-            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                openUrl(Uri.parse(AppSettingsService.trackerUrl))
-                true
-            }
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener {
+                    openUrl(AppSettingsService.BUG_URL)
+                    true
+                }
 
-            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                openUrl(Uri.parse(AppSettingsService.sourceUrl))
-                false
-            }
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener {
+                    openUrl(AppSettingsService.SOURCE_URL)
+                    false
+                }
 
-            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                openUrl(Uri.parse(AppSettingsService.translationUrl))
-                false
-            }
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
+                Preference.OnPreferenceClickListener {
+                    openUrl(AppSettingsService.TRANSLATION_URL)
+                    false
+                }
         }
     }
 
     class ExperimentalPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        override fun onCreatePreferences(
+            savedInstanceState: Bundle?,
+            rootKey: String?,
+        ) {
             setPreferencesFromResource(R.xml.pref_experimental, rootKey)
         }
     }
-}
+}

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

@@ -0,0 +1,20 @@
+package bou.amine.apps.readerforselfossv2.android.testing
+
+import androidx.test.espresso.idling.CountingIdlingResource
+
+object CountingIdlingResourceSingleton {
+    private const val RESOURCE = "GLOBAL"
+
+    @JvmField
+    val countingIdlingResource = CountingIdlingResource(RESOURCE)
+
+    fun increment() {
+        countingIdlingResource.increment()
+    }
+
+    fun decrement() {
+        if (!countingIdlingResource.isIdleNow) {
+            countingIdlingResource.decrement()
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+package bou.amine.apps.readerforselfossv2.android.testing
+
+import android.os.Build
+
+class TestingHelper {
+    fun isUnitTest(): Boolean {
+        var device = Build.DEVICE
+        var product = Build.PRODUCT
+        if (device == null) {
+            device = ""
+        }
+
+        if (product == null) {
+            product = ""
+        }
+        return device == "robolectric" && product == "robolectric"
+    }
+}

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

@@ -1,72 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.themes
-
-import android.app.Activity
-import androidx.annotation.ColorInt
-import bou.amine.apps.readerforselfossv2.android.R
-import com.russhwolf.settings.Settings
-
-class AppColors(a: Activity) {
-
-    @ColorInt val colorPrimary: Int
-    @ColorInt val colorPrimaryDark: Int
-    @ColorInt val colorAccent: Int
-    @ColorInt val colorAccentDark: Int
-    @ColorInt val colorBackground: Int
-    @ColorInt val textColor: Int
-    val isDarkTheme: Boolean
-
-    init {
-        val settings = Settings()
-
-        colorPrimary =
-                settings.getInt(
-                    "color_primary",
-                    a.resources.getColor(R.color.colorPrimary)
-                )
-        colorPrimaryDark =
-                settings.getInt(
-                    "color_primary_dark",
-                    a.resources.getColor(R.color.colorPrimaryDark)
-                )
-        colorAccent =
-                settings.getInt(
-                    "color_accent",
-                    a.resources.getColor(R.color.colorAccent)
-                )
-        colorAccentDark =
-                settings.getInt(
-                    "color_accent_dark",
-                    a.resources.getColor(R.color.colorAccentDark)
-                )
-        isDarkTheme =
-                settings.getBoolean(
-                    "dark_theme",
-                    false
-                )
-
-        colorBackground = if (isDarkTheme) {
-            a.setTheme(R.style.NoBarDark)
-            a.resources.getColor(R.color.darkBackground)
-        } else {
-            a.setTheme(R.style.NoBar)
-            a.resources.getColor(R.color.grey_50)
-        }
-
-        textColor = if (isDarkTheme) {
-            a.resources.getColor(R.color.white)
-        } else {
-            a.resources.getColor(R.color.grey_900)
-        }
-    }
-
-    companion object {
-        fun resetColors() {
-            val settings = Settings()
-            settings.remove("color_primary")
-            settings.remove("color_primary_dark")
-            settings.remove("color_accent")
-            settings.remove("color_accent_dark")
-            settings.remove("dark_theme")
-        }
-    }
-}

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

@@ -1,8 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.themes
-
-enum class Toppings(val value: Int) {
-    PRIMARY(1),
-    PRIMARY_DARK(2),
-    ACCENT(3),
-    ACCENT_DARK(4)
-}

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

@@ -2,20 +2,60 @@ package bou.amine.apps.readerforselfossv2.android.utils
 
 import android.content.Context
 import android.content.Intent
+import android.util.TypedValue
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 
-fun Context.shareLink(itemUrl: String, itemTitle: String) {
-    val sendIntent = Intent()
-    sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-    sendIntent.action = Intent.ACTION_SEND
-    sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
-    sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
-    sendIntent.type = "text/plain"
-    startActivity(
-        Intent.createChooser(
-            sendIntent,
-            getString(R.string.share)
-        ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-    )
-}
+fun Context.shareLink(
+    itemUrl: String?,
+    itemTitle: String,
+) {
+    if (itemUrl.isUrlValid()) {
+        val sendIntent = Intent()
+        sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        sendIntent.action = Intent.ACTION_SEND
+        sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl!!.toStringUriWithHttp())
+        sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
+        sendIntent.type = "text/plain"
+        startActivity(
+            Intent
+                .createChooser(
+                    sendIntent,
+                    getString(R.string.share),
+                ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+        )
+    }
+}
+
+@ColorInt
+fun Fragment.getColorFromAttr(
+    @AttrRes attrColor: Int,
+    resolveRefs: Boolean = true,
+): Int {
+    val typedValue = TypedValue()
+    maybeIfContextWithLog { this.requireContext().theme.resolveAttribute(attrColor, typedValue, resolveRefs) }
+    return typedValue.data
+}
+
+@Suppress("detekt:SwallowedException")
+fun Fragment.maybeIfContext(fn: (Context) -> Any): Any? {
+    try {
+        return fn(this.requireContext())
+    } catch (e: Exception) {
+        // Do nothing
+        return null
+    }
+}
+
+fun Fragment.maybeIfContextWithLog(fn: (Context) -> Any): Any? {
+    try {
+        return fn(this.requireContext())
+    } catch (e: Exception) {
+        e.sendSilentlyWithAcraWithName("Fragment context issue...")
+        return null
+    }
+}

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

@@ -0,0 +1,63 @@
+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 = colorScheme[abs(key.hashCode()) % colorScheme.size]
+    }

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

@@ -1,13 +1,10 @@
 package bou.amine.apps.readerforselfossv2.android.utils
 
 import android.app.Activity
-import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.graphics.BitmapFactory
 import android.net.Uri
-import android.os.Build
 import android.text.Spannable
 import android.text.style.ClickableSpan
 import android.util.Patterns
@@ -15,155 +12,40 @@ import android.view.MotionEvent
 import android.view.View
 import android.widget.TextView
 import android.widget.Toast
-import androidx.browser.customtabs.CustomTabsIntent
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.ReaderActivity
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
+import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
-fun Context.buildCustomTabsIntent(): CustomTabsIntent {
-
-    val actionIntent = Intent(Intent.ACTION_SEND)
-    actionIntent.type = "text/plain"
-    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        PendingIntent.FLAG_IMMUTABLE
-    } else {
-        0
-    }
-    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
-            this,
-            0,
-            actionIntent,
-            pflags
-        )
-
-    val intentBuilder = CustomTabsIntent.Builder()
-
-    // TODO: change to primary when it's possible to customize custom tabs title color
-    //intentBuilder.setToolbarColor(c.getResources().getColor(R.color.colorPrimary));
-    intentBuilder.setToolbarColor(resources.getColor(R.color.colorAccentDark))
-    intentBuilder.setShowTitle(true)
-
-
-    intentBuilder.setStartAnimations(
-        this,
-        R.anim.slide_in_right,
-        R.anim.slide_out_left
-    )
-    intentBuilder.setExitAnimations(
-        this,
-        android.R.anim.slide_in_left,
-        android.R.anim.slide_out_right
-    )
-
-    val closeicon = BitmapFactory.decodeResource(resources, R.drawable.ic_close_white_24dp)
-    intentBuilder.setCloseButtonIcon(closeicon)
-
-    val shareLabel = this.getString(R.string.label_share)
-    val icon = BitmapFactory.decodeResource(
-        resources,
-        R.drawable.ic_share_white_24dp
-    )
-    intentBuilder.setActionButton(icon, shareLabel, createPendingShareIntent)
-
-    return intentBuilder.build()
-}
-
-fun Context.openItemUrlInternally(
-    allItems: ArrayList<SelfossModel.Item>,
-    currentItem: Int,
-    linkDecoded: String,
-    customTabsIntent: CustomTabsIntent,
-    articleViewer: Boolean,
-    app: Activity
-) {
-    if (articleViewer) {
-        ReaderActivity.allItems = allItems
-        val intent = Intent(this, ReaderActivity::class.java)
-        intent.putExtra("currentItem", currentItem)
-        app.startActivity(intent)
-    } else {
-        this.openItemUrlInternalBrowser(
-                linkDecoded,
-                customTabsIntent,
-                app)
-    }
-}
-
-fun Context.openItemUrlInternalBrowser(
-        linkDecoded: String,
-        customTabsIntent: CustomTabsIntent,
-        app: Activity
-) {
-    try {
-        CustomTabActivityHelper.openCustomTab(
-                app,
-                customTabsIntent,
-                Uri.parse(linkDecoded)
-        ) { _, uri ->
-            val intent = Intent(Intent.ACTION_VIEW, uri)
-            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            startActivity(intent)
-        }
-    } catch (e: Exception) {
-        openInBrowser(linkDecoded, app)
-    }
-}
-
 fun Context.openItemUrl(
-    allItems: ArrayList<SelfossModel.Item>,
     currentItem: Int,
-    linkDecoded: String,
-    customTabsIntent: CustomTabsIntent,
-    internalBrowser: Boolean,
+    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
-        ).show()
+        Toast
+            .makeText(
+                this,
+                this.getString(R.string.cant_open_invalid_url),
+                Toast.LENGTH_LONG,
+            ).show()
     } else {
-        if (!internalBrowser) {
-            openInBrowser(linkDecoded, app)
-        } else if (articleViewer) {
-            this.openItemUrlInternally(
-                allItems,
-                currentItem,
-                linkDecoded,
-                customTabsIntent,
-                articleViewer,
-                app
-            )
+        if (articleViewer) {
+            val intent = Intent(this, ReaderActivity::class.java)
+            intent.putExtra("currentItem", currentItem)
+            app.startActivity(intent)
         } else {
-            this.openItemUrlInternalBrowser(
-                    linkDecoded,
-                    customTabsIntent,
-                    app
-            )
+            this.openUrlInBrowserAsNewTask(linkDecoded!!)
         }
     }
 }
 
-private fun openInBrowser(linkDecoded: String, app: Activity) {
-    val intent = Intent(Intent.ACTION_VIEW)
-    intent.data = Uri.parse(linkDecoded)
-    try {
-        app.startActivity(intent)
-    } catch (e: ActivityNotFoundException) {
-        Toast.makeText(app.baseContext, e.message, Toast.LENGTH_LONG).show()
-    }
-}
+fun String?.isUrlValid(): Boolean =
+    !this.isEmptyOrNullOrNullString() && this!!.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
-fun String.isUrlValid(): Boolean =
-    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
-
-fun String.isBaseUrlValid(ctx: Context): Boolean {
+fun String.isBaseUrlInvalid(): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
@@ -171,18 +53,42 @@ fun String.isBaseUrlValid(ctx: Context): Boolean {
         existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
     }
 
-    return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
+    return !(Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash)
 }
 
-fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) {
+fun Context.openItemUrlInBrowserAsNewTask(i: SelfossModel.Item) {
+    this.openUrlInBrowserAsNewTask(i.getLinkDecoded())
+}
+
+fun Context.openUrlInBrowserAsNewTask(url: String?) {
+    if (url.isUrlValid()) {
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        intent.data = Uri.parse(url)
+        this.mayBeStartActivity(intent)
+    }
+}
+
+fun Context.openUrlInBrowser(url: String) {
     val intent = Intent(Intent.ACTION_VIEW)
-    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
-    startActivity(intent)
+    intent.data = Uri.parse(url)
+    this.mayBeStartActivity(intent)
 }
 
-class LinkOnTouchListener: View.OnTouchListener {
-    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+@Suppress("detekt:SwallowedException")
+fun Context.mayBeStartActivity(intent: Intent) {
+    try {
+        this.startActivity(intent)
+    } catch (e: ActivityNotFoundException) {
+        Toast.makeText(this, getString(R.string.no_browser), Toast.LENGTH_SHORT).show()
+    }
+}
+
+class LinkOnTouchListener : View.OnTouchListener {
+    override fun onTouch(
+        v: View?,
+        event: MotionEvent?,
+    ): Boolean {
         var ret = false
         val widget: TextView = v as TextView
         val text: CharSequence = widget.text
@@ -191,7 +97,8 @@ class LinkOnTouchListener: View.OnTouchListener {
         val action = event!!.action
 
         if (action == MotionEvent.ACTION_UP ||
-            action == MotionEvent.ACTION_DOWN) {
+            action == MotionEvent.ACTION_DOWN
+        ) {
             var x: Float = event.x
             var y: Float = event.y
 

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

@@ -0,0 +1,9 @@
+package bou.amine.apps.readerforselfossv2.android.utils.acra
+
+import org.acra.ACRA
+import org.acra.ktx.sendSilentlyWithAcra
+
+fun Throwable.sendSilentlyWithAcraWithName(name: String) {
+    ACRA.errorReporter.putCustomData("error_source", name)
+    this.sendSilentlyWithAcra()
+}

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

@@ -0,0 +1,26 @@
+package bou.amine.apps.readerforselfossv2.android.utils.acra
+
+import android.content.Context
+import android.os.DeadSystemException
+import com.google.auto.service.AutoService
+import org.acra.builder.ReportBuilder
+import org.acra.config.CoreConfiguration
+import org.acra.config.ReportingAdministrator
+import org.acra.data.CrashReportData
+
+@AutoService(ReportingAdministrator::class)
+class AcraReportingAdministrator : ReportingAdministrator {
+    override fun shouldStartCollecting(
+        context: Context,
+        config: CoreConfiguration,
+        reportBuilder: ReportBuilder,
+    ): Boolean =
+        reportBuilder.exception !is DeadSystemException &&
+            (reportBuilder.exception != null && reportBuilder.exception!!::class.simpleName != "CannotDeliverBroadcastException")
+
+    override fun shouldSendReport(
+        context: Context,
+        config: CoreConfiguration,
+        crashReportData: CrashReportData,
+    ): Boolean = crashReportData.get("BRAND") != "redroid" && !crashReportData.get("PHONE_MODEL").toString().startsWith("sdk_gphone")
+}

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

@@ -1,6 +1,13 @@
 package bou.amine.apps.readerforselfossv2.android.utils.bottombar
 
+import android.content.Context
+import android.graphics.drawable.Drawable
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import bou.amine.apps.readerforselfossv2.android.R
 import com.ashokvarma.bottomnavigation.TextBadgeItem
+import com.leinardi.android.speeddial.SpeedDialActionItem
+import com.leinardi.android.speeddial.SpeedDialView
 
 fun TextBadgeItem.removeBadge(): TextBadgeItem {
     this.setText("")
@@ -8,5 +15,26 @@ 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
+
+@Suppress("detekt:LongParameterList")
+fun SpeedDialView.addHomeMadeActionItem(
+    @IdRes actionId: Int,
+    actionIcon: Drawable,
+    @StringRes labelId: Int,
+    colorOnSurface: Int,
+    colorSurface: Int,
+    context: Context,
+) {
+    this.addActionItem(
+        SpeedDialActionItem
+            .Builder(actionId, actionIcon)
+            .setFabBackgroundColor(context.resources.getColor(R.color.colorAccent))
+            .setFabImageTintColor(colorOnSurface)
+            .setLabel(context.getString(labelId))
+            .setLabelClickable(false)
+            .setLabelBackgroundColor(colorOnSurface)
+            .setLabelColor(colorSurface)
+            .create(),
+    )
+}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabActivityHelper.java

@@ -1,153 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-import androidx.browser.customtabs.CustomTabsClient;
-import androidx.browser.customtabs.CustomTabsIntent;
-import androidx.browser.customtabs.CustomTabsServiceConnection;
-import androidx.browser.customtabs.CustomTabsSession;
-
-import java.util.List;
-
-/**
- * This is a helper class to manage the connection to the Custom Tabs Service.
- */
-public class CustomTabActivityHelper implements ServiceConnectionCallback {
-    private CustomTabsSession mCustomTabsSession;
-    private CustomTabsClient mClient;
-    private CustomTabsServiceConnection mConnection;
-    private ConnectionCallback mConnectionCallback;
-
-    /**
-     * Opens the URL on a Custom Tab if possible. Otherwise fallsback to opening it on a WebView.
-     *
-     * @param activity         The host activity.
-     * @param customTabsIntent a CustomTabsIntent to be used if Custom Tabs is available.
-     * @param uri              the Uri to be opened.
-     * @param fallback         a CustomTabFallback to be used if Custom Tabs is not available.
-     */
-    public static void openCustomTab(Activity activity,
-                                     CustomTabsIntent customTabsIntent,
-                                     Uri uri,
-                                     CustomTabFallback fallback) {
-        String packageName = CustomTabsHelper.getPackageNameToUse(activity);
-
-        //If we cant find a package name, it means theres no browser that supports
-        //Chrome Custom Tabs installed. So, we fallback to the webview
-        if (packageName == null) {
-            if (fallback != null) {
-                fallback.openUri(activity, uri);
-            }
-        } else {
-            customTabsIntent.intent.setPackage(packageName);
-            customTabsIntent.launchUrl(activity, uri);
-        }
-    }
-
-    /**
-     * Unbinds the Activity from the Custom Tabs Service.
-     *
-     * @param activity the activity that is connected to the service.
-     */
-    public void unbindCustomTabsService(Activity activity) {
-        if (mConnection == null) return;
-        activity.unbindService(mConnection);
-        mClient = null;
-        mCustomTabsSession = null;
-        mConnection = null;
-    }
-
-    /**
-     * Creates or retrieves an exiting CustomTabsSession.
-     *
-     * @return a CustomTabsSession.
-     */
-    public CustomTabsSession getSession() {
-        if (mClient == null) {
-            mCustomTabsSession = null;
-        } else if (mCustomTabsSession == null) {
-            mCustomTabsSession = mClient.newSession(null);
-        }
-        return mCustomTabsSession;
-    }
-
-    /**
-     * Register a Callback to be called when connected or disconnected from the Custom Tabs Service.
-     *
-     * @param connectionCallback
-     */
-    public void setConnectionCallback(ConnectionCallback connectionCallback) {
-        this.mConnectionCallback = connectionCallback;
-    }
-
-    /**
-     * Binds the Activity to the Custom Tabs Service.
-     *
-     * @param activity the activity to be binded to the service.
-     */
-    public void bindCustomTabsService(Activity activity) {
-        if (mClient != null) return;
-
-        String packageName = CustomTabsHelper.getPackageNameToUse(activity);
-        if (packageName == null) return;
-
-        mConnection = new ServiceConnection(this);
-        CustomTabsClient.bindCustomTabsService(activity, packageName, mConnection);
-    }
-
-    /**
-     * @return true if call to mayLaunchUrl was accepted.
-     * @see {@link CustomTabsSession#mayLaunchUrl(Uri, Bundle, List)}.
-     */
-    public boolean mayLaunchUrl(Uri uri, Bundle extras, List<Bundle> otherLikelyBundles) {
-        if (mClient == null) return false;
-
-        CustomTabsSession session = getSession();
-        return session != null && session.mayLaunchUrl(uri, extras, otherLikelyBundles);
-
-    }
-
-    @Override
-    public void onServiceConnected(CustomTabsClient client) {
-        mClient = client;
-        mClient.warmup(0L);
-        if (mConnectionCallback != null) mConnectionCallback.onCustomTabsConnected();
-    }
-
-    @Override
-    public void onServiceDisconnected() {
-        mClient = null;
-        mCustomTabsSession = null;
-        if (mConnectionCallback != null) mConnectionCallback.onCustomTabsDisconnected();
-    }
-
-    /**
-     * A Callback for when the service is connected or disconnected. Use those callbacks to
-     * handle UI changes when the service is connected or disconnected.
-     */
-    public interface ConnectionCallback {
-        /**
-         * Called when the service is connected.
-         */
-        void onCustomTabsConnected();
-
-        /**
-         * Called when the service is disconnected.
-         */
-        void onCustomTabsDisconnected();
-    }
-
-    /**
-     * To be used as a fallback to open the Uri when Custom Tabs is not available.
-     */
-    public interface CustomTabFallback {
-        /**
-         * @param activity The Activity that wants to open the Uri.
-         * @param uri      The uri to be opened by the fallback.
-         */
-        void openUri(Activity activity, Uri uri);
-    }
-
-}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabsHelper.java

@@ -1,129 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-import androidx.browser.customtabs.CustomTabsService;
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.helpers.KeepAliveService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings("ALL")
-class CustomTabsHelper {
-    private static final String TAG = "CustomTabsHelper";
-    private static final String STABLE_PACKAGE = "com.android.chrome";
-    private static final String BETA_PACKAGE = "com.chrome.beta";
-    private static final String DEV_PACKAGE = "com.chrome.dev";
-    private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
-    private static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE =
-            "android.support.customtabs.extra.KEEP_ALIVE";
-
-    private static String sPackageNameToUse;
-
-    private CustomTabsHelper() {
-    }
-
-    public static void addKeepAliveExtra(Context context, Intent intent) {
-        Intent keepAliveIntent = new Intent().setClassName(
-                context.getPackageName(), KeepAliveService.class.getCanonicalName());
-        intent.putExtra(EXTRA_CUSTOM_TABS_KEEP_ALIVE, keepAliveIntent);
-    }
-
-    /**
-     * Goes through all apps that handle VIEW intents and have a warmup service. Picks
-     * the one chosen by the user if there is one, otherwise makes a best effort to return a
-     * valid package name.
-     * <p>
-     * This is <strong>not</strong> threadsafe.
-     *
-     * @param context {@link Context} to use for accessing {@link PackageManager}.
-     * @return The package name recommended to use for connecting to custom tabs related components.
-     */
-    public static String getPackageNameToUse(Context context) {
-        if (sPackageNameToUse != null) return sPackageNameToUse;
-
-        PackageManager pm = context.getPackageManager();
-        // Get default VIEW intent handler.
-        Intent activityIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"));
-        ResolveInfo defaultViewHandlerInfo = pm.resolveActivity(activityIntent, 0);
-        String defaultViewHandlerPackageName = null;
-        if (defaultViewHandlerInfo != null) {
-            defaultViewHandlerPackageName = defaultViewHandlerInfo.activityInfo.packageName;
-        }
-
-        // Get all apps that can handle VIEW intents.
-        List<ResolveInfo> resolvedActivityList = pm.queryIntentActivities(activityIntent, 0);
-        List<String> packagesSupportingCustomTabs = new ArrayList<>();
-        for (ResolveInfo info : resolvedActivityList) {
-            Intent serviceIntent = new Intent();
-            serviceIntent.setAction(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION);
-            serviceIntent.setPackage(info.activityInfo.packageName);
-            if (pm.resolveService(serviceIntent, 0) != null) {
-                packagesSupportingCustomTabs.add(info.activityInfo.packageName);
-            }
-        }
-
-        // Now packagesSupportingCustomTabs contains all apps that can handle both VIEW intents
-        // and service calls.
-        if (packagesSupportingCustomTabs.isEmpty()) {
-            sPackageNameToUse = null;
-        } else if (packagesSupportingCustomTabs.size() == 1) {
-            sPackageNameToUse = packagesSupportingCustomTabs.get(0);
-        } else if (!TextUtils.isEmpty(defaultViewHandlerPackageName)
-                && !hasSpecializedHandlerIntents(context, activityIntent)
-                && packagesSupportingCustomTabs.contains(defaultViewHandlerPackageName)) {
-            sPackageNameToUse = defaultViewHandlerPackageName;
-        } else if (packagesSupportingCustomTabs.contains(STABLE_PACKAGE)) {
-            sPackageNameToUse = STABLE_PACKAGE;
-        } else if (packagesSupportingCustomTabs.contains(BETA_PACKAGE)) {
-            sPackageNameToUse = BETA_PACKAGE;
-        } else if (packagesSupportingCustomTabs.contains(DEV_PACKAGE)) {
-            sPackageNameToUse = DEV_PACKAGE;
-        } else if (packagesSupportingCustomTabs.contains(LOCAL_PACKAGE)) {
-            sPackageNameToUse = LOCAL_PACKAGE;
-        }
-        return sPackageNameToUse;
-    }
-
-    /**
-     * Used to check whether there is a specialized handler for a given intent.
-     *
-     * @param intent The intent to check with.
-     * @return Whether there is a specialized handler for the given intent.
-     */
-    private static boolean hasSpecializedHandlerIntents(Context context, Intent intent) {
-        try {
-            PackageManager pm = context.getPackageManager();
-            List<ResolveInfo> handlers = pm.queryIntentActivities(
-                    intent,
-                    PackageManager.GET_RESOLVED_FILTER);
-            if (handlers == null || handlers.isEmpty()) {
-                return false;
-            }
-            for (ResolveInfo resolveInfo : handlers) {
-                IntentFilter filter = resolveInfo.filter;
-                if (filter == null) continue;
-                if (filter.countDataAuthorities() == 0 || filter.countDataPaths() == 0) continue;
-                if (resolveInfo.activityInfo == null) continue;
-                return true;
-            }
-        } catch (RuntimeException e) {
-            Log.e(TAG, "Runtime exception while getting specialized handlers");
-        }
-        return false;
-    }
-
-    /**
-     * @return All possible chrome package names that provide custom tabs feature.
-     */
-    public static String[] getPackages() {
-        return new String[]{"", STABLE_PACKAGE, BETA_PACKAGE, DEV_PACKAGE, LOCAL_PACKAGE};
-    }
-}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnection.java

@@ -1,33 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import android.content.ComponentName;
-import androidx.browser.customtabs.CustomTabsClient;
-import androidx.browser.customtabs.CustomTabsServiceConnection;
-
-import java.lang.ref.WeakReference;
-
-/**
- * Implementation for the CustomTabsServiceConnection that avoids leaking the
- * ServiceConnectionCallback
- */
-public class ServiceConnection extends CustomTabsServiceConnection {
-    // A weak reference to the ServiceConnectionCallback to avoid leaking it.
-    private WeakReference<ServiceConnectionCallback> mConnectionCallback;
-
-    public ServiceConnection(ServiceConnectionCallback connectionCallback) {
-        mConnectionCallback = new WeakReference<>(connectionCallback);
-    }
-
-    @Override
-    public void onCustomTabsServiceConnected(ComponentName name, CustomTabsClient client) {
-        ServiceConnectionCallback connectionCallback = mConnectionCallback.get();
-        if (connectionCallback != null) connectionCallback.onServiceConnected(client);
-    }
-
-    @Override
-    public void onServiceDisconnected(ComponentName name) {
-        ServiceConnectionCallback connectionCallback = mConnectionCallback.get();
-        if (connectionCallback != null) connectionCallback.onServiceDisconnected();
-    }
-}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnectionCallback.java

@@ -1,19 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import androidx.browser.customtabs.CustomTabsClient;
-
-
-public interface ServiceConnectionCallback {
-    /**
-     * Called when the service is connected.
-     *
-     * @param client a CustomTabsClient
-     */
-    void onServiceConnected(CustomTabsClient client);
-
-    /**
-     * Called when the service is disconnected.
-     */
-    void onServiceDisconnected();
-}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/helpers/KeepAliveService.java

@@ -1,15 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs.helpers;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.IBinder;
-
-public class KeepAliveService extends Service {
-    private static final Binder sBinder = new Binder();
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return sBinder;
-    }
-}

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

@@ -1,14 +0,0 @@
-/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomBaseViewHolder.java */
-package bou.amine.apps.readerforselfossv2.android.utils.drawer
-
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import bou.amine.apps.readerforselfossv2.android.R
-
-open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
-    var icon: ImageView = view.findViewById(R.id.material_drawer_icon)
-    var name: TextView = view.findViewById(R.id.material_drawer_name)
-    var description: TextView = view.findViewById(R.id.material_drawer_description)
-}

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

@@ -2,41 +2,135 @@ package bou.amine.apps.readerforselfossv2.android.utils.glide
 
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.webkit.WebView
 import android.widget.ImageView
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
+import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.LazyHeaders
 import com.bumptech.glide.request.RequestOptions
-import com.bumptech.glide.request.target.BitmapImageViewTarget
+import com.bumptech.glide.request.target.ViewTarget
+import com.google.android.material.chip.Chip
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
 
-fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
-    Glide.with(this)
-        .asBitmap()
-        .load(url)
-        .apply(RequestOptions.centerCropTransform())
-        .into(iv)
+private const val PRELOAD_IMAGE_TIMEOUT = 10000
 
-fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    Glide.with(this)
-        .asBitmap()
-        .load(url)
-        .apply(RequestOptions.centerCropTransform())
-        .into(object : BitmapImageViewTarget(iv) {
-            override fun setResource(resource: Bitmap?) {
-                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(
-                    resources,
-                    resource
-                )
-                circularBitmapDrawable.isCircular = true
-                iv.setImageDrawable(circularBitmapDrawable)
-            }
-        })
+@Suppress("detekt:ReturnCount")
+@OptIn(ExperimentalEncodingApi::class)
+fun String.toGlideUrl(appSettingsService: AppSettingsService): Any { // GlideUrl Or String
+    if (this.isEmptyOrNullOrNullString()) {
+        return ""
+    }
+    if (appSettingsService.getBasicUserName().isNotEmpty()) {
+        val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}"
+        val authBuf = Base64.encode(authString.toByteArray(Charsets.UTF_8))
 
-fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
+        return GlideUrl(
+            this,
+            LazyHeaders
+                .Builder()
+                .addHeader("Authorization", "Basic $authBuf")
+                .build(),
+        )
+    } else {
+        return GlideUrl(
+            this,
+        )
+    }
+}
+
+fun WebView.getGlideImageForResource(
+    url: String,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL))
+    .load(url.toGlideUrl(appSettingsService))
+    .submit()
+    .get()
+
+fun Context.preloadImage(
+    url: String,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(PRELOAD_IMAGE_TIMEOUT))
+    .load(url.toGlideUrl(appSettingsService))
+    .submit()
+
+fun Context.imageIntoViewTarget(
+    url: String,
+    target: ViewTarget<Chip?, Drawable?>,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .load(url.toGlideUrl(appSettingsService))
+    .into(target)
+
+fun Context.bitmapWithCache(
+    url: String,
+    iv: ImageView,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL))
+    .load(url.toGlideUrl(appSettingsService))
+    .into(iv)
+
+fun Context.bitmapCenterCrop(
+    url: String,
+    iv: ImageView,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .load(url.toGlideUrl(appSettingsService))
+    .apply(RequestOptions.centerCropTransform())
+    .into(iv)
+
+fun Context.bitmapFitCenter(
+    url: String,
+    iv: ImageView,
+    appSettingsService: AppSettingsService,
+) = Glide
+    .with(this)
+    .asBitmap()
+    .load(url.toGlideUrl(appSettingsService))
+    .apply(RequestOptions.fitCenterTransform())
+    .into(iv)
+
+fun Context.circularDrawable(
+    url: String,
+    view: CircleImageView,
+    appSettingsService: AppSettingsService,
+) {
+    view.textView.text = ""
+
+    Glide
+        .with(this)
+        .load(url.toGlideUrl(appSettingsService))
+        .into(view.imageView)
+}
+
+private const val BITMAP_INPUT_STREAM_COMPRESSION_QUALITY = 80
+
+fun getBitmapInputStream(
+    bitmap: Bitmap,
+    compressFormat: Bitmap.CompressFormat,
+): InputStream {
     val byteArrayOutputStream = ByteArrayOutputStream()
-    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
+    bitmap.compress(compressFormat, BITMAP_INPUT_STREAM_COMPRESSION_QUALITY, byteArrayOutputStream)
     val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
     return ByteArrayInputStream(bitmapData)
-}
+}

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

@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android.utils.network
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
-import android.os.Build
 import com.google.android.material.snackbar.Snackbar
 
 lateinit var s: Snackbar
@@ -11,19 +10,13 @@ lateinit var s: Snackbar
 fun isNetworkAccessible(context: Context): Boolean {
     val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        val network = connectivityManager.activeNetwork ?: return false
-        val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
+    val networkCapabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork) ?: return false
 
-        return when {
-            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
-            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-            else -> false
-        }
-    } else {
-        val network = connectivityManager.activeNetworkInfo ?: return false
-        return network.isConnectedOrConnecting
+    return when {
+        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
+        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+        else -> false
     }
-}
+}

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

@@ -1,30 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.viewmodel
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import bou.amine.apps.readerforselfossv2.repository.Repository
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
-
-class AppViewModel(private val repository: Repository) : ViewModel() {
-    private val _networkAvailableProvider = MutableSharedFlow<Boolean>()
-    val networkAvailableProvider = _networkAvailableProvider.asSharedFlow()
-    private var wasConnected = true
-
-    init {
-        viewModelScope.launch {
-            repository.isConnectionAvailable.collect { isConnected ->
-                if (repository.connectionMonitored) {
-                    if (isConnected && !wasConnected && repository.connectionMonitored) {
-                        _networkAvailableProvider.emit(true)
-                        wasConnected = true
-                    } else if (!isConnected && wasConnected && repository.connectionMonitored){
-                        _networkAvailableProvider.emit(false)
-                        wasConnected = false
-                    }
-                }
-            }
-        }
-    }
-}

androidApp/src/main/res/anim/slide_in_right.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Google Inc. All Rights Reserved.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-         http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="100%p" android:toXDelta="0"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-</set>

androidApp/src/main/res/anim/slide_out_left.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Google Inc. All Rights Reserved.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-         http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0" android:toXDelta="-100%p"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-</set>

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

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:drawable="@color/ic_launcher_background"/>
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="?attr/colorSurface" />
+        </shape>
+    </item>
 
     <item>
         <bitmap

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

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

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
+</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>

androidApp/src/main/res/font/open_sans.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-        app:fontProviderAuthority="com.google.android.gms.fonts"
-        app:fontProviderPackage="com.google.android.gms"
-        app:fontProviderQuery="Open Sans"
-        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
-</font-family>

androidApp/src/main/res/font/roboto.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-        app:fontProviderAuthority="com.google.android.gms.fonts"
-        app:fontProviderPackage="com.google.android.gms"
-        app:fontProviderQuery="Roboto"
-        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
-</font-family>

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

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawerContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity"
     android:fitsSystemWindows="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
@@ -32,8 +31,10 @@
                         android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
-                        app:theme="@style/ToolBarStyle"
-                        app:popupTheme="?attr/toolbarPopupTheme" />
+                        android:theme="@style/ToolBarStyle"
+                        app:popupTheme="?attr/toolbarPopupTheme"
+
+                        />
 
                 </com.google.android.material.appbar.AppBarLayout>
 
@@ -45,19 +46,19 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:background="?android:attr/windowBackground">
+                        android:background="?android:attr/windowBackground"
+                        android:orientation="vertical">
 
                         <TextView
                             android:id="@+id/emptyText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:background="@android:color/transparent"
                             android:gravity="center_horizontal"
                             android:paddingTop="100dp"
                             android:text="@string/nothing_here"
                             android:textAlignment="center"
                             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                            android:background="@android:color/transparent"
                             android:visibility="gone" />
 
                         <androidx.recyclerview.widget.RecyclerView
@@ -69,7 +70,7 @@
                             android:paddingBottom="60dp"
                             android:scrollbars="vertical"
                             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                            tools:listitem="@layout/list_item"/>
+                            tools:listitem="@layout/list_item" />
                     </LinearLayout>
 
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -77,17 +78,13 @@
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
         <com.ashokvarma.bottomnavigation.BottomNavigationBar
-            android:layout_gravity="bottom"
             android:id="@+id/bottomBar"
             android:layout_width="match_parent"
-            android:layout_height="60dp"/>
+            android:layout_height="60dp"
+            android:layout_gravity="bottom"
+            app:bnbActiveColor="@color/colorAccent"
+            app:bnbBackgroundColor="?attr/bottomBarBackground" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
-        android:id="@+id/mainDrawer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true" />
 </androidx.drawerlayout.widget.DrawerLayout>

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

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

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

@@ -1,11 +1,12 @@
 <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">
@@ -14,18 +15,17 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ToolBarStyle"
+            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:gravity="center"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin">
+        android:padding="@dimen/activity_horizontal_margin">
         <!-- Login progress -->
         <ProgressBar
             android:id="@+id/loginProgress"
@@ -33,67 +33,72 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
-        <ScrollView
+        <LinearLayout
             android:id="@+id/loginForm"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <EditText
+                android:id="@+id/urlView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:hint="@string/prompt_url"
+                android:imeOptions="actionUnspecified"
+                android:importantForAutofill="no"
+                android:inputType="textUri"
+                android:maxLines="1"
+                android:minHeight="48dp" />
 
-                <EditText
-                    android:id="@+id/urlView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/prompt_url"
-                    android:imeOptions="actionUnspecified"
-                    android:importantForAutofill="no"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/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:text="@string/withLoginSwitch"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:id="@+id/withLogin"
-                    android:layout_weight="1"/>
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/withLogin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/withLoginSwitch"
+                android:textAlignment="viewStart" />
 
-                <EditText
-                    android:id="@+id/loginView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="username"
-                    android:hint="@string/prompt_login"
-                    android:inputType="text"
-                    android:maxLines="1"
-                    android:visibility="gone" />
+            <EditText
+                android:id="@+id/loginView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="username"
+                android:hint="@string/prompt_login"
+                android:inputType="text"
+                android:maxLines="1"
+                android:minHeight="48dp"
+                android:visibility="gone" />
 
-                <EditText
-                    android:id="@+id/passwordView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="password"
-                    android:hint="@string/prompt_password"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:visibility="gone" />
+            <EditText
+                android:id="@+id/passwordView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="password"
+                android:hint="@string/prompt_password"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:minHeight="48dp"
+                android:visibility="gone" />
 
-                <Button
-                    android:id="@+id/signInButton"
-                    style="?android:textAppearanceSmall"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp"
-                    android:text="@string/action_sign_in"
-                    android:textStyle="bold" />
+            <Button
+                android:id="@+id/signInButton"
+                style="?android:textAppearanceSmall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/action_sign_in"
+                android:textStyle="bold" />
 
-            </LinearLayout>
-        </ScrollView>
+        </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

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

@@ -17,8 +17,10 @@
             android:id="@+id/toolBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:theme="@style/ToolBarStyle"
             app:popupTheme="?attr/toolbarPopupTheme"
-            app:theme="@style/ToolBarStyle" />
+
+            />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,11 +9,11 @@
         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" />
+             />
     </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout

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

@@ -10,12 +10,12 @@
         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"
-            app:theme="@style/ToolBarStyle"
-            app:popupTheme="?attr/toolbarPopupTheme" />
+
+             />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -24,7 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/source_list_item">
     </androidx.recyclerview.widget.RecyclerView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton

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

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

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

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

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

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

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

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/progressBar2"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/filterView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <TextView
+                android:id="@+id/filterTagsTitle"
+                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/filter_item_tags"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/filterSourcesTitle"
+                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/filter_item_sources"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
+
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/tagsGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
+                app:singleSelection="true">
+
+            </com.google.android.material.chip.ChipGroup>
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/sourcesGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
+
+            </com.google.android.material.chip.ChipGroup>
+
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/floatingActionButton2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                android:clickable="true"
+                android:contentDescription="@string/menu_home_search"
+                android:focusable="true"
+                app:backgroundTint="@color/colorAccent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:rippleColor="@color/colorAccentDark"
+                app:srcCompat="@drawable/ic_menu_search_white_24dp" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,4 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -22,10 +21,22 @@
                 android:layout_width="0dp"
                 android:layout_height="200dp"
                 android:scaleType="centerCrop"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/titleView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginRight="16dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
             <TextView
                 android:id="@+id/source"
@@ -36,40 +47,23 @@
                 android:layout_marginRight="16dp"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="12sp"
-                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/titleView" />
 
-            <TextView
-                android:id="@+id/titleView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="8dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:textStyle="bold"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-
             <WebView
                 android:id="@+id/webcontent"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginRight="16dp"
+                android:background="?attr/webviewBackground"
+                android:paddingBottom="48dp"
                 android:textColorLink="?attr/colorAccent"
                 android:visibility="gone"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="24dp"
-                android:paddingBottom="48dp"
-                android:background="?android:colorBackground"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/source"
                 tools:visibility="visible" />
 
@@ -77,46 +71,23 @@
 
     </androidx.core.widget.NestedScrollView>
 
-    <FrameLayout
-        android:layout_width="match_parent"
+    <com.leinardi.android.speeddial.SpeedDialView
+        android:id="@+id/speedDial"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_gravity="end|bottom|right">
-
-        <com.github.rubensousa.floatingtoolbar.FloatingToolbar
-            android:id="@+id/floatingToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_gravity="bottom"
-            app:floatingMenu="@menu/reader_toolbar" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom|right"
-            android:layout_marginBottom="16dp"
-            android:layout_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"
-            app:rippleColor="?attr/colorAccentDark" />
-    </FrameLayout>
+        android:layout_gravity="bottom|end"
+        app:layout_behavior="@string/speeddial_scrolling_view_snackbar_behavior"
+        app:sdMainFabClosedSrc="@drawable/ic_add_white_24dp" />
 
     <FrameLayout
         android:id="@+id/progressBar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        android:animateLayoutChanges="true"
         android:alpha="0.8"
+        android:animateLayoutChanges="true"
         android:background="@color/black"
-        android:clickable="false">
+        android:clickable="false"
+        android:visibility="gone">
 
         <ProgressBar
             style="?android:attr/progressBarStyleLarge"
@@ -126,4 +97,5 @@
             android:progressTint="?attr/colorAccent" />
     </FrameLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

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

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

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

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

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

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

@@ -8,18 +8,40 @@
         app:showAsAction="ifRoom|collapseActionView"
         app:actionViewClass="androidx.appcompat.widget.SearchView" />
 
+    <item android:id="@+id/action_filter"
+        android:title="@string/menu_home_filter"
+        android:icon="@drawable/ic_baseline_filter_alt_24"
+        android:orderInCategory="1"
+        app:showAsAction="always" />
+
     <item android:id="@+id/readAll"
           android:icon="@drawable/ic_menu_done_all_white_24dp"
           android:title="@string/readAll"
-          android:orderInCategory="1"
-          app:showAsAction="always"/>
+          android:orderInCategory="2"
+          app:showAsAction="ifRoom"/>
+
+    <item android:id="@+id/action_sources"
+        android:title="@string/menu_home_sources"
+        android:orderInCategory="97"
+        app:showAsAction="never"/>
+
+    <item android:id="@+id/action_settings"
+        android:title="@string/title_activity_settings"
+        android:orderInCategory="98"
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/refresh"
-        android:icon="@drawable/ic_menu_refresh_white_24dp"
-        android:orderInCategory="99"
+        app:showAsAction="never"
+        android:orderInCategory="101"
         android:title="@string/menu_home_refresh" />
 
+    <item
+        android:id="@+id/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,6 +3,13 @@
       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,19 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/unread_action"
-        android:icon="@drawable/ic_baseline_white_eye_24dp"
-        android:title="@string/unmark"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/more_action"
-        android:icon="@drawable/ic_chrome_reader_mode_white_24dp"
-        android:title="@string/reader_action_more"
-        app:showAsAction="ifRoom" />
-
     <item
         android:id="@+id/open_action"
         android:icon="@drawable/ic_open_in_browser_white_24dp"