Fetch badges and version on network available.

.drone.yml

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

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

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

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

.gitea/workflows/common_build.yml

@@ -1,61 +0,0 @@
-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/on_merge_on_release.yml

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

@@ -1,91 +0,0 @@
-name: Check PR code
-on:
-  pull_request:
-    branches:
-      - master
-      - chore-crowdin-ci
-
-jobs:
-  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

@@ -1,9 +0,0 @@
-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-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
+You can fork the repository, and [help me solve some issues](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
 
 ### What I can't help you with.
 
@@ -46,3 +46,28 @@ 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,9 +320,4 @@ 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,455 +1,3 @@
-**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**
-
-- The app has the same functionalities as before.
-
-
---------------------------------------------------------------------
-                                                                      
-# Old version changes
-
 **1.7.x**
 
 - Hiding tags with 0 articles

README.md

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

androidApp/.gitignore

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

androidApp/build.gradle.kts

@@ -1,49 +1,36 @@
 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(
+fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
-    cmd: String,
+    var result: String = ByteArrayOutputStream().use { outputStream ->
-    ignore: Boolean = false,
+        project.exec {
-): String {
+            commandLine = cmd.split(" ")
-    val result: String =
+            standardOutput = outputStream
-        ByteArrayOutputStream().use { outputStream ->
+            isIgnoreExitValue = ignore ?: false
-            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)
-    val process =
+    process = if (maybeTagOfCurrentCommit.isEmpty()) {
-        if (maybeTagOfCurrentCommit.isEmpty()) {
+        println("No tag on current commit. Will take the latest one.")
-            println("No tag on current commit. Will take the latest one.")
+        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
-            execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
+    } else {
-        } else {
+        println("Tag found on current commit")
-            println("Tag found on current commit")
+        execWithOutput("git -C ../ describe --contains HEAD")
-            execWithOutput("git -C ../ describe --contains HEAD")
+    }
-        }
+    return process.replace("'", "").substring(1).replace("\\.", "").trim()
-    return process
-        .replace("^0", "")
-        .replace("'", "")
-        .substring(1)
-        .replace("\\.", "")
-        .trim()
 }
 
 fun versionCodeFromGit(): Int {
@@ -66,24 +53,20 @@ fun versionNameFromGit(): String {
 
 android {
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         // Flag to enable support for the new language APIs
-        sourceCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
-
+    compileSdk = 31
-    // For Kotlin projects
+    buildToolsVersion = "31.0.0"
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-    compileSdk = 35
     buildFeatures {
         viewBinding = true
     }
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
-        minSdk = 25
+        minSdk = 21
-        targetSdk = 34 // 35 when edge-to-edge is handled
+        targetSdk = 31
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -95,12 +78,6 @@ android {
 
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments["clearPackageData"] = "true"
-    }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
     }
     buildTypes {
         getByName("release") {
@@ -109,129 +86,118 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
+            buildConfigField("String", "LOGIN_URL", properties["appLoginUrl"] as String)
+            buildConfigField("String", "LOGIN_PASSWORD", properties["appLoginPassword"] as String)
+            buildConfigField("String", "LOGIN_USERNAME", properties["appLoginUsername"] as String)
         }
     }
     flavorDimensions.add("build")
     productFlavors {
-        create("githubConfig") {
+        create("github") {
             versionNameSuffix = "-github"
             dimension = "build"
         }
     }
-    namespace = "bou.amine.apps.readerforselfossv2.android"
+    kotlinOptions {
-    testOptions {
+        jvmTarget = "1.8"
-        animationsDisabled = true
-        execution = "ANDROIDX_TEST_ORCHESTRATOR"
-        unitTests {
-            isIncludeAndroidResources = true
-        }
     }
+
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
-
     implementation(project(":shared"))
-    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("com.google.android.material:material:1.5.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
+    implementation("androidx.appcompat:appcompat:1.4.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
 
-    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation("androidx.preference:preference-ktx:1.1.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("com.google.android.material:material:1.12.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("androidx.recyclerview:recyclerview:1.4.0-rc01")
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.2.0")
+    implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")
+    implementation("androidx.browser:browser:1.4.0")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.9.1")
+    implementation("androidx.annotation:annotation:1.3.0")
-    implementation("androidx.work:work-runtime-ktx:2.10.0")
+    implementation("androidx.work:work-runtime-ktx:2.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("org.jsoup:jsoup:1.18.3")
+    implementation("org.jsoup:jsoup:1.14.3")
 
-    // multidex
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+
+    //multidex
     implementation("androidx.multidex:multidex:2.0.1")
 
     // About
-    implementation("com.mikepenz:aboutlibraries-core:10.5.1")
+    implementation("com.mikepenz:aboutlibraries-core:8.9.4")
-    implementation("com.mikepenz:aboutlibraries:10.5.1")
+    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")
 
     // 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.16.0")
+    kapt("com.github.bumptech.glide:compiler:4.11.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.1.1")
+
+    // Drawer
+    implementation("com.mikepenz:materialdrawer:8.4.5")
 
     // Themes
-    implementation("com.leinardi.android:speed-dial:3.3.0")
+    implementation("com.52inc:scoops:1.0.0")
+    implementation("com.jaredrummler:colorpicker:1.1.0")
+    implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
-    implementation("androidx.viewpager2:viewpager2:1.1.0")
+    implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
 
-    // Dependency Injection
+    //Dependency Injection
-    implementation("org.kodein.di:kodein-di:7.23.1")
+    implementation("org.kodein.di:kodein-di:7.14.0")
-    implementation("org.kodein.di:kodein-di-framework-android-x:7.23.1")
+    implementation("org.kodein.di:kodein-di-framework-android-x:7.14.0")
-    implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.23.1")
+    implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.14.0")
 
-    // Settings
+    //Settings
-    implementation("com.russhwolf:multiplatform-settings-no-arg:1.3.0")
+    implementation("com.russhwolf:multiplatform-settings-no-arg:0.9")
 
-    // Logging
+    //Logging
-    implementation("io.github.aakira:napier:2.7.1")
+    implementation("io.github.aakira:napier:2.6.1")
 
-    // PhotoView
+    //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.8.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("app.cash.sqldelight:android-driver:2.0.2")
+    implementation("com.squareup.sqldelight:android-driver:1.5.3")
-
+}
-    // 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.6.2")
-    androidTestImplementation("androidx.test:rules:1.6.1")
-    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.5.1")
-    testImplementation("org.robolectric:robolectric:4.14.1")
-    testImplementation("androidx.test:core-ktx:1.6.1")
-
-    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
-}

androidApp/build.sh

@@ -2,7 +2,7 @@
 
 git fetch --tags -p
 
-BASE_VERSION="1"
+BASE_VERSION="1.7"
 LAST_TAG=$(git tag -l | sort -V | tail -1)
 
 INITIAL_VERSION="${BASE_VERSION//./}$(date '+%y%m%j')"
@@ -21,11 +21,11 @@ VERSION="${INITIAL_VERSION}${TODAYS_VERSION}"
 
 PARAMS_EXCEPT_PUBLISH=$(echo $1 | sed 's/\-\-publish//')
 
-./version.sh ${VERSION} ${PARAMS_EXCEPT_PUBLISH} $@
+./version.sh ${VERSION} ${PARAMS_EXCEPT_PUBLISH}
 
 if [[ "$@" == *'--publish'* ]]
 then
-    ./publish-version.sh ${VERSION} $@
+    ./publish-version.sh ${VERSION}
 else
     echo "Did not publish. If you wanted to do so, call the script with \"--publish\" or \"--publish-local\"."
 fi

androidApp/proguard-rules.pro

@@ -30,8 +30,15 @@
     <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
 
@@ -48,50 +55,11 @@
   public *;
 }
 
+-dontwarn com.anupcowkur.reservoir.**
+
 -dontwarn javax.annotation.**
 
 -keep class android.support.v7.widget.SearchView { *; }
 
 # 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.
--if @kotlinx.serialization.Serializable class **
--keepclassmembers class <1> {
-   static <1>$Companion Companion;
-}
-
-# Keep `serializer()` on companion objects (both default and named) of serializable classes.
--if @kotlinx.serialization.Serializable class ** {
-   static **$* *;
-}
--keepclassmembers class <2>$<3> {
-   kotlinx.serialization.KSerializer serializer(...);
-}
-
-# Keep `INSTANCE.serializer()` of serializable objects.
--if @kotlinx.serialization.Serializable class ** {
-   public static ** INSTANCE;
-}
--keepclassmembers class <1> {
-   public static <1> INSTANCE;
-   kotlinx.serialization.KSerializer serializer(...);
-}
-
-# @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/publish-version.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# NOTE: This is copy/pasted in jenkins
+
+rm -f version.txt
+printf "versionName=$1-github\nversionCode=$1" >> version.txt
+
+# You'll need to change server as your server and define a VERSION_PATH.
+scp version.txt server:$VERSION_PATH
+
+rm version.txt

androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/AddSourceEspressoTest.kt

@@ -0,0 +1,3 @@
+package bou.amine.apps.readerforselfossv2.android
+
+// TODO: test source adding

androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt

@@ -0,0 +1,102 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressKey
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import android.view.KeyEvent
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class HomeActivityEspressoTest {
+    lateinit var context: Context
+
+    @Rule @JvmField
+    val rule = ActivityTestRule(HomeActivity::class.java, true, false)
+
+    @Before
+    fun clearData() {
+        context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        val editor =
+                context
+                        .getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+                        .edit()
+        editor.clear()
+
+        editor.putString("url", BuildConfig.LOGIN_URL)
+        editor.putString("login", BuildConfig.LOGIN_USERNAME)
+        editor.putString("password", BuildConfig.LOGIN_PASSWORD)
+
+        editor.commit()
+
+        Intents.init()
+    }
+
+    @Test
+    fun menuItems() {
+
+        rule.launchActivity(Intent())
+
+        onView(
+                withMenu(
+                        id = R.id.action_search,
+                        titleId = R.string.menu_home_search
+                )
+        ).perform(click())
+
+        onView(withId(R.id.search_bar)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.search_src_text)).perform(
+                typeText("android"),
+                pressKey(KeyEvent.KEYCODE_SEARCH),
+                closeSoftKeyboard()
+        )
+
+        onView(withContentDescription(R.string.abc_toolbar_collapse_description)).perform(click())
+
+        openActionBarOverflowOrOptionsMenu(context)
+
+        onView(withMenu(id = R.id.refresh, titleId = R.string.menu_home_refresh))
+                .perform(click())
+
+        onView(withText(android.R.string.ok))
+            .inRoot(isDialog()).check(matches(isDisplayed())).perform(click())
+
+        openActionBarOverflowOrOptionsMenu(context)
+
+        onView(withText(R.string.action_disconnect)).perform(click())
+
+        intended(hasComponent(LoginActivity::class.java.name))
+    }
+
+    // TODO: test articles opening and actions for cards and lists
+
+    @After
+    fun releaseIntents() {
+        Intents.release()
+    }
+}

androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt

@@ -0,0 +1,180 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressBack
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import com.mikepenz.aboutlibraries.ui.LibsActivity
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LoginActivityEspressoTest {
+
+    @Rule @JvmField
+    val rule = ActivityTestRule(LoginActivity::class.java, true, false)
+
+    private lateinit var context: Context
+    private lateinit var url: String
+    private lateinit var username: String
+    private lateinit var password: String
+
+    @Before
+    fun setUp() {
+        context = InstrumentationRegistry.getInstrumentation().targetContext
+        val editor =
+                context
+                        .getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+                        .edit()
+        editor.clear()
+        editor.commit()
+
+
+        url = BuildConfig.LOGIN_URL
+        username = BuildConfig.LOGIN_USERNAME
+        password = BuildConfig.LOGIN_PASSWORD
+
+        Intents.init()
+    }
+
+    @Test
+    fun menuItems() {
+
+        rule.launchActivity(Intent())
+
+        openActionBarOverflowOrOptionsMenu(context)
+
+        onView(withText(R.string.action_about)).perform(click())
+
+        intended(hasComponent(LibsActivity::class.java.name), times(1))
+
+        onView(isRoot()).perform(pressBack())
+
+        intended(hasComponent(LoginActivity::class.java.name))
+    }
+
+    @Test
+    fun wrongLoginUrl() {
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.loginProgress))
+                .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText("WRONGURL"))
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.urlView)).check(matches(isHintOrErrorEnabled()))
+    }
+
+    // TODO: Add tests for multiple false urls with dialog
+
+    @Test
+    fun emptyAuthData() {
+
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+
+        onView(withId(R.id.withLogin)).perform(click())
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.loginView)).check(matches(isHintOrErrorEnabled()))
+        onView(withId(R.id.passwordView)).check(matches(isHintOrErrorEnabled()))
+
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.passwordView)).check(matches(isHintOrErrorEnabled()))
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.passwordView)).check(
+                matches(
+                        isHintOrErrorEnabled()
+                )
+        )
+    }
+
+    @Test
+    fun wrongAuthData() {
+
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+
+        onView(withId(R.id.withLogin)).perform(click())
+
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.passwordView)).perform(click()).perform(
+                typeText("WRONGPASS"),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.urlView)).check(matches(isHintOrErrorEnabled()))
+        onView(withId(R.id.loginView)).check(matches(isHintOrErrorEnabled()))
+        onView(withId(R.id.passwordView)).check(matches(isHintOrErrorEnabled()))
+    }
+
+    @Test
+    fun workingAuth() {
+
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+
+        onView(withId(R.id.withLogin)).perform(click())
+
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.passwordView)).perform(click()).perform(
+                typeText(password),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        Thread.sleep(2000)
+        intended(hasComponent(HomeActivity::class.java.name))
+    }
+
+    @After
+    fun releaseIntents() {
+        Intents.release()
+    }
+}

androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt

@@ -0,0 +1,81 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+import bou.amine.apps.readerforselfossv2.android.MainActivity
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import org.junit.After
+
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MainActivityEspressoTest {
+
+    lateinit var intent: Intent
+    lateinit var preferencesEditor: SharedPreferences.Editor
+    private lateinit var url: String
+    private lateinit var username: String
+    private lateinit var password: String
+
+    @Rule @JvmField
+    val rule = ActivityTestRule(MainActivity::class.java, true, false)
+
+    @Before
+    fun setUp() {
+        intent = Intent()
+        val context = getInstrumentation().targetContext
+
+        // create a SharedPreferences editor
+        preferencesEditor = context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE).edit()
+
+        url = BuildConfig.LOGIN_URL
+        username = BuildConfig.LOGIN_USERNAME
+        password = BuildConfig.LOGIN_PASSWORD
+
+        Intents.init()
+    }
+
+    @Test
+    fun checkFirstOpenLaunchesIntro() {
+        preferencesEditor.putString("url", "")
+        preferencesEditor.putString("password", "")
+        preferencesEditor.putString("login", "")
+        preferencesEditor.commit()
+
+        rule.launchActivity(intent)
+
+        intended(hasComponent(LoginActivity::class.java.name))
+        intended(hasComponent(HomeActivity::class.java.name), times(0))
+    }
+
+    @Test
+    fun checkNotFirstOpenLaunchesLogin() {
+        preferencesEditor.putString("url", url)
+        preferencesEditor.putString("password", password)
+        preferencesEditor.putString("login", username)
+        preferencesEditor.commit()
+
+        rule.launchActivity(intent)
+
+        intended(hasComponent(MainActivity::class.java.name))
+        intended(hasComponent(HomeActivity::class.java.name))
+    }
+
+    @After
+    fun releaseIntents() {
+        Intents.release()
+    }
+}

androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt

@@ -0,0 +1,29 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import androidx.test.espresso.matcher.ViewMatchers
+import android.view.View
+import android.widget.EditText
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers
+import org.hamcrest.TypeSafeMatcher
+
+fun isHintOrErrorEnabled(): Matcher<View> =
+        object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description?) {
+            }
+
+            override fun matchesSafely(item: View?): Boolean {
+                if (item !is EditText) {
+                    return false
+                }
+
+                return item.error.isNotEmpty()
+            }
+        }
+
+fun withMenu(id: Int, titleId: Int): Matcher<View> =
+        Matchers.anyOf(
+                ViewMatchers.withId(id),
+                ViewMatchers.withText(titleId)
+        )

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

@@ -1,121 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android
-
-import android.content.Context
-import androidx.annotation.ArrayRes
-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.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 org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.Matchers.hasToString
-
-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()))
-}

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

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

@@ -1,118 +0,0 @@
-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.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class HomeActivityTest {
-    @get:Rule
-    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
-
-    @Before
-    fun init() {
-        loginAndInitHome()
-    }
-
-    @Test
-    fun testMenu() {
-        onView(withId(R.id.action_search)).check(matches(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

@@ -1,93 +0,0 @@
-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.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class LoginActivityTest {
-    @get:Rule
-    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
-
-    @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

@@ -1,155 +0,0 @@
-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.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class SettingsActivityGeneralTest {
-    @get:Rule
-    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
-
-    @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

@@ -1,174 +0,0 @@
-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.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class SettingsActivityOfflineTest {
-    @get:Rule
-    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
-
-    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

@@ -1,85 +0,0 @@
-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.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class SettingsActivityReaderTest {
-    @get:Rule
-    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
-
-    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

@@ -1,92 +0,0 @@
-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.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class SettingsActivityTest {
-    @get:Rule
-    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
-    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

@@ -1,82 +0,0 @@
-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.runner.RunWith
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class SourcesActivityTest {
-    @get:Rule
-    val activityRule = ActivityScenarioRule(LoginActivity::class.java)
-
-    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(sourceName)).check(doesNotExist())
-    }
-
-    private fun goToSources() {
-        openMenu()
-        onView(withText(R.string.menu_home_sources))
-            .perform(click())
-    }
-}

androidApp/src/main/AndroidManifest.xml

@@ -1,23 +1,18 @@
 <?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">
 
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:allowBackup="false"
-        android:fullBackupContent="false"
-        tools:replace="android:allowBackup"
         android:name=".MyApp"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:theme="@style/NoBar"
+        android:theme="@style/NoBar">
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:configChanges="uiMode">
         <activity
             android:name=".MainActivity"
             android:theme="@style/SplashTheme"
@@ -53,7 +48,7 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity
-            android:name=".UpsertSourceActivity"
+            android:name=".AddSourceActivity"
             android:parentActivityName=".SourcesActivity"
             android:exported="true">
             <meta-data
@@ -70,10 +65,13 @@
             android:name=".ReaderActivity">
         </activity>
         <activity
-            android:name=".ImageActivity"
+            android:name=".ImageActivity">
-            android:theme="@style/Theme.AppCompat.ImageActivity">
         </activity>
 
+        <meta-data
+            android:name="bou.amine.apps.readerforselfossv2.android.utils.glide.SelfSignedGlideModule"
+            android:value="GlideModule" />
+
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"
             android:value="true" />
 
@@ -81,5 +79,8 @@
             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

@@ -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.*
+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.Config
+import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
+import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
+import bou.amine.apps.readerforselfossv2.repository.Repository
+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()
+
+    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 config = Config()
+
+        if (config.baseUrl.isEmpty() || !config.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,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -11,8 +10,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 lateinit var allImages : ArrayList<String>
-    private var position: Int = 0
+    private var position : Int = 0
 
     private lateinit var binding: ActivityImageBinding
 
@@ -24,6 +23,7 @@ class ImageActivity : AppCompatActivity() {
         setContentView(view)
 
         setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
@@ -31,52 +31,12 @@ class ImageActivity : AppCompatActivity() {
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(position, false)
-
-        val transitionListener =
-            object : MotionLayout.TransitionListener {
-                override fun onTransitionStarted(
-                    motionLayout: MotionLayout?,
-                    startId: Int,
-                    endId: Int,
-                ) {
-                    // Nothing
-                }
-
-                override fun onTransitionChange(
-                    motionLayout: MotionLayout?,
-                    startId: Int,
-                    endId: Int,
-                    progress: Float,
-                ) {
-                    // Nothing
-                }
-
-                override fun onTransitionCompleted(
-                    motionLayout: MotionLayout?,
-                    currentId: Int,
-                ) {
-                    if (motionLayout?.currentState == binding.root.endState) {
-                        onBackPressedDispatcher.onBackPressed()
-                        overridePendingTransition(0, 0)
-                    }
-                }
-
-                override fun onTransitionTrigger(
-                    motionLayout: MotionLayout?,
-                    triggerId: Int,
-                    positive: Boolean,
-                    progress: Float,
-                ) {
-                    // Nothing
-                }
-            }
-        binding.root.setTransitionListener(transitionListener)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
+                onBackPressed()
                 return true
             }
         }
@@ -84,11 +44,10 @@ class ImageActivity : AppCompatActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    private inner class ScreenSlidePagerAdapter(
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
-        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,9 +2,7 @@ package bou.amine.apps.readerforselfossv2.android
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
-import android.annotation.SuppressLint
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.Menu
@@ -12,43 +10,39 @@ 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.testing.CountingIdlingResourceSingleton
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
+import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
+import com.russhwolf.settings.Settings
 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
 
-private const val MAX_INVALID_LOGIN_BEFORE_ALERT_DISPLAYED = 3
+class LoginActivity() : AppCompatActivity(), DIAware {
 
-class LoginActivity :
-    AppCompatActivity(),
-    DIAware {
     private var inValidCount: Int = 0
+    private var isWithSelfSignedCert = false
     private var isWithLogin = false
+    private var isWithHTTPLogin = false
 
+    private val settings = Settings()
+    private lateinit var appColors: AppColors
     private lateinit var binding: ActivityLoginBinding
 
     override val di by closestDI()
-    private val repository: Repository 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
 
@@ -58,20 +52,22 @@ class LoginActivity :
 
         handleBaseUrlFail()
 
-        if (appSettingsService.getBaseUrl().isNotEmpty()) {
+        if (settings.getString("url", "").isNotEmpty()) {
-            showProgress(true)
             goToMain()
         }
 
         handleActions()
     }
 
-    @SuppressLint("WrongConstant") // Constant is fetched from the settings
-    private fun handleTheme() {
-        AppCompatDelegate.setDefaultNightMode(appSettingsService.getCurrentTheme())
-    }
-
     private fun handleActions() {
+
+        binding.withSelfhostedCert.setOnCheckedChangeListener { _, b ->
+            isWithSelfSignedCert = !isWithSelfSignedCert
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            binding.warningText.visibility = visi
+        }
+
         binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
@@ -79,7 +75,7 @@ class LoginActivity :
                     return@OnEditorActionListener true
                 }
                 false
-            },
+            }
         )
 
         binding.signInButton.setOnClickListener { attemptLogin() }
@@ -91,6 +87,14 @@ class LoginActivity :
             binding.loginView.visibility = visi
             binding.passwordView.visibility = visi
         }
+
+        binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
+            isWithHTTPLogin = !isWithHTTPLogin
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            binding.httpLoginView.visibility = visi
+            binding.httpPasswordView.visibility = visi
+        }
     }
 
     private fun handleBaseUrlFail() {
@@ -100,149 +104,114 @@ class LoginActivity :
             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() {
+    private fun preferenceError(t: Throwable) {
-        appSettingsService.resetLoginInformation()
+        settings.remove("url")
-
+        settings.remove("login")
+        settings.remove("httpUserName")
+        settings.remove("password")
+        settings.remove("httpPassword")
         binding.urlView.error = getString(R.string.wrong_infos)
         binding.loginView.error = getString(R.string.wrong_infos)
         binding.passwordView.error = getString(R.string.wrong_infos)
+        binding.httpLoginView.error = getString(R.string.wrong_infos)
+        binding.httpPasswordView.error = getString(R.string.wrong_infos)
     }
 
     private fun attemptLogin() {
+
         // Reset errors.
         binding.urlView.error = null
         binding.loginView.error = null
+        binding.httpLoginView.error = null
         binding.passwordView.error = null
+        binding.httpPasswordView.error = null
 
         // Store values at the time of the login attempt.
-        val url =
+        val url = binding.urlView.text.toString()
-            binding.urlView.text
+        val login = binding.loginView.text.toString()
-                .toString()
+        val httpLogin = binding.httpLoginView.text.toString()
-                .trim()
+        val password = binding.passwordView.text.toString()
-        val login =
+        val httpPassword = binding.httpPasswordView.text.toString()
-            binding.loginView.text
-                .toString()
-                .trim()
-        val password =
-            binding.passwordView.text
-                .toString()
-                .trim()
 
-        val cancelUrl = failInvalidUrl(url)
-        if (cancelUrl) return
-        val cancelDetails = failLoginDetails(password, login)
-        if (cancelDetails) return
-        showProgress(true)
-
-        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) {
+        var focusView: View? = null
-            if (TextUtils.isEmpty(password)) {
-                binding.passwordView.error = getString(R.string.error_invalid_password)
-                lastFocusedView = binding.passwordView
-                cancel = true
-            }
 
-            if (TextUtils.isEmpty(login)) {
+        if (!url.isBaseUrlValid(this@LoginActivity)) {
-                binding.loginView.error = getString(R.string.error_field_required)
-                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)
+            focusView = binding.urlView
+            cancel = true
             inValidCount++
-            if (inValidCount == MAX_INVALID_LOGIN_BEFORE_ALERT_DISPLAYED) {
+            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",
+                    "OK"
                 ) { dialog, _ -> dialog.dismiss() }
                 alertDialog.show()
                 inValidCount = 0
             }
         }
-        maybeCancelAndFocusView(cancel, focusView)
-        return cancel
-    }
 
-    private fun maybeCancelAndFocusView(
+        if (isWithLogin) {
-        cancel: Boolean,
+            if (TextUtils.isEmpty(password)) {
-        focusView: View?,
+                binding.passwordView.error = getString(R.string.error_invalid_password)
-    ) {
+                focusView = binding.passwordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(login)) {
+                binding.loginView.error = getString(R.string.error_field_required)
+                focusView = binding.loginView
+                cancel = true
+            }
+        }
+
+        if (isWithHTTPLogin) {
+            if (TextUtils.isEmpty(httpPassword)) {
+                binding.httpPasswordView.error = getString(R.string.error_invalid_password)
+                focusView = binding.httpPasswordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(httpLogin)) {
+                binding.httpLoginView.error = getString(R.string.error_field_required)
+                focusView = binding.httpLoginView
+                cancel = true
+            }
+        }
+
         if (cancel) {
             focusView?.requestFocus()
+        } else {
+            showProgress(true)
+
+            repository.refreshLoginInformation(url, login, password, httpLogin, httpPassword, isWithSelfSignedCert)
+
+            CoroutineScope(Dispatchers.IO).launch {
+                val result = repository.login()
+                if (result) {
+                    goToMain()
+                } else {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        preferenceError(Exception("Not success"))
+                    }
+                }
+            }
+            showProgress(false)
         }
     }
 
@@ -254,28 +223,26 @@ class LoginActivity :
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 0F else 1F,
+                if (show) 0F else 1F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
-                    override fun onAnimationEnd(animation: Animator) {
+                binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
-                        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,
+                if (show) 1F else 0F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
-                    override fun onAnimationEnd(animation: Animator) {
+                binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
-                        binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+            }
-                    }
+        }
-                },
+        )
-            )
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -285,25 +252,13 @@ class LoginActivity :
 
     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,6 +8,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivityMainBinding
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)

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

@@ -3,142 +3,97 @@ 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 bou.amine.apps.readerforselfossv2.android.testing.TestingHelper
+import androidx.preference.PreferenceManager
+import bou.amine.apps.readerforselfossv2.DI.networkModule
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
+import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 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 bou.amine.apps.readerforselfossv2.service.ConnectivityService
+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 com.russhwolf.settings.Settings
 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.acra.ACRA
+import org.kodein.di.*
-import org.acra.ReportField
+
-import org.acra.config.httpSender
+class MyApp : MultiDexApplication(), DIAware {
-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<ConnectivityService>() with singleton { ConnectivityService() }
+        bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus, instance()) }
-        bind<Repository>() with
+        bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
-            singleton {
+        bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
-                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()
+    private lateinit var config: Config
+    private lateinit var settings : Settings
 
     override fun onCreate() {
         super.onCreate()
         Napier.base(DebugAntilog())
+        config = Config()
+        settings = Settings()
 
-        if (!ACRA.isACRASenderServiceProcess()) {
+        initDrawerImageLoader()
-            tryToHandleBug()
 
-            handleNotificationChannels()
+        initTheme()
 
-            ProcessLifecycleOwner.get().lifecycle.addObserver(
+        tryToHandleBug()
-                AppLifeCycleObserver(
-                    connectivityService,
-                ),
-            )
 
-            CoroutineScope(Dispatchers.Main).launch {
+        handleNotificationChannels()
-                connectivityService.networkAvailableProvider.collect { networkAvailable ->
-                    val toastMessage =
-                        if (networkAvailable) {
-                            repository.handleDBActions()
-                            R.string.network_connectivity_retrieved
-                        } else {
-                            R.string.network_connectivity_lost
-                        }
 
-                    Toast
+        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
-                        .makeText(
+
-                            applicationContext,
+        CoroutineScope(Dispatchers.Main).launch {
-                            toastMessage,
+            viewModel.networkAvailableProvider.collect { networkAvailable ->
-                            Toast.LENGTH_SHORT,
+                val toastMessage = if (networkAvailable) {
-                        ).show()
+                    repository.handleDBActions()
+                    R.string.network_connectivity_retrieved
+                } else {
+                    R.string.network_connectivity_lost
                 }
+
+                Toast.makeText(
+                    applicationContext,
+                    toastMessage,
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+        CoroutineScope(Dispatchers.Main).launch {
+            viewModel.toastMessageProvider.collect { toastMessage ->
+                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() {
@@ -147,49 +102,70 @@ class MyApp :
 
             val name = getString(R.string.notification_channel_sync)
             val importance = NotificationManager.IMPORTANCE_LOW
-            val mChannel = NotificationChannel(AppSettingsService.SYNC_CHANNEL_ID, name, importance)
+            val mChannel = NotificationChannel(Config.syncChannelId, name, importance)
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel =
+            val newItemsChannelmChannel = NotificationChannel(Config.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
-                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)
+                    .loadMaybeBasicAuth(config, 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 NoClassDefFoundError &&
+            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
-                e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
-                }
+                }) {
-            ) {
+                Unit
-                // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    class AppLifeCycleObserver(
+    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
-        val connectivityService: ConnectivityService,
+
-    ) : DefaultLifecycleObserver {
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
-            connectivityService.start()
+            repository.connectionMonitored = true
+            connectivityStatus.start()
         }
 
         override fun onPause(owner: LifecycleOwner) {
-            connectivityService.stop()
+            repository.connectionMonitored = false
+            connectivityStatus.stop()
             super.onPause(owner)
         }
     }
-}
+}

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

@@ -12,9 +12,12 @@ 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.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import com.ftinc.scoop.Scoop
+import com.russhwolf.settings.Settings
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -22,56 +25,70 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class ReaderActivity :
+class ReaderActivity : AppCompatActivity(), DIAware {
-    AppCompatActivity(),
+
-    DIAware {
+    private var markOnScroll: Boolean = false
     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()
+    private var activeAlignment: Int = 1
+    private val JUSTIFY = 1
+    private val ALIGN_LEFT = 2
 
     override val di by closestDI()
     private val repository: Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
 
-    @Suppress("detekt:SwallowedException")
+    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)
+    }
+
+    private var settings = Settings()
+
     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)
 
-        currentItem = intent.getIntExtra("currentItem", 0)
+        markOnScroll = settings.getBoolean("mark_on_scroll", false)
+        activeAlignment = settings.getInt("text_align", JUSTIFY)
 
-        allItems = repository.getReaderItems()
+        if (allItems.isEmpty()) {
-
-        if (allItems.isEmpty() || currentItem > allItems.size) {
             finish()
         }
 
-        readItem()
+        currentItem = intent.getIntExtra("currentItem", 0)
+
+        readItem(allItems[currentItem])
 
         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() {
@@ -80,116 +97,146 @@ class ReaderActivity :
         binding.indicator.setViewPager(binding.pager)
     }
 
-    private fun readItem() {
+    private fun readItem(item: SelfossModel.Item) {
-        val item = allItems.getOrNull(currentItem)
+        if (markOnScroll) {
-        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess() && item != null) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
+                // TODO: Handle failure
             }
         }
     }
 
-    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(
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
-        fa: FragmentActivity,
+        FragmentStateAdapter(fa) {
-    ) : FragmentStateAdapter(fa) {
+
         override fun getItemCount(): Int = allItems.size
 
-        override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
+        override fun createFragment(position: Int): Fragment =
+            ArticleFragment.newInstance(allItems[position])
+
     }
 
-    override fun onKeyDown(
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        keyCode: Int,
+        return when (keyCode) {
-        event: KeyEvent?,
-    ): Boolean =
-        when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
                 val currentFragment =
                     supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
-                currentFragment.volumeButtonScrollDown()
+                currentFragment.scrollDown()
                 true
             }
-
             KeyEvent.KEYCODE_VOLUME_UP -> {
                 val currentFragment =
                     supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
-                currentFragment.volumeButtonScrollUp()
+                currentFragment.scrollUp()
                 true
             }
-
             else -> {
                 super.onKeyDown(keyCode, event)
             }
         }
+    }
 
     private fun alignmentMenu() {
-        val showJustify = appSettingsService.getActiveAllignment() == AppSettingsService.ALIGN_LEFT
+        val showJustify = activeAlignment == ALIGN_LEFT
         toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
         toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.reader_menu, menu)
+        val inflater = menuInflater
+        inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
+        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+            canRemoveFromFavorite()
+        } else {
+            canFavorite()
+        }
         alignmentMenu()
 
-        if (appSettingsService.getPublicAccess()) {
+        binding.pager.registerOnPageChangeCallback(
-            menu.removeItem(R.id.star)
+            object : ViewPager2.OnPageChangeCallback() {
-        } else {
+
-            updateStarIcon()
+                override fun onPageSelected(position: Int) {
-        }
+                    super.onPageSelected(position)
+
+                    if (allItems[position].starred) {
+                        canRemoveFromFavorite()
+                    } else {
+                        canFavorite()
+                    }
+                    readItem(allItems[position])
+                }
+            }
+        )
 
         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 -> onBackPressedDispatcher.onBackPressed()
+            android.R.id.home -> {
-            R.id.star -> toggleFavorite()
+                onBackPressed()
-            R.id.align_left -> switchAlignmentSetting(AppSettingsService.ALIGN_LEFT)
+                return true
-            R.id.align_justify -> switchAlignmentSetting(AppSettingsService.JUSTIFY)
+            }
+            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 -> {
+                activeAlignment = ALIGN_LEFT
+                switchAlignmentSetting()
+                refreshFragment()
+            }
+            R.id.align_justify -> {
+                activeAlignment = JUSTIFY
+                switchAlignmentSetting()
+                refreshFragment()
+            }
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun toggleFavorite() {
+    private fun switchAlignmentSetting() {
-        val item = allItems.getOrNull(currentItem) ?: return
+        settings.putInt("text_align", activeAlignment)
-
+        alignmentMenu()
-        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) {
+    private fun refreshFragment() {
-        appSettingsService.changeAllignment(alignment)
+        finish()
-        alignmentMenu()
+        overridePendingTransition(0, 0)
+        startActivity(intent)
+        overridePendingTransition(0, 0)
+    }
 
-        val fragmentManager = supportFragmentManager
+    companion object {
-        val fragments = fragmentManager.fragments
+        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,9 +8,11 @@ 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.testing.CountingIdlingResourceSingleton
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
 import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import com.ftinc.scoop.Scoop
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -18,18 +20,23 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
-class SourcesActivity :
+class SourcesActivity : AppCompatActivity(), DIAware {
-    AppCompatActivity(),
+
-    DIAware {
+    private lateinit var appColors: AppColors
     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)
@@ -38,9 +45,8 @@ class SourcesActivity :
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        binding.fab.rippleColor = resources.getColor(R.color.colorAccentDark)
+        binding.fab.rippleColor = appColors.colorAccentDark
-        binding.fab.backgroundTintList =
+        binding.fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
-            ColorStateList.valueOf(resources.getColor(R.color.colorAccent))
     }
 
     override fun onStop() {
@@ -52,36 +58,38 @@ class SourcesActivity :
         super.onResume()
         val mLayoutManager = LinearLayoutManager(this)
 
-        var items: ArrayList<SelfossModel.SourceDetail>
+        var items: ArrayList<SelfossModel.Source>
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
-        CountingIdlingResourceSingleton.increment()
         CoroutineScope(Dispatchers.Main).launch {
-            val response = repository.getSourcesDetails()
+            val response = repository.getSources()
-            if (response.isNotEmpty()) {
+            if (response != null) {
                 items = response
-                val mAdapter =
+                val mAdapter = SourcesListAdapter(
-                    SourcesListAdapter(
+                    this@SourcesActivity, items
-                        this@SourcesActivity,
+                )
-                        items,
-                    )
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
-            } else {
+                if (items.isEmpty()) {
-                Toast
+                    Toast.makeText(
-                    .makeText(
                         this@SourcesActivity,
-                        R.string.cant_get_sources,
+                        R.string.nothing_here,
-                        Toast.LENGTH_SHORT,
+                        Toast.LENGTH_SHORT
                     ).show()
+                }
+            } else {
+                Toast.makeText(
+                    this@SourcesActivity,
+                    R.string.cant_get_sources,
+                    Toast.LENGTH_SHORT
+                ).show()
             }
-            CountingIdlingResourceSingleton.decrement()
         }
 
         binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }
 }

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

@@ -1,200 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
-import bou.amine.apps.readerforselfossv2.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,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,18 +9,19 @@ 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.utils.LinkOnTouchListener
+import bou.amine.apps.readerforselfossv2.android.model.*
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+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.glide.bitmapCenterCrop
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
-import bou.amine.apps.readerforselfossv2.android.utils.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.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -30,84 +32,42 @@ import org.kodein.di.instance
 
 class ItemCardAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
-    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    private val helper: CustomTabActivityHelper,
+    private val internalBrowser: Boolean,
+    private val articleViewer: Boolean,
+    private val fullHeightCards: Boolean,
+    override val appColors: AppColors,
+    override val config: Config,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
-    override lateinit var binding: CardItemBinding
+    private val c: Context = app.baseContext
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val imageMaxHeight: Int =
         c.resources.getDimension(R.dimen.card_image_max_height).toInt()
 
     override val di: DI by closestDI(app)
-    override val repository: Repository by instance()
+    override val repository : Repository by instance()
-    override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
-    ): ViewHolder {
-        binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    private fun handleClickListeners(
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        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(c.resources.getColor(R.color.colorAccent))
+            binding.title.setLinkTextColor(appColors.colorAccent)
 
-            binding.sourceTitleAndDate.text =
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
-                try {
-                    itm.sourceAuthorAndDate()
-                } catch (e: Exception) {
-                    e.sendSilentlyWithAcraWithName("ItemCardAdapter parse date")
-                    itm.sourceAuthorOnly()
-                }
 
-            if (!appSettingsService.isFullHeightCardsEnabled()) {
+            if (!fullHeightCards) {
                 binding.itemImage.maxHeight = imageMaxHeight
                 binding.itemImage.scaleType = ScaleType.CENTER_CROP
             }
@@ -118,18 +78,80 @@ class ItemCardAdapter(
                 binding.itemImage.setImageDrawable(null)
             } else {
                 binding.itemImage.visibility = View.VISIBLE
-                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage, appSettingsService)
+                c.bitmapCenterCrop(config, itm.getThumbnail(repository.baseUrl), binding.itemImage)
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                val drawable =
+                        TextDrawable
+                                .builder()
+                                .round()
+                                .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+                binding.sourceImage.setImageDrawable(drawable)
             } else {
-                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage, appSettingsService)
+                c.circularBitmapDrawable(config, itm.getIcon(repository.baseUrl), binding.sourceImage)
             }
         }
     }
 
-    inner class ViewHolder(
+    override fun getItemCount(): Int {
-        val binding: CardItemBinding,
+        return items.size
-    ) : RecyclerView.ViewHolder(binding.root)
+    }
+
+    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,
+                    internalBrowser,
+                    articleViewer,
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -1,79 +1,105 @@
 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.utils.LinkOnTouchListener
+import bou.amine.apps.readerforselfossv2.android.model.*
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.*
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
+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.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import org.kodein.di.DI
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 class ItemListAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
-    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    private val helper: CustomTabActivityHelper,
+    private val internalBrowser: Boolean,
+    private val articleViewer: Boolean,
+    override val appColors: AppColors,
+    override val config: Config,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
-    override lateinit var binding: ListItemBinding
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private val c: Context = app.baseContext
 
     override val di: DI by closestDI(app)
-    override val repository: Repository by instance()
+    override val repository : Repository by instance()
-    override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
-    ): ViewHolder {
-        binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder: ViewHolder,
-        position: Int,
-    ) {
         with(holder) {
             val itm = items[position]
 
-            handleLinkOpening(binding, position)
-
             binding.title.text = itm.title.getHtmlDecoded()
 
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
-            binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
+            binding.title.setLinkTextColor(appColors.colorAccent)
 
-            binding.sourceTitleAndDate.text =
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
-                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()) {
-                    binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                    val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                    val drawable =
+                            TextDrawable
+                                    .builder()
+                                    .round()
+                                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+
+                    binding.itemImage.setImageDrawable(drawable)
                 } else {
-                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage, appSettingsService)
+                    c.circularBitmapDrawable(config, itm.getIcon(repository.baseUrl), binding.itemImage)
                 }
             } else {
-                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage, appSettingsService)
+                c.bitmapCenterCrop(config, itm.getThumbnail(repository.baseUrl), binding.itemImage)
             }
         }
     }
 
-    inner class ViewHolder(
+    override fun getItemCount(): Int = items.size
-        val binding: ListItemBinding,
+
-    ) : RecyclerView.ViewHolder(binding.root)
+    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,
+                    internalBrowser,
+                    articleViewer,
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -1,16 +1,14 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
-import android.content.Context
 import android.graphics.Color
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.android.utils.Config
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.ItemType
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.CoroutineScope
@@ -18,138 +16,106 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 
-abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
+abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
-    RecyclerView.Adapter<VH>(),
+    abstract var items: ArrayList<SelfossModel.Item>
-    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 updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit
+    abstract val appColors: AppColors
-
+    abstract val config: Config
-    protected val c: Context get() = app.baseContext
+    abstract val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items.clear()
+        this.items = items
-        this.items.addAll(items)
-        updateHomeItems(items)
         notifyDataSetChanged()
+        updateItems(this.items)
     }
 
-    private fun unmarkSnackbar(
+    private fun unmarkSnackbar(i: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
+        val s = Snackbar
-        position: Int,
+            .make(
-    ) {
+                app.findViewById(R.id.coordLayout),
-        val s =
+                R.string.marked_as_read,
-            Snackbar
+                Snackbar.LENGTH_LONG
-                .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)
-        tv.setTextColor(Color.WHITE)
-        s.show()
-    }
-
-    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)
-        tv.setTextColor(Color.WHITE)
-        s.show()
-    }
-
-    protected fun handleLinkOpening(
-        holderBinding: ViewBinding,
-        position: Int,
-    ) {
-        holderBinding.root.setOnClickListener {
-            repository.setReaderItems(items)
-            c.openItemUrl(
-                position,
-                items[position].getLinkDecoded(),
-                appSettingsService.isArticleViewerEnabled(),
-                app,
             )
-        }
+            .setAction(R.string.undo_string) {
+                CoroutineScope(Dispatchers.IO).launch {
+                    unreadItemAtIndex(position, false)
+                }
+            }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        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)
+            }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        s.show()
     }
 
     fun handleItemAtIndex(position: Int) {
         if (items[position].unread) {
-            readItemAtIndex(items[position], position)
+            readItemAtIndex(position)
         } else {
-            unreadItemAtIndex(items[position], position)
+            unreadItemAtIndex(position)
         }
     }
 
-    private fun readItemAtIndex(
+    private fun readItemAtIndex(position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
+        val i = items[position]
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
-            repository.markAsRead(item)
+            repository.markAsRead(i)
         }
         if (repository.displayedItems == ItemType.UNREAD) {
-            items.remove(item)
+            items.remove(i)
             notifyItemRemoved(position)
-            notifyItemRangeChanged(position, itemCount)
+            updateItems(items)
-            updateHomeItems(items)
         } else {
             notifyItemChanged(position)
         }
         if (showSnackbar) {
-            unmarkSnackbar(item, position)
+            unmarkSnackbar(i, position)
         }
     }
 
-    private fun unreadItemAtIndex(
+    private fun unreadItemAtIndex(position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
-            repository.unmarkAsRead(item)
+            repository.unmarkAsRead(items[position])
+            // Todo: SharedItems.unreadItem(app, api, db, items[position])
+            // TODO: update db
+
         }
         notifyItemChanged(position)
         if (showSnackbar) {
-            markSnackbar(item, position)
+            markSnackbar(position)
         }
     }
 
-    fun addItemAtIndex(
+    fun addItemAtIndex(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
-        position: Int,
-    ) {
         items.add(position, item)
         notifyItemInserted(position)
-        updateHomeItems(items)
+        updateItems(items)
+
     }
 
     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
         val oldSize = items.size
         items.addAll(newItems)
         notifyItemRangeInserted(oldSize, newItems.size)
-        updateHomeItems(items)
+        updateItems(items)
-    }
 
-    override fun getItemCount(): Int = items.size
+    }
-}
+}

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

@@ -2,22 +2,23 @@ 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.appcompat.app.AlertDialog
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
 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,96 +29,67 @@ import org.kodein.di.instance
 
 class SourcesListAdapter(
     private val app: Activity,
-    private val items: ArrayList<SelfossModel.SourceDetail>,
+    private val items: ArrayList<SelfossModel.Source>
-) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(),
+) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(), DIAware {
-    DIAware {
+    private val c: Context = app.baseContext
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private lateinit var config: Config
+    private lateinit var binding: SourceListItemBinding
+
     override val di: DI by closestDI(app)
+    private val repository : Repository by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
+        return ViewHolder(binding.root)
-    ): ViewHolder {
-        val binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder: ViewHolder,
+        val itm = items[position]
-        position: Int,
+        config = Config()
-    ) {
+
-        holder.bind(items[position], 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(config, itm.getIcon(repository.baseUrl), binding.itemImage)
+        }
+
+        binding.sourceTitle.text = itm.title.getHtmlDecoded()
     }
 
-    override fun getItemId(position: Int) = position.toLong()
-
-    override fun getItemViewType(position: Int) = position
-
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(
+    inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
-        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()
 
-        fun bind(
+        init {
-            source: SelfossModel.SourceDetail,
+            handleClickListeners()
-            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 showDeleteConfirmationDialog(
+        private fun handleClickListeners() {
-            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()
-        }
 
-        private fun deleteSource(
+            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
-            source: SelfossModel.SourceDetail,
+
-            position: Int,
+            deleteBtn.setOnClickListener {
-        ) {
+                val (id) = items[adapterPosition]
-            CoroutineScope(Dispatchers.IO).launch {
+                CoroutineScope(Dispatchers.IO).launch {
-                val successfullyDeletedSource = repository.deleteSource(source.id, source.title)
+                    val successfullyDeletedSource = repository.deleteSource(id)
-                launch(Dispatchers.Main) {
                     if (successfullyDeletedSource) {
-                        items.removeAt(position)
+                        items.removeAt(adapterPosition)
-                        notifyItemRemoved(position)
+                        notifyItemRemoved(adapterPosition)
-                        notifyItemRangeChanged(position, itemCount)
+                        notifyItemRangeChanged(adapterPosition, itemCount)
                     } else {
-                        Toast
+                        Toast.makeText(
-                            .makeText(
+                            app,
-                                app,
+                            R.string.can_delete_source,
-                                R.string.can_delete_source,
+                            Toast.LENGTH_SHORT
-                                Toast.LENGTH_SHORT,
+                        ).show()
-                            ).show()
                     }
                 }
             }

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

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

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

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

@@ -1,120 +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.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

@@ -0,0 +1,116 @@
+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.Config
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+import bou.amine.apps.readerforselfossv2.dao.ACTION
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import com.russhwolf.settings.Settings
+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
+import kotlin.concurrent.thread
+
+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()
+
+override fun doWork(): Result {
+    val settings = Settings()
+    val periodicRefresh = settings.getBoolean("periodic_refresh", false)
+    if (periodicRefresh && isNetworkAccessible(context)) {
+
+        CoroutineScope(Dispatchers.IO).launch {
+            val notificationManager =
+                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+            val notification =
+                NotificationCompat.Builder(applicationContext, Config.syncChannelId)
+                    .setContentTitle(context.getString(R.string.loading_notification_title))
+                    .setContentText(context.getString(R.string.loading_notification_text))
+                    .setOngoing(true)
+                    .setPriority(PRIORITY_LOW)
+                    .setChannelId(Config.syncChannelId)
+                    .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+
+            notificationManager.notify(1, notification.build())
+
+            val notifyNewItems = settings.getBoolean("notify_new_items", false)
+
+            repository.handleDBActions()
+
+            launch {
+                handleNewItemsNotification(repository.tryToCacheItemsAndGetNewOnes(), notifyNewItems, notificationManager)
+            }
+        }
+    }
+    return Result.success()
+}
+
+    private fun handleNewItemsNotification(
+        newItems: List<SelfossModel.Item>?,
+        notifyNewItems: Boolean,
+        notificationManager: NotificationManager
+    ) {
+        CoroutineScope(Dispatchers.IO).launch {
+                val apiItems = newItems.orEmpty()
+
+
+                val newSize = apiItems.filter { it.unread }.size
+                if (notifyNewItems && 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, Config.newItemsChannelId)
+                            .setContentTitle(context.getString(R.string.new_items_notification_title))
+                            .setContentText(
+                                context.getString(
+                                    R.string.new_items_notification_text,
+                                    newSize
+                                )
+                            )
+                            .setPriority(PRIORITY_DEFAULT)
+                            .setChannelId(Config.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,103 +1,100 @@
 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.util.TypedValue.DATA_NULL_UNDEFINED
+import android.view.*
-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.*
-import bou.amine.apps.readerforselfossv2.android.model.toModel
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.model.toParcelable
+import bou.amine.apps.readerforselfossv2.android.utils.*
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
-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.glide.getGlideImageForResource
+import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
-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.model.SelfossModel
-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.leinardi.android.speeddial.SpeedDialView
+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.russhwolf.settings.Settings
 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.Locale
+import java.util.*
 import java.util.concurrent.ExecutionException
 
-private const val IMAGE_JPG = "image/jpg"
+class ArticleFragment : Fragment(), DIAware {
-private const val IMAGE_PNG = "image/png"
+    private var fontSize: Int = 16
-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 url: String? = null
+    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null
+    private lateinit var url: String
     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 allImages : ArrayList<String>
-    private lateinit var fab: SpeedDialView
+    private lateinit var fab: FloatingActionButton
+    private lateinit var appColors: AppColors
     private lateinit var textAlignment: String
-    private lateinit var binding: FragmentArticleBinding
+    private lateinit var config: Config
+    private var _binding: FragmentArticleBinding? = null
+    private val binding get() = _binding!!
 
-    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 settings = Settings()
 
     private var typeface: Typeface? = null
     private var resId: Int = 0
     private var font = ""
+    private var staticBar = false
 
-    private val mercuryApi: MercuryApi by instance()
+    override fun onStop() {
+        super.onStop()
+        if (mCustomTabActivityHelper != null) {
+            mCustomTabActivityHelper!!.unbindCustomTabsService(activity)
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        appColors = AppColors(requireActivity())
+        config = Config()
+
         super.onCreate(savedInstanceState)
 
         val pi: ParecelableItem = requireArguments().getParcelable(ARG_ITEMS)!!
@@ -105,366 +102,352 @@ class ArticleFragment :
         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 =
+            contentSource = item.sourceAndDateText(repository.dateUtils)
-                try {
-                    item.sourceAuthorAndDate()
-                } catch (e: Exception) {
-                    e.sendSilentlyWithAcraWithName("Article Fragment parse date")
-                    item.sourceAuthorOnly()
-                }
             allImages = item.getImages()
 
-            fontSize = appSettingsService.getFontSize()
+            fontSize = settings.getString("reader_font_size", "16").toInt()
-            font = appSettingsService.getFont()
+            staticBar = settings.getBoolean("reader_static_bar", false)
+
+            font = settings.getString("reader_font", "")
+            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()
 
-            handleFloatingToolbar()
+            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()
+            }
 
             binding.source.text = contentSource
             if (typeface != null) {
                 binding.source.typeface = typeface
             }
 
-            handleContent()
+            if (contentText.isEmptyOrNullOrNullString()) {
-        } catch (e: InflateException) {
+                getContentFromMercury(customTabsIntent)
-            e.sendSilentlyWithAcraWithName("webview not available")
+            } else {
-            maybeIfContext {
+                binding.titleView.text = contentTitle
-                AlertDialog
+                if (typeface != null) {
-                    .Builder(it)
+                    binding.titleView.typeface = typeface
-                    .setMessage(it.getString(R.string.webview_dialog_issue_message))
+                }
-                    .setTitle(it.getString(R.string.webview_dialog_issue_title))
+
-                    .setPositiveButton(
+                htmlToWebview()
-                        android.R.string.ok,
+
-                    ) { _, _ ->
+                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                        appSettingsService.disableArticleViewer()
+                    binding.imageView.visibility = View.VISIBLE
-                        requireActivity().finish()
+                    Glide
-                    }.create()
+                        .with(requireContext())
-                    .show()
+                        .asBitmap()
+                        .loadMaybeBasicAuth(config, 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()
+                        }
+                    }
+                }
+            )
+
+        } 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
+                ) { _, _ ->
+                    settings.putBoolean("prefer_article_viewer", false)
+                    requireActivity().finish()
+                }
+                .create()
+                .show()
         }
 
         return binding.root
     }
 
-    private fun handleContent() {
+    override fun onDestroyView() {
-        if (contentText.isEmptyOrNullOrNullString()) {
+        super.onDestroyView()
-            if (connectivityService.isNetworkAvailable() && url.isUrlValid()) {
+        _binding = null
-                getContentFromMercury(url!!)
+    }
-            }
-        } else {
-            binding.titleView.text = contentTitle
-            if (typeface != null) {
-                binding.titleView.typeface = typeface
-            }
 
-            htmlToWebview()
+    private fun refreshAlignment() {
-
+        textAlignment = when (settings.getInt("text_align", 1)) {
-            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+            1 -> "justify"
-                binding.imageView.visibility = View.VISIBLE
+            2 -> "left"
-                maybeIfContext { it.bitmapFitCenter(contentImage, binding.imageView, appSettingsService) }
+            else -> "justify"
-            } else {
-                binding.imageView.visibility = View.GONE
-            }
         }
     }
 
-    private fun handleFloatingToolbar() {
+    private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
-        fab = binding.speedDial
+        if (repository.isNetworkAvailable()) {
-        fab.mainFabClosedIconColor = colorOnSurface
-        fab.mainFabOpenedIconColor = colorOnSurface
-
-        maybeIfContext { handleFloatingToolbarActionItems(it) }
-
-        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()
-                        }
-                    }
-
-                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
+        val parser = MercuryApi()
 
-        CoroutineScope(Dispatchers.Main).launch {
+            parser.parseUrl(url).enqueue(
-            try {
+                object : Callback<ParsedContent> {
-                val response = mercuryApi.query(url)
+                    override fun onResponse(
-                if (response.success && response.data != null) {
+                        call: Call<ParsedContent>,
-                    handleMercuryData(response.data!!)
+                        response: Response<ParsedContent>
-                } 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) }
+                        // TODO: clean all the following after finding the mercury content issue
-                        true
+                        try {
-                    } else {
+                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
-                        false
+                                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) {
+                                }
 
-                @Suppress("detekt:SwallowedException", "detekt:ReturnCount")
+                                try {
-                @Deprecated("Deprecated in Java")
+                                    contentText = response.body()!!.content.orEmpty()
-                override fun shouldInterceptRequest(
+                                    htmlToWebview()
-                    view: WebView,
+                                } catch (e: Exception) {
-                    url: String,
+                                }
-                ): WebResourceResponse? {
+
-                    val (mime: String?, compression: Bitmap.CompressFormat) =
+                                try {
-                        if (url
+                                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                .lowercase(Locale.US)
+                                        binding.imageView.visibility = View.VISIBLE
-                                .contains(".jpg") ||
+                                        try {
-                            url.lowercase(Locale.US).contains(".jpeg")
+                                            Glide
-                        ) {
+                                                .with(requireContext())
-                            Pair(IMAGE_JPG, Bitmap.CompressFormat.JPEG)
+                                                .asBitmap()
-                        } else if (url.lowercase(Locale.US).contains(".png")) {
+                                                .loadMaybeBasicAuth(
-                            Pair(IMAGE_PNG, Bitmap.CompressFormat.PNG)
+                                                    config,
-                        } else if (url.lowercase(Locale.US).contains(".webp")) {
+                                                    response.body()!!.lead_image_url.orEmpty()
-                            Pair(IMAGE_WEBP, Bitmap.CompressFormat.WEBP)
+                                                )
-                        } else {
+                                                .apply(RequestOptions.fitCenterTransform())
-                            return super.shouldInterceptRequest(view, url)
+                                                .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) {
+                            }
                         }
-
-                    try {
-                        val image = view.getGlideImageForResource(url, appSettingsService)
-                        return WebResourceResponse(
-                            mime,
-                            "UTF-8",
-                            getBitmapInputStream(image, compression),
-                        )
-                    } catch (e: ExecutionException) {
-                        return super.shouldInterceptRequest(view, url)
                     }
+
+                    override fun onFailure(
+                        call: Call<ParsedContent>,
+                        t: Throwable
+                    ) = openInBrowserAfterFailing(customTabsIntent)
                 }
-            }
+            )
+        }
     }
 
-    @Suppress("detekt:LongMethod", "detekt:ImplicitDefaultLocale")
     private fun htmlToWebview() {
-        maybeIfContext {
+        val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
-            val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-            val a: TypedArray = it.obtainStyledAttributes(resId, attrs)
 
-            binding.webcontent.settings.standardFontFamily = a.getString(0)
+        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-            ""
+        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
-        }
+
+
+        binding.webcontent.settings.standardFontFamily = a.getString(0)
         binding.webcontent.visibility = View.VISIBLE
 
-        val colorSurfaceString =
+        // TODO: Set the color strings programmatically
-            String.format(
+        val (stringTextColor, stringBackgroundColor) = if (appColors.isDarkTheme) {
-                "#%06X",
+            Pair("#FFFFFF", "#303030")
-                WHITE_COLOR_HEX and (if (colorSurface != DATA_NULL_UNDEFINED) colorSurface else WHITE_COLOR_HEX),
+        } else {
-            )
+            Pair("#212121", "#FAFAFA")
-
+        }
-        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
 
-        handleImageLoading()
+        binding.webcontent.webViewClient = object : WebViewClient() {
-        try {
+            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
-            val gestureDetector =
+                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                GestureDetector(
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-                    activity,
+                }
-                    object : GestureDetector.SimpleOnGestureListener() {
+                return true
-                        override fun onSingleTapUp(e: MotionEvent): Boolean = performClick()
+            }
-                    },
+
-                )
+            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
-
+                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-            binding.webcontent.setOnTouchListener { _, event ->
+                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
-                gestureDetector.onTouchEvent(
+                    try {
-                    event,
+                        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)
             }
-        } 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.orEmpty())
+            val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-            e.sendSilentlyWithAcraWithName("htmlToWebview > ${url.orEmpty()}")
         }
 
-        val fontName: String =
+        val fontName =  when (font) {
-            maybeIfContext {
+            getString(R.string.open_sans_font_id) -> "Open Sans"
-                when (font) {
+            getString(R.string.roboto_font_id) -> "Roboto"
-                    it.getString(R.string.open_sans_font_id) -> "Open Sans"
+            else -> ""
-                    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 =
+        val fontLinkAndStyle = if (font.isNotEmpty()) {
-            if (fontName.isNotEmpty()) {
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
-                """<link href="https://fonts.googleapis.com/css?family=${
-                    fontName.replace(
-                        " ",
-                        "+",
-                    )
-                }" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
                 |   }
                 |</style>
-                """.trimMargin()
+            """.trimMargin()
-            } else {
+        } else {
-                ""
+            ""
-            }
+        }
-        try {
+
-            binding.webcontent.loadDataWithBaseURL(
+        binding.webcontent.loadDataWithBaseURL(
-                baseUrl,
+            baseUrl,
-                """<html>
+            """<html>
                 |<head>
                 |   <meta name="viewport" content="width=device-width, initial-scale=1">
                 |   <style>
@@ -475,15 +458,10 @@ class ArticleFragment :
                 |        max-width: 100%;
                 |      }
                 |      a {
-                |        color: ${
+                |        color: $stringColor !important;
-                    String.format(
-                        "#%06X",
-                        WHITE_COLOR_HEX and (maybeIfContext { it.resources.getColor(R.color.colorAccent) } as Int),
-                    )
-                } !important;
                 |      }
                 |      *:not(a) {
-                |        color: $colorOnSurfaceString;
+                |        color: $stringTextColor;
                 |      }
                 |      * {
                 |        font-size: ${fontSize}px;
@@ -491,11 +469,11 @@ class ArticleFragment :
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: $colorSurfaceString;
+                |        background-color: $stringBackgroundColor;
                 |      }
                 |      body, html {
-                |        background-color: $colorSurfaceString !important;
+                |        background-color: $stringBackgroundColor !important;
-                |        border-color: $colorSurfaceString  !important;
+                |        border-color: $stringBackgroundColor  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -505,45 +483,45 @@ class ArticleFragment :
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: $colorSurfaceString;
+                |        background-color: $stringBackgroundColor;
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
                 |</head>
                 |<body>
                 |   $contentText
-                |</body>
+                |</body>""".trimMargin(),
-                """.trimMargin(),
+            "text/html",
-                "text/html",
+            "utf-8",
-                "utf-8",
+            null
-                null,
+        )
-            )
-        } catch (e: IllegalStateException) {
-            e.sendSilentlyWithAcraWithName("Context required is still null ?")
-        }
     }
 
-    fun volumeButtonScrollDown() {
+    fun scrollDown() {
         val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, height / 2)
+        binding.nestedScrollView.smoothScrollBy(0, height/2)
     }
 
-    fun volumeButtonScrollUp() {
+    fun scrollUp() {
         val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, -height / 2)
+        binding.nestedScrollView.smoothScrollBy(0, -height/2)
     }
 
-    private fun openInBrowserAfterFailing() {
+    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
         binding.progressBar.visibility = View.GONE
-        maybeIfContext {
+        requireActivity().openItemUrlInternalBrowser(
-            it.openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+                url,
-        }
+                customTabsIntent,
+                requireActivity()
+        )
     }
 
     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())
@@ -553,13 +531,10 @@ class ArticleFragment :
     }
 
     fun performClick(): Boolean {
-        if (allImages != null &&
+        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-            (
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+
-                    binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
-            )
-        ) {
-            val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
             intent.putExtra("allImages", allImages)
@@ -569,4 +544,6 @@ class ArticleFragment :
         }
         return false
     }
+
+
 }

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

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

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

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

@@ -2,26 +2,27 @@ 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(
+fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
-    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)) {
+            if ( URLUtil.isValidUrl(url)) {
-                context.preloadImage(url, appSettingsService)
+                Glide.with(context).asBitmap()
+                    .apply(glideOptions)
+                    .load(url).submit()
             }
         }
-    } catch (e: Error) {
+    } catch (e : Error) {
-        e.sendSilentlyWithAcraWithName("preloadImages")
         return false
     }
 
@@ -34,8 +35,8 @@ fun String.toTextDrawableString(): String {
         try {
             textDrawable.append(s[0])
         } catch (e: StringIndexOutOfBoundsException) {
-            e.sendSilentlyWithAcraWithName("toTextDrawableString")
+            // We do nothing
         }
     }
     return textDrawable.toString()
-}
+}

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

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

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

@@ -1,51 +1,47 @@
 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.*
-import android.text.InputFilter
+import androidx.preference.EditTextPreference
-import android.text.InputType
+import androidx.preference.PreferenceManager
-import android.text.TextWatcher
+import android.view.*
 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 bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
+import bou.amine.apps.readerforselfossv2.android.utils.Config
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import com.ftinc.scoop.Scoop
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.API_ITEMS_NUMBER
+import com.russhwolf.settings.Settings
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService.Companion.CURRENT_THEME
+import java.lang.NumberFormatException
-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"
 
-const val MAX_ITEMS_NUMBER = 200
+class SettingsActivity : AppCompatActivity(),
-
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
-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()
+                    .beginTransaction()
-                .replace(R.id.settings, MainPreferenceFragment())
+                    .replace(R.id.settings, MainPreferenceFragment())
-                .commit()
+                    .commit()
         } else {
             title = savedInstanceState.getCharSequence(TITLE_TAG)
         }
@@ -68,202 +64,157 @@ class SettingsActivity :
         outState.putCharSequence(TITLE_TAG, title)
     }
 
-    override fun onSupportNavigateUp(): Boolean =
+    override fun onSupportNavigateUp(): Boolean {
         if (supportFragmentManager.popBackStackImmediate()) {
             supportActionBar?.title = getText(R.string.title_activity_settings)
-            false
+            return true
-        } else {
-            super.onBackPressed()
-            true
         }
+        return super.onSupportNavigateUp()
+    }
 
     override fun onPreferenceStartFragment(
-        caller: PreferenceFragmentCompat,
+            caller: PreferenceFragmentCompat,
-        pref: Preference,
+            pref: Preference
     ): Boolean {
         // Instantiate the new Fragment
         val args = pref.extras
-        val fragment =
+        val fragment = supportFragmentManager.fragmentFactory.instantiate(
-            supportFragmentManager.fragmentFactory
+                classLoader,
-                .instantiate(
+                pref.fragment
-                    classLoader,
+        ).apply {
-                    pref.fragment.toString(),
+            arguments = args
-                ).apply {
+            setTargetFragment(caller, 0)
-                    arguments = args
+        }
-                    setTargetFragment(caller, 0)
-                }
         // Replace the existing Fragment with the new Fragment
-        supportFragmentManager
+        supportFragmentManager.beginTransaction()
-            .beginTransaction()
+                .replace(R.id.settings, fragment)
-            .replace(R.id.settings, fragment)
+                .addToBackStack(null)
-            .addToBackStack(null)
+                .commit()
-            .commit()
         title = pref.title
         supportActionBar?.title = title
         return true
     }
 
     class MainPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
-
-            preferenceManager.findPreference<Preference>(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(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_general, rootKey)
 
-            val editTextPreference =
+            val editTextPreference = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
-                preferenceManager.findPreference<EditTextPreference>(API_ITEMS_NUMBER)
             editTextPreference?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.filters =
+                editText.filters = arrayOf(
-                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input: Int = (dest.toString() + source.toString()).toInt()
-                                if (input in MIN_ITEMS_NUMBER..MAX_ITEMS_NUMBER) return@InputFilter null
+                                if (input in 1..200) return@InputFilter null
                             } catch (nfe: NumberFormatException) {
-                                Toast
+                                Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
-                                    .makeText(
-                                        activity,
-                                        R.string.items_number_should_be_number,
-                                        Toast.LENGTH_LONG,
-                                    ).show()
                             }
                             ""
-                        },
+                        }
-                    )
+                )
             }
         }
     }
 
     class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_viewer, rootKey)
 
-            val fontSize = preferenceManager.findPreference<EditTextPreference>(READER_FONT_SIZE)
+            val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.addTextChangedListener {
+                editText.addTextChangedListener { object : TextWatcher {
-                    object : TextWatcher {
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                        override fun beforeTextChanged(
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                            charSequence: CharSequence,
+                    override fun afterTextChanged(editable: Editable) {
-                            i: Int,
+                        try {
-                            i1: Int,
+                            editText.textSize = editable.toString().toInt().toFloat()
-                            i2: Int,
+                        } catch (e: NumberFormatException) {
-                        ) {
-                            // 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 =
+                editText.filters = arrayOf(
-                    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(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_offline, rootKey)
         }
     }
 
-    class LinksPreferenceFragment : PreferenceFragmentCompat() {
+    class ThemePreferenceFragment : PreferenceFragmentCompat() {
-        private fun openUrl(url: String) {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            context?.openUrlInBrowser(url)
+            setPreferencesFromResource(R.xml.pref_theme, rootKey)
+            setHasOptionsMenu(true)
         }
 
-        override fun onCreatePreferences(
+        override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-            savedInstanceState: Bundle?,
+            super.onCreateOptionsMenu(menu, inflater)
-            rootKey: String?,
+            inflater.inflate(R.menu.settings_theme, menu)
-        ) {
+        }
+
+        override fun onOptionsItemSelected(item: MenuItem): Boolean {
+            val id = item.itemId
+            if (id == R.id.clear) {
+                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")
+                requireActivity().recreate()
+            }
+            return super.onOptionsItemSelected(item)
+        }
+    }
+
+    class LinksPreferenceFragment : PreferenceFragmentCompat() {
+        private fun openUrl(uri: Uri?) {
+            val browserIntent = Intent(Intent.ACTION_VIEW, uri)
+            startActivity(browserIntent)
+        }
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             setPreferencesFromResource(R.xml.pref_links, rootKey)
 
-            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.trackerUrl))
-                    openUrl(AppSettingsService.BUG_URL)
+                true
-                    true
+            }
-                }
 
-            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.sourceUrl))
-                    openUrl(AppSettingsService.SOURCE_URL)
+                false
-                    false
+            }
-                }
 
-            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.translationUrl))
-                    openUrl(AppSettingsService.TRANSLATION_URL)
+                false
-                    false
+            }
-                }
         }
     }
 
     class ExperimentalPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_experimental, rootKey)
         }
     }
-}
+}

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

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

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

@@ -0,0 +1,61 @@
+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)
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+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,60 +2,20 @@ 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(
+fun Context.shareLink(itemUrl: String, itemTitle: String) {
-    itemUrl: String?,
+    val sendIntent = Intent()
-    itemTitle: String,
+    sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-) {
+    sendIntent.action = Intent.ACTION_SEND
-    if (itemUrl.isUrlValid()) {
+    sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
-        val sendIntent = Intent()
+    sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
-        sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    sendIntent.type = "text/plain"
-        sendIntent.action = Intent.ACTION_SEND
+    startActivity(
-        sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl!!.toStringUriWithHttp())
+        Intent.createChooser(
-        sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
+            sendIntent,
-        sendIntent.type = "text/plain"
+            getString(R.string.share)
-        startActivity(
+        ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            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

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

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

@@ -0,0 +1,62 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+import com.russhwolf.settings.Settings
+
+class Config {
+
+    val settings = Settings()
+
+    val baseUrl: String
+        get() = settings.getString("url", "")
+
+    val userLogin: String
+        get() = settings.getString("login", "")
+
+    val userPassword: String
+        get() = settings.getString("password", "")
+
+    val httpUserLogin: String
+        get() = settings.getString("httpUserName", "")
+
+    val httpUserPassword: String
+        get() = settings.getString("httpPassword", "")
+
+    companion object {
+        const val settingsName = "paramsselfoss"
+
+        const val feedbackEmail = "aminecmi@pm.me.com"
+
+        const val translationUrl = "https://crwd.in/readerforselfoss"
+
+        const val sourceUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform"
+
+        const val trackerUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
+
+        const val syncChannelId = "sync-channel-id"
+
+        const val newItemsChannelId = "new-items-channel-id"
+
+        var apiVersion = 0
+
+        /* Execute logout and clear all settings to default */
+        fun logoutAndRedirect(
+            c: Context,
+            callingActivity: Activity,
+            baseUrlFail: Boolean = false
+        ): Boolean {
+            val settings = Settings()
+            settings.clear()
+            val intent = Intent(c, LoginActivity::class.java)
+            if (baseUrlFail) {
+                intent.putExtra("baseUrlFail", baseUrlFail)
+            }
+            c.startActivity(intent)
+            callingActivity.finish()
+            return true
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import okhttp3.OkHttpClient
+import java.security.cert.CertificateException
+import java.security.cert.X509Certificate
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+
+fun getUnsafeHttpClient(): OkHttpClient.Builder =
+    try {
+        // Create a trust manager that does not validate certificate chains
+        val trustAllCerts = arrayOf<TrustManager>(object : X509TrustManager {
+            override fun getAcceptedIssuers(): Array<X509Certificate> =
+                arrayOf()
+
+            @Throws(CertificateException::class)
+            override fun checkClientTrusted(
+                chain: Array<java.security.cert.X509Certificate>,
+                authType: String
+            ) {
+            }
+
+            @Throws(CertificateException::class)
+            override fun checkServerTrusted(
+                chain: Array<java.security.cert.X509Certificate>,
+                authType: String
+            ) {
+            }
+        })
+
+        // Install the all-trusting trust manager
+        val sslContext = SSLContext.getInstance("SSL")
+        sslContext.init(null, trustAllCerts, java.security.SecureRandom())
+
+        val sslSocketFactory = sslContext.socketFactory
+
+        OkHttpClient.Builder()
+            .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
+            .hostnameVerifier { _, _ -> true }
+    } catch (e: Exception) {
+        throw RuntimeException(e)
+    }

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

@@ -1,10 +1,13 @@
 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
@@ -12,40 +15,155 @@ 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.isEmptyOrNullOrNullString
+import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
-fun Context.openItemUrl(
+fun Context.buildCustomTabsIntent(): CustomTabsIntent {
-    currentItem: Int,
+
-    linkDecoded: String?,
+    val actionIntent = Intent(Intent.ACTION_SEND)
-    articleViewer: Boolean,
+    actionIntent.type = "text/plain"
-    app: Activity,
+    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-) {
+        PendingIntent.FLAG_IMMUTABLE
-    if (!linkDecoded.isUrlValid()) {
-        Toast
-            .makeText(
-                this,
-                this.getString(R.string.cant_open_invalid_url),
-                Toast.LENGTH_LONG,
-            ).show()
     } else {
-        if (articleViewer) {
+        0
-            val intent = Intent(this, ReaderActivity::class.java)
+    }
-            intent.putExtra("currentItem", currentItem)
+    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
-            app.startActivity(intent)
+            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,
+    articleViewer: Boolean,
+    app: Activity
+) {
+
+    if (!linkDecoded.isUrlValid()) {
+        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
+            )
         } else {
-            this.openUrlInBrowserAsNewTask(linkDecoded!!)
+            this.openItemUrlInternalBrowser(
+                    linkDecoded,
+                    customTabsIntent,
+                    app
+            )
         }
     }
 }
 
-fun String?.isUrlValid(): Boolean =
+private fun openInBrowser(linkDecoded: String, app: Activity) {
-    !this.isEmptyOrNullOrNullString() && this!!.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+    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.isBaseUrlInvalid(): Boolean {
+fun String.isUrlValid(): Boolean =
+    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+
+fun String.isBaseUrlValid(ctx: Context): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
@@ -53,42 +171,18 @@ fun String.isBaseUrlInvalid(): Boolean {
         existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
     }
 
-    return !(Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash)
+    return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
 }
 
-fun Context.openItemUrlInBrowserAsNewTask(i: SelfossModel.Item) {
+fun Context.openInBrowserAsNewTask(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.data = Uri.parse(url)
+    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-    this.mayBeStartActivity(intent)
+    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
+    startActivity(intent)
 }
 
-@Suppress("detekt:SwallowedException")
+class LinkOnTouchListener: View.OnTouchListener {
-fun Context.mayBeStartActivity(intent: Intent) {
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-    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
@@ -97,8 +191,7 @@ 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

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

@@ -1,26 +0,0 @@
-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,13 +1,6 @@
 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("")
@@ -15,26 +8,5 @@ fun TextBadgeItem.removeBadge(): TextBadgeItem {
     return this
 }
 
-fun TextBadgeItem.maybeShow(): TextBadgeItem = if (this.isHidden) this.show() else this
+fun TextBadgeItem.maybeShow(): TextBadgeItem =
-
+    if (this.isHidden) this.show() else this
-@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

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

@@ -0,0 +1,130 @@
+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 androidx.browser.customtabs.CustomTabsService;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.helpers.KeepAliveService;
+
+@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

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

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

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

@@ -0,0 +1,15 @@
+/* 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 androidx.recyclerview.widget.RecyclerView
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+
+import bou.amine.apps.readerforselfossv2.android.R
+
+open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
+    var icon: ImageView = view.findViewById(R.id.material_drawer_icon)
+    var name: TextView = view.findViewById(R.id.material_drawer_name)
+    var description: TextView = view.findViewById(R.id.material_drawer_description)
+}

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

@@ -3,134 +3,67 @@ 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.util.Base64
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import android.widget.ImageView
-import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
+import bou.amine.apps.readerforselfossv2.android.utils.Config
-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.RequestBuilder
+import com.bumptech.glide.RequestManager
 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.ViewTarget
+import com.bumptech.glide.request.target.BitmapImageViewTarget
-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
 
-private const val PRELOAD_IMAGE_TIMEOUT = 10000
+fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
+    Glide.with(this)
+        .asBitmap()
+        .loadMaybeBasicAuth(config, url)
+        .apply(RequestOptions.centerCropTransform())
+        .into(iv)
 
-@Suppress("detekt:ReturnCount")
+fun Context.circularBitmapDrawable(config: Config, url: String, iv: ImageView) =
-@OptIn(ExperimentalEncodingApi::class)
+    Glide.with(this)
-fun String.toGlideUrl(appSettingsService: AppSettingsService): Any { // GlideUrl Or String
+        .asBitmap()
-    if (this.isEmptyOrNullOrNullString()) {
+        .loadMaybeBasicAuth(config, url)
-        return ""
+        .apply(RequestOptions.centerCropTransform())
-    }
+        .into(object : BitmapImageViewTarget(iv) {
-    if (appSettingsService.getBasicUserName().isNotEmpty()) {
+            override fun setResource(resource: Bitmap?) {
-        val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}"
+                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(
-        val authBuf = Base64.encode(authString.toByteArray(Charsets.UTF_8))
+                    resources,
-
+                    resource
-        return GlideUrl(
+                )
-            this,
+                circularBitmapDrawable.isCircular = true
-            LazyHeaders
+                iv.setImageDrawable(circularBitmapDrawable)
-                .Builder()
+            }
-                .addHeader("Authorization", "Basic $authBuf")
+        })
-                .build(),
+
-        )
+fun RequestBuilder<Bitmap>.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Bitmap> {
-    } else {
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
-        return GlideUrl(
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
-            this,
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
-        )
+        builder.addHeader("Authorization", basicAuth)
     }
+    val glideUrl = GlideUrl(url, builder.build())
+    return this.load(glideUrl)
 }
 
-fun WebView.getGlideImageForResource(
+fun RequestManager.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Drawable> {
-    url: String,
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
-    appSettingsService: AppSettingsService,
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
-) = Glide
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
-    .with(this)
+        builder.addHeader("Authorization", basicAuth)
-    .asBitmap()
+    }
-    .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL))
+    val glideUrl = GlideUrl(url, builder.build())
-    .load(url.toGlideUrl(appSettingsService))
+    return this.load(glideUrl)
-    .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 {
-
-fun getBitmapInputStream(
-    bitmap: Bitmap,
-    compressFormat: Bitmap.CompressFormat,
-): InputStream {
     val byteArrayOutputStream = ByteArrayOutputStream()
-    bitmap.compress(compressFormat, BITMAP_INPUT_STREAM_COMPRESSION_QUALITY, byteArrayOutputStream)
+    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
     val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
     return ByteArrayInputStream(bitmapData)
-}
+}

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

@@ -0,0 +1,33 @@
+package bou.amine.apps.readerforselfossv2.android.utils.glide
+
+import android.content.Context
+import bou.amine.apps.readerforselfossv2.android.utils.getUnsafeHttpClient
+import com.bumptech.glide.Glide
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.Registry
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.module.GlideModule
+import com.russhwolf.settings.Settings
+import java.io.InputStream
+
+class SelfSignedGlideModule : GlideModule {
+
+    override fun applyOptions(context: Context?, builder: GlideBuilder?) {
+    }
+
+    override fun registerComponents(context: Context?, glide: Glide?, registry: Registry?) {
+
+        if (context != null) {
+            val settings = Settings()
+            if (settings.getBoolean("isSelfSignedCert", false)) {
+                val client = getUnsafeHttpClient().build()
+
+                registry?.append(
+                    GlideUrl::class.java,
+                    InputStream::class.java,
+                    com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader.Factory(client)
+                )
+            }
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ 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
@@ -10,13 +11,19 @@ lateinit var s: Snackbar
 fun isNetworkAccessible(context: Context): Boolean {
     val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-    val networkCapabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork) ?: return false
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        val network = connectivityManager.activeNetwork ?: return false
+        val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
 
-    return when {
+        return when {
-        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
+            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
-        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-        else -> false
+            else -> false
+        }
+    } else {
+        val network = connectivityManager.activeNetworkInfo ?: return false
+        return network.isConnectedOrConnecting
     }
-}
+}

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

@@ -0,0 +1,83 @@
+package bou.amine.apps.readerforselfossv2.android.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.model.SelfossModel
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.utils.ItemType
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class AppViewModel(private val repository: Repository) : ViewModel() {
+    private val _networkAvailableProvider = MutableSharedFlow<Boolean>()
+    val networkAvailableProvider = _networkAvailableProvider.asSharedFlow()
+    private val _refreshingIndicatorProvider = MutableSharedFlow<Boolean>()
+    val refreshingIndicatorProvider = _refreshingIndicatorProvider.asSharedFlow()
+    private val _toastMessageProvider = MutableSharedFlow<Int>()
+    val toastMessageProvider = _toastMessageProvider.asSharedFlow()
+    private var wasConnected = true
+
+    private val _items = MutableStateFlow(ArrayList<SelfossModel.Item>())
+    val items = _items.asStateFlow()
+
+    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
+                    }
+                }
+            }
+        }
+    }
+
+    fun updateRemote() {
+        CoroutineScope(Dispatchers.IO).launch {
+            _toastMessageProvider.emit(R.string.refresh_in_progress)
+            val updatedRemote = repository.updateRemote()
+            if (updatedRemote) {
+                _toastMessageProvider.emit(R.string.refresh_success_response)
+            } else {
+                _toastMessageProvider.emit(R.string.refresh_failer_message)
+            }
+        }
+    }
+
+    fun getItems(appendResults: Boolean, itemType: ItemType) {
+        CoroutineScope(Dispatchers.Main).launch {
+            _refreshingIndicatorProvider.emit(true)
+            repository.displayedItems = itemType
+            val items = if (appendResults) {
+                repository.getOlderItems()
+            } else {
+                repository.getNewerItems()
+            }
+            _items.emit(items)
+            _refreshingIndicatorProvider.emit(false)
+        }
+    }
+
+    fun markAllAsRead() {
+        CoroutineScope(Dispatchers.IO).launch {
+            _refreshingIndicatorProvider.emit(true)
+            val success = repository.markAllAsRead(items.value)
+            if (success) {
+                _toastMessageProvider.emit(R.string.all_posts_read)
+            } else {
+                _toastMessageProvider.emit(R.string.all_posts_not_read)
+            }
+            _refreshingIndicatorProvider.emit(false)
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+<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_bug_report_white_24dp.xml

@@ -0,0 +1,5 @@
+<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="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

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

@@ -0,0 +1,5 @@
+<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_color_lens_white_24dp.xml

@@ -0,0 +1,5 @@
+<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="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>

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

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

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

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

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

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

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawerContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity"
     android:fitsSystemWindows="true"
-    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
@@ -31,10 +32,8 @@
                         android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
-                        android:theme="@style/ToolBarStyle"
+                        app:theme="@style/ToolBarStyle"
-                        app:popupTheme="?attr/toolbarPopupTheme"
+                        app:popupTheme="?attr/toolbarPopupTheme" />
-
-                        />
 
                 </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,19 +45,19 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="?android:attr/windowBackground"
+                        android:orientation="vertical"
-                        android:orientation="vertical">
+                        android:background="?android:attr/windowBackground">
 
                         <TextView
                             android:id="@+id/emptyText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@android:color/transparent"
                             android:gravity="center_horizontal"
                             android:paddingTop="100dp"
                             android:text="@string/nothing_here"
                             android:textAlignment="center"
                             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                            android:background="@android:color/transparent"
                             android:visibility="gone" />
 
                         <androidx.recyclerview.widget.RecyclerView
@@ -70,7 +69,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>
@@ -78,13 +77,17 @@
             </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,40 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="match_parent">
-    app:layoutDescription="@xml/image_close_scene">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.Toolbar android:theme="@style/ToolBarStyle"
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-
+            app:popupTheme="?attr/toolbarPopupTheme"
-            />
+            app:theme="@style/ToolBarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/scrollView"
+        android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
-        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
-        <androidx.viewpager2.widget.ViewPager2
+</androidx.constraintlayout.widget.ConstraintLayout>
-            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,12 +1,11 @@
 <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">
@@ -15,17 +14,18 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ToolBarStyle"
+            app: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:padding="@dimen/activity_horizontal_margin">
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
         <!-- Login progress -->
         <ProgressBar
             android:id="@+id/loginProgress"
@@ -33,72 +33,106 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:visibility="gone" />
+            android:visibility="gone"/>
 
-        <LinearLayout
+        <ScrollView
             android:id="@+id/loginForm"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="match_parent">
-            android:orientation="vertical">
 
-            <EditText
+            <LinearLayout
-                android:id="@+id/urlView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/prompt_url"
+                android:orientation="vertical">
-                android:imeOptions="actionUnspecified"
-                android:importantForAutofill="no"
-                android:inputType="textUri"
-                android:maxLines="1"
-                android:minHeight="48dp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+                <EditText
-                android:id="@+id/selfSigned"
+                    android:id="@+id/urlView"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                android:text="@string/disable_ssl"
+                    android:hint="@string/prompt_url"
-                android:textAlignment="viewStart" />
+                    android:imeOptions="actionUnspecified"
+                    android:importantForAutofill="no"
+                    android:inputType="textUri"
+                    android:maxLines="1" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/withLogin"
+                    android:text="@string/withLoginSwitch"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="0dp"
-                android:text="@string/withLoginSwitch"
+                    android:id="@+id/withLogin"
-                android:textAlignment="viewStart" />
+                    android:layout_weight="1"/>
 
-            <EditText
+                <EditText
-                android:id="@+id/loginView"
+                    android:id="@+id/loginView"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                android:autofillHints="username"
+                    android:autofillHints="username"
-                android:hint="@string/prompt_login"
+                    android:hint="@string/prompt_login"
-                android:inputType="text"
+                    android:inputType="text"
-                android:maxLines="1"
+                    android:maxLines="1"
-                android:minHeight="48dp"
+                    android:visibility="gone" />
-                android:visibility="gone" />
 
-            <EditText
+                <EditText
-                android:id="@+id/passwordView"
+                    android:id="@+id/passwordView"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                android:autofillHints="password"
+                    android:autofillHints="password"
-                android:hint="@string/prompt_password"
+                    android:hint="@string/prompt_password"
-                android:inputType="textPassword"
+                    android:inputType="textPassword"
-                android:maxLines="1"
+                    android:maxLines="1"
-                android:minHeight="48dp"
+                    android:visibility="gone" />
-                android:visibility="gone" />
 
-            <Button
+                <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/signInButton"
+                    android:id="@+id/withHttpLogin"
-                style="?android:textAppearanceSmall"
+                    android:layout_width="match_parent"
-                android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
-                android:layout_height="wrap_content"
+                    android:layout_weight="1"
-                android:layout_marginTop="16dp"
+                    android:text="@string/withHttpLoginSwitch" />
-                android:layout_marginBottom="16dp"
-                android:text="@string/action_sign_in"
-                android:textStyle="bold" />
 
-        </LinearLayout>
+                <EditText
+                    android:id="@+id/httpLoginView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="username"
+                    android:hint="@string/prompt_http_login"
+                    android:inputType="text"
+                    android:visibility="gone" />
+
+                <EditText
+                    android:id="@+id/httpPasswordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:hint="@string/prompt_http_password"
+                    android:inputType="textPassword"
+                    android:visibility="gone" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/withSelfhostedCert"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/self_hosted_cert_switch" />
+
+                <TextView
+                    android:id="@+id/warningText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/self_signed_cert_warning"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    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" />
+
+            </LinearLayout>
+        </ScrollView>
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

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

@@ -17,10 +17,8 @@
             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>