.drone.yml

@@ -3,38 +3,35 @@ type: docker
 name: test
 
 steps:
-  - name: Lint
-    failure: ignore
-    image: mingc/android-build-box:latest
-    commands:
-      - echo "---------------------------------------------------------"
-      - echo "Install linters..."
-      - curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
-      - curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
-      - echo "---------------------------------------------------------"
-      - echo "Linting..."
-      - ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true
-      - echo "---------------------------------------------------------"
-      - echo "Detecting..."
-      - ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
-      - echo "---------------------------------------------------------"
-    command_timeout: 1m
   - name: BuildAndTest
     image: mingc/android-build-box:latest
     commands:
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
       - echo "---------------------------------------------------------"
-      - echo "Configure java..."
+      - echo "Building..."
-      - . ~/.bash_profile
+      - ./gradlew build -x test
-      - jenv global 17.0
-      - java --version
-      - date
       - echo "---------------------------------------------------------"
-      - echo "Building and testing..."
+      - echo "Testing..."
-      - ./gradlew build
       - echo "---------------------------------------------------------"
+      - ./gradlew koverMergedXmlReport
+    environment:
+      TZ: Europe/Paris
+      SONAR_HOST_URL:
+        from_secret: sonarScannerHostUrl
+      SONAR_LOGIN:
+        from_secret: sonarScannerLogin
+  - name: Analyse
+    image: kytay/sonar-node-plugin
+    settings:
+      sonar_host:
+        from_secret: sonarScannerHostUrl
+      sonar_token:
+        from_secret: sonarScannerLogin
+      use_node_version: 16.18.1
+      sonar_debug: true
+      sonar_project_settings: ./sonar-project.properties
 trigger:
   event:
     - push
@@ -46,36 +43,24 @@ type: docker
 name: Publish
 
 steps:
-  - name: createTagAndChangelog
+  - name: createTag
     image: ubuntu:latest
     commands:
       - apt-get update && apt-get install -y git
-      - git fetch --tags -p
-      - PREV=$(git describe --tags --abbrev=0)
       - ./build.sh --publish --from-ci
-      - VER=$(git describe --tags --abbrev=0)
+      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
-      - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+      - git push pushing --tags
-      - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
-      - git add CHANGELOG.md
-      - git commit -m "Changelog for $VER [CI SKIP]"
     environment:
       TZ: Europe/Paris
-
+      GITEA_USR:
-  - name: git-push
+        from_secret: giteaUsr
-    image: appleboy/drone-git-push
+      GITEA_PASS:
-    settings:
+        from_secret: giteaPass
-      branch: master
-      remote:
-        from_secret: remoteUrl
-      followtags: true
-      ssh_key:
-        from_secret: privateKey
-      skip_verify: true
 
   - name: scpFiles
     image: appleboy/drone-scp
     settings:
-      host: amine-bouabdallaoui.fr
+      host: amine-louveau.fr
       username: ubuntu
       key:
         from_secret: privateKey
@@ -86,13 +71,16 @@ steps:
   - name: deploy
     image: appleboy/drone-ssh
     settings:
-      host: amine-bouabdallaoui.fr
+      host: amine-louveau.fr
       user: ubuntu
       key:
         from_secret: privateKey
       command_timeout: 2m
       script:
-        - cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
+        - cd /home/ubuntu
+        - sudo rm -rf /var/www/amine/version.txt
+        - sudo chown www-data:www-data ./version.txt
+        - sudo mv version.txt /var/www/amine/
 
 trigger:
   event:
@@ -114,13 +102,13 @@ steps:
       - git fetch --tags
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - 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
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
       - echo "---------------------------------------------------------"
       - echo "Generate APK"
-      - ./gradlew :androidApp:assembleGithubConfigRelease
+      - ./gradlew :androidApp:assembleGithubConfigRelease  -P pushCache=false
       - echo "---------------------------------------------------------"
       - echo "Get Key"
-      - wget https://amine-bouabdallaoui.fr/key
+      - wget https://amine-louveau.fr/key
       - echo "---------------------------------------------------------"
       - echo "Zipalign"
       - $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
@@ -142,29 +130,8 @@ steps:
     settings:
       api_key:
         from_secret: giteaAPI
-      base_url: https://gitea.amine-bouabdallaoui.fr
+      base_url: https://gitea.amine-louveau.fr
       files: signed.apk
-
-  - name: notify
-    image: drillster/drone-email
-    failure: ignore
-    settings:
-      host:
-        from_secret: smtpHOST
-      port:
-        from_secret: smtpPORT
-      username:
-        from_secret: smtpUSERNAME
-      password:
-        from_secret: smtpPASSWORD
-      from:
-        from_secret: smtpFROM
-      subject: Mapping file
-      recipients:
-        from_secret: smtpTO
-      recipients_only: true
-      skip_verify: true
-      attachment: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
 trigger:
   event:
     - tag

.github/CONTRIBUTING.md

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

CHANGELOG.md

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

README.md

@@ -1,4 +1,4 @@
-# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-bouabdallaoui.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform)
+# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-louveau.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform)
 
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
@@ -22,15 +22,15 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
 
-2. Check the [Contribution guide](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
+2. Check the [Contribution guide](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
 
-3. Build the project by following [these steps](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
+3. Build the project by following [these steps](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
 
 ## Useful links
 
-- [Check what changed](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
+- [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
-- [See what I'm doing](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
+- [See what I'm doing](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
-- [Create an issue, or request a new feature](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
+- [Create an issue, or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
 
 ## Contributors (V1) (Alphabetical order) ❤️

androidApp/build.gradle.kts

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

androidApp/proguard-rules.pro

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

androidApp/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
@@ -53,7 +52,7 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity
-            android:name=".UpsertSourceActivity"
+            android:name=".AddSourceActivity"
             android:parentActivityName=".SourcesActivity"
             android:exported="true">
             <meta-data
@@ -70,8 +69,7 @@
             android:name=".ReaderActivity">
         </activity>
         <activity
-            android:name=".ImageActivity"
+            android:name=".ImageActivity">
-            android:theme="@style/Theme.AppCompat.ImageActivity">
         </activity>
 
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"

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

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

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

@@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -37,14 +36,15 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 
+
 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {
+
     private var items: ArrayList<SelfossModel.Item> = ArrayList()
 
     private var elementsShown: ItemType = ItemType.UNREAD
@@ -62,22 +62,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private var fromTabShortcut: Boolean = false
 
-    private val settingsLauncher =
+    private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        appSettingsService.refreshUserSettings()
-            appSettingsService.refreshUserSettings()
+    }
-        }
 
     override val di by closestDI()
-    private val repository: Repository by instance()
+    private val repository : Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
+    private val appSettingsService : AppSettingsService by instance()
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeBinding.inflate(layoutInflater)
         val view = binding.root
 
-        fromTabShortcut = intent.getIntExtra("shortcutTab", -1) != -1
+        fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
-        repository.offlineOverride = intent.getBooleanExtra("startOffline", false)
+        repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)
 
         if (fromTabShortcut) {
             elementsShown = ItemType.fromInt(intent.getIntExtra("shortcutTab", ItemType.UNREAD.position))
@@ -91,6 +91,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         handleSwipeRefreshLayout()
 
+
         if (appSettingsService.isItemCachingEnabled()) {
             CoroutineScope(Dispatchers.Main).launch {
                 repository.tryToCacheItemsAndGetNewOnes()
@@ -102,7 +103,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         binding.swipeRefreshLayout.setColorSchemeResources(
             R.color.refresh_progress_1,
             R.color.refresh_progress_2,
-            R.color.refresh_progress_3,
+            R.color.refresh_progress_3
         )
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
@@ -113,41 +114,31 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
-        val swipeDirs =
-            if (appSettingsService.getPublicAccess()) {
-                0
-            } else {
-                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
-            }
-
         val simpleItemTouchCallback =
             object : ItemTouchHelper.SimpleCallback(
                 0,
-                swipeDirs,
+                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
             ) {
                 override fun getSwipeDirs(
                     recyclerView: RecyclerView,
-                    viewHolder: RecyclerView.ViewHolder,
+                    viewHolder: RecyclerView.ViewHolder
                 ): Int =
                     if (elementsShown == ItemType.STARRED) {
                         0
                     } else {
                         super.getSwipeDirs(
                             recyclerView,
-                            viewHolder,
+                            viewHolder
                         )
                     }
 
                 override fun onMove(
                     recyclerView: RecyclerView,
                     viewHolder: RecyclerView.ViewHolder,
-                    target: RecyclerView.ViewHolder,
+                    target: RecyclerView.ViewHolder
                 ): Boolean = false
 
-                override fun onSwiped(
+                override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) {
-                    viewHolder: RecyclerView.ViewHolder,
-                    swipeDir: Int,
-                ) {
                     val position = viewHolder.bindingAdapterPosition
                     val i = items.elementAtOrNull(position)
 
@@ -164,7 +155,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         Toast.makeText(
                             this@HomeActivity,
                             "Found null when swiping at positon $position.",
-                            Toast.LENGTH_LONG,
+                            Toast.LENGTH_LONG
                         ).show()
                     }
                 }
@@ -173,10 +164,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
     }
 
-    private fun updateBottomBarBadgeCount(
+    private fun updateBottomBarBadgeCount(badge: TextBadgeItem, count: Int) {
-        badge: TextBadgeItem,
-        count: Int,
-    ) {
         if (count > 0) {
             badge
                 .setText(count.toString())
@@ -187,18 +175,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBar() {
-        tabNewBadge =
+
-            TextBadgeItem()
+        tabNewBadge = TextBadgeItem()
-                .setText("")
+            .setText("")
-                .setHideOnSelect(false).hide(false)
+            .setHideOnSelect(false).hide(false)
-        tabArchiveBadge =
+        tabArchiveBadge = TextBadgeItem()
-            TextBadgeItem()
+            .setText("")
-                .setText("")
+            .setHideOnSelect(false).hide(false)
-                .setHideOnSelect(false).hide(false)
+        tabStarredBadge = TextBadgeItem()
-        tabStarredBadge =
+            .setText("")
-            TextBadgeItem()
+            .setHideOnSelect(false).hide(false)
-                .setText("")
-                .setHideOnSelect(false).hide(false)
 
         if (appSettingsService.isDisplayUnreadCountEnabled()) {
             lifecycleScope.launch {
@@ -225,19 +211,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         val tabNew =
             BottomNavigationItem(
                 R.drawable.ic_tab_fiber_new_black_24dp,
-                getString(R.string.tab_new),
+                getString(R.string.tab_new)
             )
                 .setBadgeItem(tabNewBadge)
         val tabArchive =
             BottomNavigationItem(
                 R.drawable.ic_tab_archive_black_24dp,
-                getString(R.string.tab_read),
+                getString(R.string.tab_read)
             )
                 .setBadgeItem(tabArchiveBadge)
         val tabStarred =
             BottomNavigationItem(
                 R.drawable.ic_tab_favorite_black_24dp,
-                getString(R.string.tab_favs),
+                getString(R.string.tab_favs)
             ).setActiveColorResource(R.color.pink)
                 .setBadgeItem(tabStarredBadge)
 
@@ -278,6 +264,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         getElementsAccordingToTab()
     }
 
+
     private fun handleGDPRDialog(GDPRShown: Boolean) {
         val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
         messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
@@ -287,7 +274,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
+                "OK"
             ) { dialog, _ ->
                 appSettingsService.settings.putBoolean("GDPR_shown", true)
                 dialog.dismiss()
@@ -304,41 +291,37 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         when (currentManager) {
             is StaggeredGridLayoutManager ->
                 if (!appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
+                    layoutManager = GridLayoutManager(
-                        GridLayoutManager(
+                        this,
-                            this,
+                        calculateNoOfColumns()
-                            calculateNoOfColumns(),
+                    )
-                        )
                     binding.recyclerView.layoutManager = layoutManager
                 }
             is GridLayoutManager ->
                 if (appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
+                    layoutManager = StaggeredGridLayoutManager(
-                        StaggeredGridLayoutManager(
+                        calculateNoOfColumns(),
-                            calculateNoOfColumns(),
+                        StaggeredGridLayoutManager.VERTICAL
-                            StaggeredGridLayoutManager.VERTICAL,
+                    )
-                        )
                     layoutManager.gapStrategy =
-                        StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
                     binding.recyclerView.layoutManager = layoutManager
                 }
             else ->
                 if (currentManager == null) {
                     if (!appSettingsService.isCardViewEnabled()) {
-                        layoutManager =
+                        layoutManager = GridLayoutManager(
-                            GridLayoutManager(
+                            this,
-                                this,
+                            calculateNoOfColumns()
-                                calculateNoOfColumns(),
+                        )
-                            )
                         binding.recyclerView.layoutManager = layoutManager
                     } else {
-                        layoutManager =
+                        layoutManager = StaggeredGridLayoutManager(
-                            StaggeredGridLayoutManager(
+                            calculateNoOfColumns(),
-                                calculateNoOfColumns(),
+                            StaggeredGridLayoutManager.VERTICAL
-                                StaggeredGridLayoutManager.VERTICAL,
+                        )
-                            )
                         layoutManager.gapStrategy =
-                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                                StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
                         binding.recyclerView.layoutManager = layoutManager
                     }
                 }
@@ -346,76 +329,70 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     }
 
     private fun handleBottomBarActions() {
-        binding.bottomBar.setTabSelectedListener(
+        binding.bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener {
-            object : BottomNavigationBar.OnTabSelectedListener {
+            override fun onTabUnselected(position: Int) = Unit
-                override fun onTabUnselected(position: Int) = Unit
 
-                override fun onTabReselected(position: Int) {
+            override fun onTabReselected(position: Int) {
-                    when (val layoutManager = binding.recyclerView.adapter) {
+
-                        is StaggeredGridLayoutManager ->
+                when (val layoutManager = binding.recyclerView.adapter) {
-                            if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
+                    is StaggeredGridLayoutManager ->
-                                getElementsAccordingToTab()
+                        if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
-                            } else {
+                            getElementsAccordingToTab()
-                                layoutManager.scrollToPositionWithOffset(0, 0)
+                        } else {
-                            }
+                            layoutManager.scrollToPositionWithOffset(0, 0)
-                        is GridLayoutManager ->
+                        }
-                            if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
+                    is GridLayoutManager ->
-                                getElementsAccordingToTab()
+                        if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
-                            } else {
+                            getElementsAccordingToTab()
-                                layoutManager.scrollToPositionWithOffset(0, 0)
+                        } else {
-                            }
+                            layoutManager.scrollToPositionWithOffset(0, 0)
-                        else -> Unit
+                        }
-                    }
+                    else -> Unit
                 }
+            }
 
-                override fun onTabSelected(position: Int) {
+            override fun onTabSelected(position: Int) {
-                    offset = 0
+                offset = 0
-                    lastFetchDone = false
+                lastFetchDone = false
 
-                    elementsShown = ItemType.fromInt(position + 1)
+                elementsShown = ItemType.fromInt(position + 1)
-                    getElementsAccordingToTab()
+                getElementsAccordingToTab()
-                    binding.recyclerView.scrollToPosition(0)
+                binding.recyclerView.scrollToPosition(0)
 
-                    fetchOnEmptyList()
+                fetchOnEmptyList()
-                }
+            }
-            },
+        })
-        )
     }
 
     fun fetchOnEmptyList() {
         binding.recyclerView.doOnNextLayout {
+            // TODO: do if last element (or is empty ?)
             getElementsAccordingToTab(true)
         }
     }
 
     private fun handleInfiniteScroll() {
-        recyclerViewScrollListener =
+        recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
-            object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
-                override fun onScrolled(
+                if (dy > 0) {
-                    localRecycler: RecyclerView,
+                    val lastVisibleItem = getLastVisibleItem()
-                    dx: Int,
-                    dy: Int,
-                ) {
-                    if (dy > 0) {
-                        val lastVisibleItem = getLastVisibleItem()
 
-                        if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
+                    if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
-                            getElementsAccordingToTab(appendResults = true)
+                        getElementsAccordingToTab(appendResults = true)
-                        }
                     }
                 }
             }
+        }
 
         binding.recyclerView.clearOnScrollListeners()
         binding.recyclerView.addOnScrollListener(recyclerViewScrollListener)
     }
 
-    private fun getLastVisibleItem(): Int {
+    private fun getLastVisibleItem() : Int {
         return when (val manager = binding.recyclerView.layoutManager) {
-            is StaggeredGridLayoutManager ->
+            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
-                manager.findLastCompletelyVisibleItemPositions(
+                null
-                    null,
+            ).last()
-                ).last()
             is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
             else -> 0
         }
@@ -428,31 +405,28 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             binding.emptyText.visibility = View.GONE
         }
 
-    fun getElementsAccordingToTab(appendResults: Boolean = false) {
+    fun getElementsAccordingToTab(
-        offset =
+        appendResults: Boolean = false
-            if (appendResults && items.size > 0) {
+    ) {
-                items.size - 1
+        offset = if (appendResults && items.size > 0) {
-            } else {
+            items.size - 1
-                0
+        } else {
-            }
+            0
+        }
         firstVisible = if (appendResults) firstVisible else 0
 
         getItems(appendResults, elementsShown)
     }
 
-    private fun getItems(
+    private fun getItems(appendResults: Boolean, itemType: ItemType) {
-        appendResults: Boolean,
-        itemType: ItemType,
-    ) {
         CoroutineScope(Dispatchers.Main).launch {
             binding.swipeRefreshLayout.isRefreshing = true
             repository.displayedItems = itemType
-            items =
+            items = if (appendResults) {
-                if (appendResults) {
+                repository.getOlderItems()
-                    repository.getOlderItems()
+            } else {
-                } else {
+                repository.getNewerItems()
-                    repository.getNewerItems()
+            }
-                }
             binding.swipeRefreshLayout.isRefreshing = false
             handleListResult()
         }
@@ -461,44 +435,43 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun handleListResult(appendResults: Boolean = false) {
         if (appendResults) {
             val oldManager = binding.recyclerView.layoutManager
-            firstVisible =
+            firstVisible = when (oldManager) {
-                when (oldManager) {
+                is StaggeredGridLayoutManager ->
-                    is StaggeredGridLayoutManager ->
+                    oldManager.findFirstCompletelyVisibleItemPositions(null).last()
-                        oldManager.findFirstCompletelyVisibleItemPositions(null).last()
+                is GridLayoutManager ->
-                    is GridLayoutManager ->
+                    oldManager.findFirstCompletelyVisibleItemPosition()
-                        oldManager.findFirstCompletelyVisibleItemPosition()
+                else -> 0
-                    else -> 0
+            }
-                }
         }
 
         if (recyclerAdapter == null) {
             if (appSettingsService.isCardViewEnabled()) {
                 recyclerAdapter =
-                    ItemCardAdapter(
+                        ItemCardAdapter(
-                        this,
+                            this,
-                        items,
+                            items,
-                    ) {
+                        ) {
-                        updateItems(it)
+                            updateItems(it)
-                    }
+                        }
             } else {
                 recyclerAdapter =
-                    ItemListAdapter(
+                        ItemListAdapter(
-                        this,
+                            this,
-                        items,
+                            items,
-                    ) {
+                        ) {
-                        updateItems(it)
+                            updateItems(it)
-                    }
+                        }
 
                 binding.recyclerView.addItemDecoration(
                     DividerItemDecoration(
                         this@HomeActivity,
-                        DividerItemDecoration.VERTICAL,
+                        DividerItemDecoration.VERTICAL
-                    ),
+                    )
                 )
             }
             binding.recyclerView.adapter = recyclerAdapter
         } else {
-            (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
+                (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
         }
 
         reloadBadges()
@@ -538,10 +511,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.home_menu, menu)
-        if (appSettingsService.getPublicAccess()) {
-            menu.removeItem(R.id.readAll)
-            menu.removeItem(R.id.action_sources)
-        }
 
         val searchItem = menu.findItem(R.id.action_search)
         val searchView = searchItem.getActionView() as SearchView
@@ -550,11 +519,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         return true
     }
 
-    private fun needsConfirmation(
+    private fun needsConfirmation(titleRes: Int, messageRes: Int, doFn: () -> Unit) {
-        titleRes: Int,
-        messageRes: Int,
-        doFn: () -> Unit,
-    ) {
         AlertDialog.Builder(this@HomeActivity)
             .setMessage(messageRes)
             .setTitle(titleRes)
@@ -566,11 +531,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.issue_tracker -> {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-                startActivity(browserIntent)
-                return true
-            }
             R.id.action_filter -> {
                 val filterSheetFragment = FilterSheetFragment()
                 filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG)
@@ -579,20 +539,21 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             R.id.refresh -> {
                 needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                     Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
+                    // TODO: Use Dispatchers.IO
                     CoroutineScope(Dispatchers.Main).launch {
                         val updatedRemote = repository.updateRemote()
                         if (updatedRemote) {
+                            // TODO: Send toast messages from the repository
                             Toast.makeText(
                                 this@HomeActivity,
-                                R.string.refresh_success_response,
+                                R.string.refresh_success_response, Toast.LENGTH_LONG
-                                Toast.LENGTH_LONG,
                             )
                                 .show()
                         } else {
                             Toast.makeText(
                                 this@HomeActivity,
                                 R.string.refresh_failer_message,
-                                Toast.LENGTH_SHORT,
+                                Toast.LENGTH_SHORT
                             ).show()
                         }
                     }
@@ -610,7 +571,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 Toast.makeText(
                                     this@HomeActivity,
                                     R.string.all_posts_read,
-                                    Toast.LENGTH_SHORT,
+                                    Toast.LENGTH_SHORT
                                 ).show()
                                 tabNewBadge.removeBadge()
 
@@ -619,7 +580,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                                 Toast.makeText(
                                     this@HomeActivity,
                                     R.string.all_posts_not_read,
-                                    Toast.LENGTH_SHORT,
+                                    Toast.LENGTH_SHORT
                                 ).show()
                             }
                             handleListResult()
@@ -630,24 +591,18 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 return true
             }
             R.id.action_disconnect -> {
-                needsConfirmation(R.string.confirm_disconnect_title, R.string.confirm_disconnect_description) {
+                CoroutineScope(Dispatchers.Main).launch {
-                    runBlocking {
+                    repository.logout()
-                        repository.logout()
-                    }
-                    val intent = Intent(this, LoginActivity::class.java)
-                    this.startActivity(intent)
-                    finish()
                 }
+                this@HomeActivity.finish()
+                val intent = Intent(this, LoginActivity::class.java)
+                this.startActivity(intent)
                 return true
             }
             R.id.action_settings -> {
                 settingsLauncher.launch(Intent(this, SettingsActivity::class.java))
                 return true
             }
-            R.id.action_sources -> {
-                startActivity(Intent(this, SourcesActivity::class.java))
-                return true
-            }
             else -> return super.onOptionsItemSelected(item)
         }
     }
@@ -666,12 +621,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun handleRecurringTask() {
         if (appSettingsService.isPeriodicRefreshEnabled()) {
-            val myConstraints =
+            val myConstraints = Constraints.Builder()
-                Constraints.Builder()
+                .setRequiresBatteryNotLow(true)
-                    .setRequiresBatteryNotLow(true)
+                .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled())
-                    .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled())
+                .setRequiresStorageNotLow(true)
-                    .setRequiresStorageNotLow(true)
+                .build()
-                    .build()
 
             val backgroundWork =
                 PeriodicWorkRequestBuilder<LoadingWorker>(appSettingsService.getRefreshMinutes(), TimeUnit.MINUTES)
@@ -679,9 +633,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                     .addTag("selfoss-loading")
                     .build()
 
-            WorkManager.getInstance(
+            WorkManager.getInstance(baseContext).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
-                baseContext,
-            ).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
         }
     }
 }
+

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

@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -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
             }
         }
@@ -85,6 +45,7 @@ class ImageActivity : AppCompatActivity() {
     }
 
     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+
         override fun getItemCount(): Int = allImages.size
 
         override fun createFragment(position: Int): Fragment = ImageFragment.newInstance(allImages[position])

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

@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.Menu
@@ -28,8 +27,11 @@ import org.acra.ACRA
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import java.security.MessageDigest
+
 
 class LoginActivity : AppCompatActivity(), DIAware {
+
     private var inValidCount: Int = 0
     private var isWithLogin = false
 
@@ -39,6 +41,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -55,7 +58,29 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
         if (appSettingsService.getBaseUrl().isNotEmpty()) {
             showProgress(true)
-            goToMain()
+            // This should be reverted when "old" users connected with a non-selfoss rss
+            // are handled. Revert to "simple" way.
+            CoroutineScope(Dispatchers.Main).launch {
+                try {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
+                        goToMain()
+                    } else {
+                        showProgress(false)
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                        repository.logout()
+                    }
+                } catch (e: Throwable) {
+                    repository.logout()
+                    showProgress(false)
+                }
+            }
         }
 
         handleActions()
@@ -67,6 +92,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun handleActions() {
+
         binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
@@ -74,7 +100,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
                     return@OnEditorActionListener true
                 }
                 false
-            },
+            }
         )
 
         binding.signInButton.setOnClickListener { attemptLogin() }
@@ -95,7 +121,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
+                "OK"
             ) { dialog, _ -> dialog.dismiss() }
             alertDialog.show()
         }
@@ -103,7 +129,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     private fun goToMain() {
         CoroutineScope(Dispatchers.Main).launch {
-            repository.updateApiInformation()
+            repository.updateApiVersion()
             ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
         }
         val intent = Intent(this, HomeActivity::class.java)
@@ -120,6 +146,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun attemptLogin() {
+
         // Reset errors.
         binding.urlView.error = null
         binding.loginView.error = null
@@ -130,72 +157,13 @@ class LoginActivity : AppCompatActivity(), DIAware {
         val login = binding.loginView.text.toString().trim()
         val password = binding.passwordView.text.toString().trim()
 
-        failInvalidUrl(url)
-        failLoginDetails(password, login)
-
-        showProgress(true)
-
-        appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
-
-        repository.refreshLoginInformation(url, login, password)
-
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                repository.updateApiInformation()
-            } catch (e: Exception) {
-                if (e.message?.startsWith("No transformation found") == true) {
-                    Toast.makeText(
-                        applicationContext,
-                        R.string.application_selfoss_only,
-                        Toast.LENGTH_LONG,
-                    ).show()
-                    preferenceError()
-                    showProgress(false)
-                }
-            }
-            val result = repository.login()
-            if (result) {
-                val errorFetching = repository.checkIfFetchFails()
-                if (!errorFetching) {
-                    goToMain()
-                } else {
-                    preferenceError()
-                }
-            } else {
-                preferenceError()
-            }
-            showProgress(false)
-        }
-    }
-
-    private fun failLoginDetails(
-        password: String,
-        login: String,
-    ) {
-        var lastFocusedView: View? = null
         var cancel = false
-        if (isWithLogin) {
+        var focusView: View? = null
-            if (TextUtils.isEmpty(password)) {
-                binding.passwordView.error = getString(R.string.error_invalid_password)
-                lastFocusedView = binding.passwordView
-                cancel = true
-            }
 
-            if (TextUtils.isEmpty(login)) {
-                binding.loginView.error = getString(R.string.error_field_required)
-                lastFocusedView = binding.loginView
-                cancel = true
-            }
-        }
-        maybeCancelAndFocusView(cancel, lastFocusedView)
-    }
-
-    private fun failInvalidUrl(url: String) {
-        val focusView = binding.urlView
-        var cancel = false
         if (url.isBaseUrlInvalid()) {
-            cancel = true
             binding.urlView.error = getString(R.string.login_url_problem)
+            focusView = binding.urlView
+            cancel = true
             inValidCount++
             if (inValidCount == 3) {
                 val alertDialog = AlertDialog.Builder(this).create()
@@ -203,21 +171,55 @@ class LoginActivity : AppCompatActivity(), DIAware {
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
+                    "OK"
                 ) { dialog, _ -> dialog.dismiss() }
                 alertDialog.show()
                 inValidCount = 0
             }
         }
-        maybeCancelAndFocusView(cancel, focusView)
-    }
 
-    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 (cancel) {
             focusView?.requestFocus()
+        } else {
+            showProgress(true)
+
+            repository.refreshLoginInformation(url, login, password)
+
+            CoroutineScope(Dispatchers.Main).launch {
+                val result = repository.login()
+                if (result) {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
+                        goToMain()
+                    } else {
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                        preferenceError()
+                    }
+                } else {
+                    preferenceError()
+                }
+                showProgress(false)
+            }
         }
     }
 
@@ -229,13 +231,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 0F else 1F,
+                if (show) 0F else 1F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
-                    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
@@ -243,13 +244,12 @@ class LoginActivity : AppCompatActivity(), DIAware {
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
-                if (show) 1F else 0F,
+                if (show) 1F else 0F
-            ).setListener(
+            ).setListener(object : AnimatorListenerAdapter() {
-                object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
-                    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
+                }
-                    }
+            }
-                },
             )
     }
 
@@ -260,17 +260,10 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.issue_tracker -> {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
-                startActivity(browserIntent)
-                return true
-            }
             R.id.about -> {
                 LibsBuilder()
                     .withAboutIconShown(true)
                     .withAboutVersionShown(true)
-                    .withAboutSpecial2("Bug reports").withAboutSpecial2Description(AppSettingsService.trackerUrl)
-                    .withAboutSpecial1("Project Page").withAboutSpecial1Description(AppSettingsService.sourceUrl)
                     .start(this)
                 true
             }

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

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

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

@@ -3,7 +3,10 @@ package bou.amine.apps.readerforselfossv2.android
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.os.Build
+import android.widget.ImageView
 import android.widget.Toast
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -15,6 +18,8 @@ import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import com.github.ln_12.library.ConnectivityStatus
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
@@ -32,20 +37,12 @@ import org.acra.sender.HttpSender
 import org.kodein.di.*
 
 class MyApp : MultiDexApplication(), DIAware {
+
     override val di by DI.lazy {
-        bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) }
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with
+        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
-            singleton {
-                Repository(
-                    instance(),
-                    instance(),
-                    isConnectionAvailable,
-                    instance(),
-                )
-            }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
         bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
     }
@@ -67,33 +64,25 @@ class MyApp : MultiDexApplication(), DIAware {
 
             handleNotificationChannels()
 
-            ProcessLifecycleOwner.get().lifecycle.addObserver(
+            ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
-                AppLifeCycleObserver(
-                    connectivityStatus,
-                    repository,
-                ),
-            )
 
             CoroutineScope(Dispatchers.Main).launch {
                 viewModel.networkAvailableProvider.collect { networkAvailable ->
-                    val toastMessage =
+                    val toastMessage = if (networkAvailable) {
-                        if (networkAvailable) {
+                        repository.handleDBActions()
-                            repository.handleDBActions()
+                        R.string.network_connectivity_retrieved
-                            R.string.network_connectivity_retrieved
+                    } else {
-                        } else {
+                        R.string.network_connectivity_lost
-                            R.string.network_connectivity_lost
+                    }
-                        }
 
                     Toast.makeText(
                         applicationContext,
                         toastMessage,
-                        Toast.LENGTH_SHORT,
+                        Toast.LENGTH_SHORT
                     ).show()
                 }
             }
         }
-
-        repository.migrate(driverFactory)
     }
 
     override fun attachBaseContext(base: Context?) {
@@ -101,40 +90,23 @@ class MyApp : MultiDexApplication(), DIAware {
 
         initAcra {
             reportFormat = StringFormat.JSON
-            reportContent =
+            reportContent = listOf(
-                listOf(
+                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
-                    ReportField.REPORT_ID,
+                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
-                    ReportField.INSTALLATION_ID,
+                ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
-                    ReportField.APP_VERSION_CODE,
+                ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
-                    ReportField.APP_VERSION_NAME,
+                ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
-                    ReportField.BUILD,
+                ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
-                    ReportField.ANDROID_VERSION,
+                ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
-                    ReportField.BRAND,
-                    ReportField.PHONE_MODEL,
-                    ReportField.AVAILABLE_MEM_SIZE,
-                    ReportField.TOTAL_MEM_SIZE,
-                    ReportField.STACK_TRACE,
-                    ReportField.APPLICATION_LOG,
-                    ReportField.LOGCAT,
-                    ReportField.INITIAL_CONFIGURATION,
-                    ReportField.CRASH_CONFIGURATION,
-                    ReportField.IS_SILENT,
-                    ReportField.USER_APP_START_DATE,
-                    ReportField.USER_COMMENT,
-                    ReportField.USER_CRASH_DATE,
-                    ReportField.USER_EMAIL,
-                    ReportField.CUSTOM_DATA,
-                )
             toast {
-                // required
+                //required
                 text = getString(R.string.crash_toast_text)
                 length = Toast.LENGTH_SHORT
             }
             httpSender {
-                uri =
+                uri = "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
-                    "https://bugs.amine-bouabdallaoui.fr/report" // best guess, you may need to adjust this
+                basicAuthLogin = "LMTlLZuazADohTCm"
-                basicAuthLogin = "qMEscjj89Gwt6cPR"
+                basicAuthPassword = "he6ghHp83F0PYPfh"
-                basicAuthPassword = "Yo58QFlGzFaWlBzP"
                 httpMethod = HttpSender.Method.POST
             }
         }
@@ -150,12 +122,7 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel =
+            val newItemsChannelmChannel = NotificationChannel(AppSettingsService.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
-                NotificationChannel(
-                    AppSettingsService.newItemsChannelId,
-                    newItemsChannelname,
-                    newItemsChannelimportance,
-                )
 
             notificationManager.createNotificationChannel(mChannel)
             notificationManager.createNotificationChannel(newItemsChannelmChannel)
@@ -166,22 +133,17 @@ class MyApp : MultiDexApplication(), DIAware {
         val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is NoClassDefFoundError &&
+            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
-                e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
-                }
+                }) {
-            ) {
-                // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    class AppLifeCycleObserver(
+    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
-        val connectivityStatus: ConnectivityStatus,
+
-        val repository: Repository,
-    ) : DefaultLifecycleObserver {
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
             repository.connectionMonitored = true

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

@@ -23,6 +23,7 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 class ReaderActivity : AppCompatActivity(), DIAware {
+
     private var currentItem: Int = 0
 
     private lateinit var toolbarMenu: Menu
@@ -70,11 +71,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
             finish()
         }
 
-        try {
+        readItem(allItems[currentItem])
-            readItem(allItems[currentItem])
-        } catch (e: IndexOutOfBoundsException) {
-            finish()
-        }
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(currentItem, false)
@@ -87,7 +84,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     }
 
     private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
+        if (appSettingsService.isMarkOnScrollEnabled()) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
@@ -101,15 +98,15 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
         FragmentStateAdapter(fa) {
+
         override fun getItemCount(): Int = allItems.size
 
-        override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
+        override fun createFragment(position: Int): Fragment =
+            ArticleFragment.newInstance(allItems[position])
+
     }
 
-    override fun onKeyDown(
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        keyCode: Int,
-        event: KeyEvent?,
-    ): Boolean {
         return when (keyCode) {
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
                 val currentFragment =
@@ -140,32 +137,28 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         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 {
-            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
-                canRemoveFromFavorite()
-            } else {
-                canFavorite()
-            }
 
-            binding.pager.registerOnPageChangeCallback(
+                override fun onPageSelected(position: Int) {
-                object : ViewPager2.OnPageChangeCallback() {
+                    super.onPageSelected(position)
-                    override fun onPageSelected(position: Int) {
-                        super.onPageSelected(position)
 
-                        if (allItems[position].starred) {
+                    if (allItems[position].starred) {
-                            canRemoveFromFavorite()
+                        canRemoveFromFavorite()
-                        } else {
+                    } else {
-                            canFavorite()
+                        canFavorite()
-                        }
-                        readItem(allItems[position])
                     }
-                },
+                    readItem(allItems[position])
-            )
+                }
-        }
+            }
+        )
 
         return true
     }
@@ -184,18 +177,20 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
+                onBackPressed()
                 return true
             }
             R.id.star -> {
                 if (allItems[binding.pager.currentItem].starred) {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.unstarr(allItems[binding.pager.currentItem])
+                        // TODO: Handle failure
                     }
                     afterUnsave()
                 } else {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.starr(allItems[binding.pager.currentItem])
+                        // TODO: Handle failure
                     }
                     afterSave()
                 }

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

@@ -18,10 +18,11 @@ import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 
 class SourcesActivity : AppCompatActivity(), DIAware {
+
     private lateinit var binding: ActivitySourcesBinding
 
     override val di by closestDI()
-    private val repository: Repository by instance()
+    private val repository : Repository by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivitySourcesBinding.inflate(layoutInflater)
@@ -48,33 +49,31 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         super.onResume()
         val mLayoutManager = LinearLayoutManager(this)
 
-        var items: ArrayList<SelfossModel.SourceDetail>
+        var items: ArrayList<SelfossModel.Source>
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
         CoroutineScope(Dispatchers.Main).launch {
-            val response = repository.getSourcesDetails()
+            val response = repository.getSources()
             if (response.isNotEmpty()) {
                 items = response
-                val mAdapter =
+                val mAdapter = SourcesListAdapter(
-                    SourcesListAdapter(
+                    this@SourcesActivity, items
-                        this@SourcesActivity,
+                )
-                        items,
-                    )
                 binding.recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
             } else {
                 Toast.makeText(
                     this@SourcesActivity,
                     R.string.cant_get_sources,
-                    Toast.LENGTH_SHORT,
+                    Toast.LENGTH_SHORT
                 ).show()
             }
         }
 
         binding.fab.setOnClickListener {
-            startActivity(Intent(this@SourcesActivity, UpsertSourceActivity::class.java))
+            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }
 }

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

@@ -1,210 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
-import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
-import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
-import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.kodein.di.DIAware
-import org.kodein.di.android.closestDI
-import org.kodein.di.instance
-
-class UpsertSourceActivity : AppCompatActivity(), DIAware {
-    private var existingSource: SelfossModel.SourceDetail? = null
-    private var mSpoutsValue: String? = null
-
-    private lateinit var binding: ActivityUpsertSourceBinding
-
-    override val di by closestDI()
-    private val repository: Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityUpsertSourceBinding.inflate(layoutInflater)
-        val view = binding.root
-
-        existingSource = repository.getSelectedSource()
-        if (existingSource != null) {
-            binding.formContainer.visibility = View.GONE
-            binding.progress.visibility = View.VISIBLE
-        }
-        val title = if (existingSource == null) R.string.add_source else R.string.update_source
-
-        supportFragmentManager.addOnBackStackChangedListener {
-            if (supportFragmentManager.backStackEntryCount == 0) {
-                setTitle(title)
-            }
-        }
-
-        setContentView(view)
-
-        setSupportActionBar(binding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
-        supportActionBar?.title = resources.getString(title)
-
-        maybeGetDetailsFromIntentSharing(intent)
-
-        binding.saveBtn.setOnClickListener {
-            handleSaveSource()
-        }
-    }
-
-    private fun initFields(items: Map<String, SelfossModel.Spout>) {
-        binding.nameInput.setText(existingSource!!.title)
-        binding.tags.setText(existingSource!!.tags?.joinToString(", "))
-        binding.sourceUri.setText(existingSource!!.params?.url)
-        binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout))
-        binding.progress.visibility = View.GONE
-        binding.formContainer.visibility = View.VISIBLE
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        val baseUrl = appSettingsService.getBaseUrl()
-        if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
-            mustLoginToAddSource()
-        } else {
-            handleSpoutsSpinner()
-        }
-    }
-
-    private fun handleSpoutsSpinner() {
-        val spoutsKV = HashMap<String, String>()
-        binding.spoutsSpinner.onItemSelectedListener =
-            object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    adapterView: AdapterView<*>,
-                    view: View?,
-                    i: Int,
-                    l: Long,
-                ) {
-                    if (view != null) {
-                        val spoutName = (view as TextView).text.toString()
-                        mSpoutsValue = spoutsKV[spoutName]
-                    }
-                }
-
-                override fun onNothingSelected(adapterView: AdapterView<*>) {
-                    mSpoutsValue = null
-                }
-            }
-
-        fun handleSpoutFailure(networkIssue: Boolean = false) {
-            Toast.makeText(
-                this@UpsertSourceActivity,
-                if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
-                Toast.LENGTH_SHORT,
-            ).show()
-            binding.progress.visibility = View.GONE
-        }
-
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                val items = repository.getSpouts()
-                if (items.isNotEmpty()) {
-                    val itemsStrings = items.map { it.value.name }
-                    for ((key, value) in items) {
-                        spoutsKV[value.name] = key
-                    }
-
-                    binding.progress.visibility = View.GONE
-                    binding.formContainer.visibility = View.VISIBLE
-
-                    val spinnerArrayAdapter =
-                        ArrayAdapter(
-                            this@UpsertSourceActivity,
-                            android.R.layout.simple_spinner_item,
-                            itemsStrings,
-                        )
-                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                    binding.spoutsSpinner.adapter = spinnerArrayAdapter
-
-                    if (existingSource != null) {
-                        initFields(items)
-                    }
-                } else {
-                    handleSpoutFailure()
-                }
-            } catch (e: NetworkUnavailableException) {
-                handleSpoutFailure(networkIssue = true)
-            }
-        }
-    }
-
-    private fun maybeGetDetailsFromIntentSharing(intent: Intent) {
-        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
-            binding.sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
-            binding.nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
-        }
-    }
-
-    private fun mustLoginToAddSource() {
-        Toast.makeText(this, getString(R.string.addStringNoUrl), Toast.LENGTH_SHORT).show()
-        val i = Intent(this, LoginActivity::class.java)
-        startActivity(i)
-        finish()
-    }
-
-    private fun handleSaveSource() {
-        val url = binding.sourceUri.text.toString()
-
-        val sourceDetailsUnavailable =
-            title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
-
-        when {
-            sourceDetailsUnavailable -> {
-                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
-            }
-            else -> {
-                CoroutineScope(Dispatchers.Main).launch {
-                    val successfullyAddedSource =
-                        if (existingSource != null) {
-                            repository.updateSource(
-                                existingSource!!.id,
-                                binding.nameInput.text.toString(),
-                                url,
-                                mSpoutsValue!!,
-                                binding.tags.text.toString(),
-                            )
-                        } else {
-                            repository.createSource(
-                                binding.nameInput.text.toString(),
-                                url,
-                                mSpoutsValue!!,
-                                binding.tags.text.toString(),
-                            )
-                        }
-                    if (successfullyAddedSource) {
-                        finish()
-                    } else {
-                        Toast.makeText(
-                            this@UpsertSourceActivity,
-                            R.string.cant_create_source,
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        repository.unsetSelectedSource()
-    }
-}

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

@@ -9,10 +9,10 @@ import android.widget.ImageView.ScaleType
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
-import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
@@ -22,6 +22,8 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -33,10 +35,10 @@ import org.kodein.di.instance
 class ItemCardAdapter(
     override val app: Activity,
     override var items: ArrayList<SelfossModel.Item>,
-    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
-    private 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()
 
@@ -44,79 +46,23 @@ class ItemCardAdapter(
     override val repository: Repository by instance()
     override val appSettingsService: AppSettingsService by instance()
 
-    override fun onCreateViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        parent: ViewGroup,
+        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        viewType: Int,
-    ): ViewHolder {
-        binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    private fun handleClickListeners(position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        binding.favButton.setOnClickListener {
-            val item = items[position]
-            if (item.starred) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    repository.unstarr(item)
-                }
-                binding.favButton.isSelected = false
-            } else {
-                CoroutineScope(Dispatchers.IO).launch {
-                    repository.starr(item)
-                }
-                binding.favButton.isSelected = true
-            }
-        }
-
-        binding.shareBtn.setOnClickListener {
-            val item = items[position]
-            c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
-        }
-
-        binding.browserBtn.setOnClickListener {
-            c.openInBrowserAsNewTask(items[position])
-        }
-    }
-
-    private fun handleLinkOpening(position: Int) {
-        binding.root.setOnClickListener {
-            repository.setReaderItems(items)
-            c.openItemUrl(
-                position,
-                items[position].getLinkDecoded(),
-                appSettingsService.isArticleViewerEnabled(),
-                app,
-            )
-        }
-    }
-
-    override fun onBindViewHolder(
-        holder: ViewHolder,
-        position: Int,
-    ) {
         with(holder) {
-            val itm = items[holder.bindingAdapterPosition]
+            val itm = items[position]
-
-            handleClickListeners(holder.bindingAdapterPosition)
-            handleLinkOpening(holder.bindingAdapterPosition)
 
             binding.favButton.isSelected = itm.starred
-            if (appSettingsService.getPublicAccess()) {
-                binding.favButton.visibility = View.GONE
-            }
-
             binding.title.text = itm.title.getHtmlDecoded()
 
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemCardAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (!appSettingsService.isFullHeightCardsEnabled()) {
                 binding.itemImage.maxHeight = imageMaxHeight
@@ -133,9 +79,16 @@ class ItemCardAdapter(
             }
 
             if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                val drawable =
+                    TextDrawable
+                        .builder()
+                        .round()
+                        .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+                binding.sourceImage.setImageDrawable(drawable)
             } else {
-                c.circularDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
+                c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
             }
         }
     }
@@ -144,5 +97,49 @@ class ItemCardAdapter(
         return items.size
     }
 
-    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root)
+    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        init {
+            handleClickListeners()
+            handleLinkOpening()
+        }
+
+        private fun handleClickListeners() {
+
+            binding.favButton.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                if (item.starred) {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.unstarr(item)
+                    }
+                    binding.favButton.isSelected = false
+                } else {
+                    CoroutineScope(Dispatchers.IO).launch {
+                        repository.starr(item)
+                    }
+                    binding.favButton.isSelected = true
+                }
+            }
+
+            binding.shareBtn.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
+            }
+
+            binding.browserBtn.setOnClickListener {
+                c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+            }
+        }
+
+        private fun handleLinkOpening() {
+            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
+                c.openItemUrl(
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    appSettingsService.isArticleViewerEnabled(),
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -7,9 +7,10 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
-import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
-import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -17,6 +18,8 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import org.kodein.di.DI
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
@@ -24,39 +27,23 @@ import org.kodein.di.instance
 class ItemListAdapter(
     override val app: Activity,
     override var items: ArrayList<SelfossModel.Item>,
-    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
-    private 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 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[holder.bindingAdapterPosition]
+            val itm = items[position]
-
-            binding.root.setOnClickListener {
-                repository.setReaderItems(items)
-                c.openItemUrl(
-                    holder.bindingAdapterPosition,
-                    items[holder.bindingAdapterPosition].getLinkDecoded(),
-                    appSettingsService.isArticleViewerEnabled(),
-                    app,
-                )
-            }
 
             binding.title.text = itm.title.getHtmlDecoded()
 
@@ -64,26 +51,47 @@ class ItemListAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemListAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
+
                 if (itm.getIcon(repository.baseUrl).isEmpty()) {
-                    binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())
+                    val color = generator.getColor(itm.title.getHtmlDecoded())
+
+                    val drawable =
+                            TextDrawable
+                                    .builder()
+                                    .round()
+                                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+
+                    binding.itemImage.setImageDrawable(drawable)
                 } else {
-                    c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
+                    c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.itemImage)
                 }
             } else {
-                c.circularDrawable(itm.getThumbnail(repository.baseUrl), binding.itemImage)
+                c.bitmapCenterCrop(itm.getThumbnail(repository.baseUrl), binding.itemImage)
             }
         }
     }
 
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root)
+    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {
+
+        init {
+            handleLinkOpening()
+        }
+
+        private fun handleLinkOpening() {
+            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
+                c.openItemUrl(
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    appSettingsService.isArticleViewerEnabled(),
+                    app
+                )
+            }
+        }
+    }
 }

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

@@ -28,20 +28,16 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         updateItems(this.items)
     }
 
-    private fun unmarkSnackbar(
+    private fun unmarkSnackbar(item: 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),
+            .setAction(R.string.undo_string) {
-                    R.string.marked_as_read,
+                unreadItemAtIndex(item, position, false)
-                    Snackbar.LENGTH_LONG,
+            }
-                )
-                .setAction(R.string.undo_string) {
-                    unreadItemAtIndex(item, position, false)
-                }
 
         val view = s.view
         val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
@@ -49,20 +45,16 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(
+    private fun markSnackbar(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
+        val s = Snackbar
-        position: Int,
+            .make(
-    ) {
+                app.findViewById(R.id.coordLayout),
-        val s =
+                R.string.marked_as_unread,
-            Snackbar
+                Snackbar.LENGTH_LONG
-                .make(
+            )
-                    app.findViewById(R.id.coordLayout),
+            .setAction(R.string.undo_string) {
-                    R.string.marked_as_unread,
+                readItemAtIndex(item, position, false)
-                    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)
@@ -78,18 +70,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun readItemAtIndex(
+    private fun readItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.markAsRead(item)
         }
         if (repository.displayedItems == ItemType.UNREAD) {
             items.remove(item)
             notifyItemRemoved(position)
-            notifyItemRangeChanged(position, itemCount)
             updateItems(items)
         } else {
             notifyItemChanged(position)
@@ -99,13 +86,10 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    private fun unreadItemAtIndex(
+    private fun unreadItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
-        item: SelfossModel.Item,
-        position: Int,
-        showSnackbar: Boolean = true,
-    ) {
         CoroutineScope(Dispatchers.IO).launch {
             repository.unmarkAsRead(item)
+
         }
         notifyItemChanged(position)
         if (showSnackbar) {
@@ -113,13 +97,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         }
     }
 
-    fun addItemAtIndex(
+    fun addItemAtIndex(item: SelfossModel.Item, position: Int) {
-        item: SelfossModel.Item,
-        position: Int,
-    ) {
         items.add(position, item)
         notifyItemInserted(position)
         updateItems(items)
+
     }
 
     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
@@ -127,5 +109,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         items.addAll(newItems)
         notifyItemRangeInserted(oldSize, newItems.size)
         updateItems(items)
+
     }
 }

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

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

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

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

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

@@ -1,6 +1,5 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
@@ -27,10 +26,8 @@ import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
-import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
-import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
@@ -52,11 +49,11 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 import java.net.MalformedURLException
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.util.*
 import java.util.concurrent.ExecutionException
 
-private const val IMAGE_JPG = "image/jpg"
 
 class ArticleFragment : Fragment(), DIAware {
     private var fontSize: Int = 16
@@ -66,12 +63,13 @@ class ArticleFragment : Fragment(), DIAware {
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
-    private lateinit var allImages: ArrayList<String>
+    private lateinit var allImages : ArrayList<String>
     private lateinit var fab: FloatingActionButton
     private lateinit var textAlignment: String
-    private lateinit var binding: FragmentArticleBinding
+    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()
 
@@ -80,7 +78,8 @@ class ArticleFragment : Fragment(), DIAware {
     private var font = ""
     private var staticBar = false
 
-    private val mercuryApi: MercuryApi by instance()
+    private val mercuryApi : MercuryApi by instance()
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -93,21 +92,16 @@ class ArticleFragment : Fragment(), DIAware {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         try {
-            binding = FragmentArticleBinding.inflate(inflater, container, false)
+            _binding = FragmentArticleBinding.inflate(inflater, container, false)
 
             url = item.getLinkDecoded()
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = try {
+            contentSource = item.sourceAndDateText()
-                item.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("Article Fragment parse date")
-                item.sourceAuthorOnly()
-            }
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()
@@ -116,27 +110,89 @@ class ArticleFragment : Fragment(), DIAware {
 
             refreshAlignment()
 
-            fab = binding.fab
+            fab = binding!!.fab
 
             fab.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.colorAccent))
 
             fab.rippleColor = resources.getColor(R.color.colorAccentDark)
 
-            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()
+            val floatingToolbar: FloatingToolbar = binding!!.floatingToolbar
+            floatingToolbar.attachFab(fab)
+
+            floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
+
+            floatingToolbar.setClickListener(
+                object : FloatingToolbar.ItemClickListener {
+                    override fun onItemClick(item: MenuItem) {
+                        when (item.itemId) {
+                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
+                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+                            R.id.unread_action -> if (context != null) {
+                                if (this@ArticleFragment.item.unread) {
+                                    CoroutineScope(Dispatchers.IO).launch {
+                                        repository.markAsRead(this@ArticleFragment.item)
+                                    }
+                                    this@ArticleFragment.item.unread = false
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_read,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                } else {
+                                    CoroutineScope(Dispatchers.IO).launch {
+                                        repository.unmarkAsRead(this@ArticleFragment.item)
+                                    }
+                                    this@ArticleFragment.item.unread = true
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_unread,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                }
+                            }
+                            else -> Unit
+                        }
+                    }
+
+                    override fun onItemLongClick(item: MenuItem?) {
+                    }
+                }
+            )
 
             if (staticBar) {
                 fab.hide()
                 floatingToolbar.show()
             }
 
-            binding.source.text = contentSource
+            binding!!.source.text = contentSource
             if (typeface != null) {
-                binding.source.typeface = typeface
+                binding!!.source.typeface = typeface
             }
 
-            handleContent()
+            if (contentText.isEmptyOrNullOrNullString()) {
+                getContentFromMercury()
+            } else {
+                binding!!.titleView.text = contentTitle
+                if (typeface != null) {
+                    binding!!.titleView.typeface = typeface
+                }
 
-            binding.nestedScrollView.setOnScrollChangeListener(
+                htmlToWebview()
+
+                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                    binding!!.imageView.visibility = View.VISIBLE
+                    Glide
+                        .with(requireContext())
+                        .asBitmap()
+                        .load(contentImage)
+                        .apply(RequestOptions.fitCenterTransform())
+                        .into(binding!!.imageView)
+                } else {
+                    binding!!.imageView.visibility = View.GONE
+                }
+            }
+
+            binding!!.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
                         floatingToolbar.hide()
@@ -148,314 +204,215 @@ class ArticleFragment : Fragment(), DIAware {
                             if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
                         }
                     }
-                },
+                }
             )
+
         } catch (e: InflateException) {
             e.sendSilentlyWithAcraWithName("webview not available")
-            if (context != null) {
+            AlertDialog.Builder(requireContext())
-                AlertDialog.Builder(requireContext())
+                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                    .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                    .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                .setPositiveButton(android.R.string.ok
-                    .setPositiveButton(
+                ) { _, _ ->
-                        android.R.string.ok,
+                    appSettingsService.disableArticleViewer()
-                    ) { _, _ ->
+                    requireActivity().finish()
-                        appSettingsService.disableArticleViewer()
+                }
-                        requireActivity().finish()
+                .create()
-                    }
+                .show()
-                    .create()
-                    .show()
-            }
         }
 
-        return binding.root
+        return binding!!.root
     }
 
-    private fun handleContent() {
+    override fun onDestroyView() {
-        if (contentText.isEmptyOrNullOrNullString()) {
+        super.onDestroyView()
-            if (repository.isNetworkAvailable()) {
+        _binding = null
-                getContentFromMercury()
-            }
-        } else {
-            binding.titleView.text = contentTitle
-            if (typeface != null) {
-                binding.titleView.typeface = typeface
-            }
-
-            htmlToWebview()
-
-            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                binding.imageView.visibility = View.VISIBLE
-                Glide
-                    .with(requireContext())
-                    .asBitmap()
-                    .load(contentImage)
-                    .apply(RequestOptions.fitCenterTransform())
-                    .into(binding.imageView)
-            } else {
-                binding.imageView.visibility = View.GONE
-            }
-        }
-    }
-
-    private fun handleFloatingToolbar(): FloatingToolbar {
-        val floatingToolbar: FloatingToolbar = binding.floatingToolbar
-        if (appSettingsService.getPublicAccess()) {
-            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
-        }
-        floatingToolbar.attachFab(fab)
-
-        floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
-
-        floatingToolbar.setClickListener(
-            object : FloatingToolbar.ItemClickListener {
-                override fun onItemClick(item: MenuItem) {
-                    when (item.itemId) {
-                        R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                        R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-                        R.id.unread_action ->
-                            if (context != null) {
-                                if (this@ArticleFragment.item.unread) {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.markAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = false
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_read,
-                                        Toast.LENGTH_LONG,
-                                    ).show()
-                                } else {
-                                    CoroutineScope(Dispatchers.IO).launch {
-                                        repository.unmarkAsRead(this@ArticleFragment.item)
-                                    }
-                                    this@ArticleFragment.item.unread = true
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG,
-                                    ).show()
-                                }
-                            }
-                        else -> Unit
-                    }
-                }
-
-                override fun onItemLongClick(item: MenuItem?) {
-                    // We do nothing
-                }
-            },
-        )
-        return floatingToolbar
     }
 
     private fun refreshAlignment() {
-        textAlignment =
+        textAlignment = when (appSettingsService.getActiveAllignment()) {
-            when (appSettingsService.getActiveAllignment()) {
+            1 -> "justify"
-                1 -> "justify"
+            2 -> "left"
-                2 -> "left"
+            else -> "justify"
-                else -> "justify"
+        }
-            }
     }
 
     private fun getContentFromMercury() {
-        binding.progressBar.visibility = View.VISIBLE
+        if (repository.isNetworkAvailable()) {
+            binding!!.progressBar.visibility = View.VISIBLE
 
-        CoroutineScope(Dispatchers.Main).launch {
+            CoroutineScope(Dispatchers.Main).launch {
-            try {
+                try {
-                val response = mercuryApi.query(url)
+                    val response = mercuryApi.query(url)
-                if (response.success && response.data != null) {
+                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
-                    handleMercuryData(response.data!!)
+                        binding!!.titleView.text = response.data!!.title.orEmpty()
-                } else {
+                        try {
+                            if (typeface != null) {
+                                binding!!.titleView.typeface = typeface
+                            }
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
+                        }
+
+                        try {
+                            // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                            URL(response.data!!.url)
+                            url = response.data!!.url
+                        } catch (e: MalformedURLException) {
+                            // Mercury returned a relative url
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
+                        }
+
+                        try {
+                            contentText = response.data!!.content.orEmpty()
+                            htmlToWebview()
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > contenttext or html")
+                        }
+
+                        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
+                            try {
+                                binding!!.imageView.visibility = View.VISIBLE
+                                try {
+                                    Glide
+                                        .with(requireContext())
+                                        .asBitmap()
+                                        .load(
+                                            response.data!!.lead_image_url.orEmpty()
+                                        )
+                                        .apply(RequestOptions.fitCenterTransform())
+                                        .into(binding!!.imageView)
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
+                                }
+                            } catch (e: Exception) {
+                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
+                            }
+                        } else {
+                            binding!!.imageView.visibility = View.GONE
+                        }
+
+                        try {
+                            binding!!.nestedScrollView.scrollTo(0, 0)
+                            binding!!.progressBar.visibility = View.GONE
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
+                        }
+                    } else {
+                        openInBrowserAfterFailing()
+                    }
+                } catch (e: SocketTimeoutException) {
+                    openInBrowserAfterFailing()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
                     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(lead_image_url: String?) {
-        if (!lead_image_url.isNullOrEmpty() && context != null) {
-            binding.imageView.visibility = View.VISIBLE
-            Glide
-                .with(requireContext())
-                .asBitmap()
-                .load(
-                    lead_image_url,
-                )
-                .apply(RequestOptions.fitCenterTransform())
-                .into(binding.imageView)
-        } else {
-            binding.imageView.visibility = View.GONE
-        }
-    }
-
-    private fun handleImageLoading() {
-        binding.webcontent.webViewClient =
-            object : WebViewClient() {
-                @Deprecated("Deprecated in Java")
-                override fun shouldOverrideUrlLoading(
-                    view: WebView?,
-                    url: String,
-                ): Boolean {
-                    return if (context != null && url.isUrlValid() && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                        try {
-                            requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-                        } catch (e: ActivityNotFoundException) {
-                            e.sendSilentlyWithAcraWithName("activityNotFound > $url")
-                        }
-                        true
-                    } else {
-                        false
-                    }
-                }
-
-                @Deprecated("Deprecated in Java")
-                override fun shouldInterceptRequest(
-                    view: WebView,
-                    url: String,
-                ): WebResourceResponse? {
-                    val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                    if (url.lowercase(Locale.US).contains(".jpg") ||
-                        url.lowercase(Locale.US)
-                            .contains(".jpeg")
-                    ) {
-                        try {
-                            val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                            return WebResourceResponse(
-                                IMAGE_JPG,
-                                "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.JPEG),
-                            )
-                        } catch (e: ExecutionException) {
-                            // Do nothing
-                        }
-                    } else if (url.lowercase(Locale.US).contains(".png")) {
-                        try {
-                            val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                            return WebResourceResponse(
-                                IMAGE_JPG,
-                                "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.PNG),
-                            )
-                        } catch (e: ExecutionException) {
-                            // Do nothing
-                        }
-                    } else if (url.lowercase(Locale.US).contains(".webp")) {
-                        try {
-                            val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                            return WebResourceResponse(
-                                IMAGE_JPG,
-                                "UTF-8",
-                                getBitmapInputStream(image, Bitmap.CompressFormat.WEBP),
-                            )
-                        } catch (e: ExecutionException) {
-                            // Do nothing
-                        }
-                    }
-
-                    return super.shouldInterceptRequest(view, url)
-                }
-            }
-    }
-
     private fun htmlToWebview() {
-        if (context != null) {
-            val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-            val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
-            binding.webcontent.settings.standardFontFamily = a.getString(0)
+        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-            binding.webcontent.visibility = View.VISIBLE
+        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
-            val colorOnSurface = TypedValue()
-            requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
 
-            val colorSurface = TypedValue()
+        binding!!.webcontent.settings.standardFontFamily = a.getString(0)
-            requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
+        binding!!.webcontent.visibility = View.VISIBLE
 
-            binding.webcontent.settings.useWideViewPort = true
+        val colorOnSurface = TypedValue()
-            binding.webcontent.settings.loadWithOverviewMode = true
+        requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
-            binding.webcontent.settings.javaScriptEnabled = false
 
-            handleImageLoading()
+        val colorSurface = TypedValue()
+        requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
 
-            val gestureDetector =
+        binding!!.webcontent.settings.useWideViewPort = true
-                GestureDetector(
+        binding!!.webcontent.settings.loadWithOverviewMode = true
-                    activity,
+        binding!!.webcontent.settings.javaScriptEnabled = false
-                    object : GestureDetector.SimpleOnGestureListener() {
-                        override fun onSingleTapUp(e: MotionEvent): Boolean {
-                            return performClick()
-                        }
-                    },
-                )
 
-            binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+        binding!!.webcontent.webViewClient = object : WebViewClient() {
-
+            @Deprecated("Deprecated in Java")
-            binding.webcontent.settings.layoutAlgorithm =
+            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
-                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+                if (binding!!.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-            var baseUrl: String? = null
+                }
-
+                return true
-            try {
-                val itemUrl = URL(url)
-                baseUrl = itemUrl.protocol + "://" + itemUrl.host
-            } catch (e: MalformedURLException) {
-                e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
             }
 
-            val fontName =
+            @Deprecated("Deprecated in Java")
-                when (font) {
+            override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? {
-                    getString(R.string.open_sans_font_id) -> "Open Sans"
+                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                    getString(R.string.roboto_font_id) -> "Roboto"
+                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
-                    getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+                    try {
-                    else -> ""
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
+                    }
+                }
+                else if (url.lowercase(Locale.US).contains(".png")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
+                    }
+                }
+                else if (url.lowercase(Locale.US).contains(".webp")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
+                    }
                 }
 
-            val fontLinkAndStyle =
+                return super.shouldInterceptRequest(view, url)
-                if (font.isNotEmpty()) {
+            }
-                    """<link href="https://fonts.googleapis.com/css?family=${
+        }
-                        fontName.replace(
+
-                            " ",
+        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-                            "+",
+            override fun onSingleTapUp(e: MotionEvent): Boolean {
-                        )
+                return performClick()
-                    }" rel="stylesheet">
+            }
+        })
+
+        binding!!.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
+
+        binding!!.webcontent.settings.layoutAlgorithm =
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+
+        var baseUrl: String? = null
+
+        try {
+            val itemUrl = URL(url)
+            baseUrl = itemUrl.protocol + "://" + itemUrl.host
+        } catch (e: MalformedURLException) {
+            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
+        }
+
+        val fontName =  when (font) {
+            getString(R.string.open_sans_font_id) -> "Open Sans"
+            getString(R.string.roboto_font_id) -> "Roboto"
+            getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+            else -> ""
+        }
+
+        val fontLinkAndStyle = if (font.isNotEmpty()) {
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
                 |   }
                 |</style>
-                    """.trimMargin()
+            """.trimMargin()
-                } else {
+        } else {
-                    ""
+            ""
-                }
+        }
 
-            binding.webcontent.loadDataWithBaseURL(
+        binding!!.webcontent.loadDataWithBaseURL(
-                baseUrl,
+            baseUrl,
-                """<html>
+            """<html>
                 |<head>
                 |   <meta name="viewport" content="width=device-width, initial-scale=1">
                 |   <style>
@@ -466,12 +423,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |        max-width: 100%;
                 |      }
                 |      a {
-                |        color: ${
+                |        color: ${String.format("#%06X", 0xFFFFFF and resources.getColor(R.color.colorAccent))} !important;
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and resources.getColor(R.color.colorAccent),
-                    )
-                } !important;
                 |      }
                 |      *:not(a) {
                 |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
@@ -482,26 +434,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                };
                 |      }
                 |      body, html {
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)} !important;
-                    String.format(
+                |        border-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)}  !important;
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                } !important;
-                |        border-color: ${
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                }  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -511,50 +448,41 @@ class ArticleFragment : Fragment(), DIAware {
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
-                    String.format(
-                        "#%06X",
-                        0xFFFFFF and colorSurface.data,
-                    )
-                };
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
                 |</head>
                 |<body>
                 |   $contentText
-                |</body>
+                |</body>""".trimMargin(),
-                """.trimMargin(),
+            "text/html",
-                "text/html",
+            "utf-8",
-                "utf-8",
+            null
-                null,
+        )
-            )
-        }
     }
 
     fun scrollDown() {
-        val height = binding.nestedScrollView.measuredHeight
+        val height = binding!!.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, height / 2)
+        binding!!.nestedScrollView.smoothScrollBy(0, height/2)
     }
 
     fun scrollUp() {
-        val height = binding.nestedScrollView.measuredHeight
+        val height = binding!!.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, -height / 2)
+        binding!!.nestedScrollView.smoothScrollBy(0, -height/2)
     }
 
     private fun openInBrowserAfterFailing() {
-        binding.progressBar.visibility = View.GONE
+        binding!!.progressBar.visibility = View.GONE
-        if (context != null) {
+        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-            requireContext().openInBrowserAsNewTask(this@ArticleFragment.item)
-        } else {
-            Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context")
-        }
     }
 
     companion object {
         private const val ARG_ITEMS = "items"
 
-        fun newInstance(item: SelfossModel.Item): ArticleFragment {
+        fun newInstance(
+                item: SelfossModel.Item
+        ): ArticleFragment {
             val fragment = ArticleFragment()
             val args = Bundle()
             args.putParcelable(ARG_ITEMS, item.toParcelable())
@@ -564,12 +492,10 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     fun performClick(): Boolean {
-        if (allImages != null && (
+        if (binding!!.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                binding!!.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+
-            )
+            val position : Int = allImages.indexOf(binding!!.webcontent.hitTestResult.extra)
-        ) {
-            val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
             intent.putExtra("allImages", allImages)
@@ -579,4 +505,6 @@ class ArticleFragment : Fragment(), DIAware {
         }
         return false
     }
+
+
 }

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

@@ -4,9 +4,7 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
-import android.os.Build
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
@@ -14,15 +12,15 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import bou.amine.apps.readerforselfossv2.android.HomeActivity
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.ViewTarget
+import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.request.transition.Transition
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.chip.Chip
 import kotlinx.coroutines.CoroutineScope
@@ -33,8 +31,9 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 
+
 class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
-    private lateinit var binding: FilterFragmentBinding
+
     override val di: DI by closestDI()
     private val repository: Repository by instance()
 
@@ -43,24 +42,123 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
-        binding =
+        val binding =
-            FilterFragmentBinding.inflate(
+            bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding.inflate(
                 inflater,
                 container,
-                false,
+                false
             )
 
         val context: Context? = context
 
+        val tagGroup = binding.tagsGroup
+        val sourceGroup = binding.sourcesGroup
+
         if (context == null) {
             dismiss()
             Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
         } else {
             CoroutineScope(Dispatchers.Main).launch {
-                handleTagChips(context)
+                val tags = repository.getTags()
-                handleSourceChips(context)
+
+                tags.forEach { tag ->
+                    val c = Chip(context)
+                    c.text = tag.tag
+
+                    val gd = GradientDrawable()
+                    val gdColor = try {
+                        Color.parseColor(tag.color)
+                    } catch (e: IllegalArgumentException) {
+                        e.sendSilentlyWithAcraWithName("color issue " + tag.color)
+                        resources.getColor(R.color.colorPrimary)
+                    }
+                    gd.setColor(gdColor)
+                    gd.shape = GradientDrawable.RECTANGLE
+                    gd.setSize(30, 30)
+                    gd.cornerRadius = 30F
+                    c.chipIcon = gd
+
+                    c.setOnCloseIconClickListener {
+                        (it as Chip).isCloseIconVisible = false
+                        selectedChip = null
+                        repository.setTagFilter(null)
+                    }
+
+                    c.setOnClickListener {
+                        if (selectedChip != null) {
+                            selectedChip!!.isCloseIconVisible = false
+                        }
+                        (it as Chip).isCloseIconVisible = true
+                        selectedChip = it
+                        repository.setTagFilter(tag)
+
+                        repository.setSourceFilter(null)
+                    }
+
+                    if (repository.tagFilter.value?.equals(tag) == true) {
+                        c.isCloseIconVisible = true
+                        selectedChip = c
+                    }
+
+                    tagGroup.addView(c)
+                }
+
+                repository.getSources().forEach { source ->
+                    val c = Chip(context)
+
+                    Glide.with(context)
+                        .load(source.getIcon(repository.baseUrl))
+                        .listener(object : RequestListener<Drawable?> {
+                            override fun onLoadFailed(
+                                e: GlideException?,
+                                model: Any?,
+                                target: Target<Drawable?>?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                return false
+                            }
+
+                            override fun onResourceReady(
+                                resource: Drawable?,
+                                model: Any?,
+                                target: Target<Drawable?>?,
+                                dataSource: DataSource?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                c.chipIcon = resource
+                                return false
+                            }
+                        }).preload()
+
+                    c.text = source.title.getHtmlDecoded()
+
+                    c.setOnCloseIconClickListener {
+                        (it as Chip).isCloseIconVisible = false
+                        selectedChip = null
+                        repository.setSourceFilter(null)
+                    }
+
+                    c.setOnClickListener {
+                        if (selectedChip != null) {
+                            selectedChip!!.isCloseIconVisible = false
+                        }
+                        (it as Chip).isCloseIconVisible = true
+                        selectedChip = it
+                        repository.setSourceFilter(source)
+
+                        repository.setTagFilter(null)
+                    }
+
+
+                    if (repository.sourceFilter.value?.equals(source) == true) {
+                        c.isCloseIconVisible = true
+                        selectedChip = c
+                    }
+
+                    sourceGroup.addView(c)
+                }
 
                 binding.progressBar2.visibility = GONE
                 binding.filterView.visibility = VISIBLE
@@ -75,121 +173,9 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         return binding.root
     }
 
-    private suspend fun handleSourceChips(context: Context) {
-        val sourceGroup = binding.sourcesGroup
-
-        repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
-            val c = Chip(context)
-            c.ellipsize = TextUtils.TruncateAt.END
-
-            Glide.with(context)
-                .load(source.getIcon(repository.baseUrl))
-                .into(
-                    object : ViewTarget<Chip?, Drawable?>(c) {
-                        override fun onResourceReady(
-                            resource: Drawable,
-                            transition: Transition<in Drawable?>?,
-                        ) {
-                            try {
-                                c.chipIcon = resource
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcraWithName("sources > onResourceReady")
-                            }
-                        }
-                    },
-                )
-
-            c.text = source.title.getHtmlDecoded()
-
-            c.setOnCloseIconClickListener {
-                (it as Chip).isCloseIconVisible = false
-                selectedChip = null
-                repository.setSourceFilter(null)
-            }
-
-            c.setOnClickListener {
-                if (selectedChip != null) {
-                    selectedChip!!.isCloseIconVisible = false
-                }
-                (it as Chip).isCloseIconVisible = true
-                selectedChip = it
-                repository.setSourceFilter(source)
-
-                repository.setTagFilter(null)
-            }
-
-            if (repository.sourceFilter.value?.equals(source) == true) {
-                c.isCloseIconVisible = true
-                selectedChip = c
-            }
-
-            c.isEnabled = source.error.isNullOrBlank()
-
-            if (!source.error.isNullOrBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                c.tooltipText = source.error
-            }
-
-            sourceGroup.addView(c)
-        }
-    }
-
-    private suspend fun handleTagChips(context: Context) {
-        val tagGroup = binding.tagsGroup
-
-        val tags = repository.getTags()
-
-        tags.forEachIndexed { _, tag ->
-            val c = Chip(context)
-            c.ellipsize = TextUtils.TruncateAt.END
-            c.text = tag.tag
-
-            if (tag.color.isNotEmpty()) {
-                try {
-                    val gd = GradientDrawable()
-                    val gdColor =
-                        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(30, 30)
-                    gd.cornerRadius = 30F
-                    c.chipIcon = gd
-                } catch (e: Exception) {
-                    e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
-                }
-            }
-
-            c.setOnCloseIconClickListener {
-                (it as Chip).isCloseIconVisible = false
-                selectedChip = null
-                repository.setTagFilter(null)
-            }
-
-            c.setOnClickListener {
-                if (selectedChip != null) {
-                    selectedChip!!.isCloseIconVisible = false
-                }
-                (it as Chip).isCloseIconVisible = true
-                selectedChip = it
-                repository.setTagFilter(tag)
-
-                repository.setSourceFilter(null)
-            }
-
-            if (repository.tagFilter.value?.equals(tag) == true) {
-                c.isCloseIconVisible = true
-                selectedChip = c
-            }
-
-            tagGroup.addView(c)
-        }
-    }
-
     companion object {
         const val TAG = "FilterModalBottomSheet"
     }
+
+
 }

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

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

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

@@ -8,21 +8,23 @@ import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
+import org.acra.ktx.sendSilentlyWithAcra
 
-fun SelfossModel.Item.preloadImages(context: Context): Boolean {
+fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
     val imageUrls = this.getImages()
 
     val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
 
+
     try {
         for (url in imageUrls) {
-            if (URLUtil.isValidUrl(url)) {
+            if ( URLUtil.isValidUrl(url)) {
                 Glide.with(context).asBitmap()
                     .apply(glideOptions)
                     .load(url).submit()
             }
         }
-    } catch (e: Error) {
+    } catch (e : Error) {
         e.sendSilentlyWithAcraWithName("preloadImages")
         return false
     }

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

@@ -4,7 +4,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 
-fun SelfossModel.Item.toParcelable(): ParecelableItem =
+fun SelfossModel.Item.toParcelable() : ParecelableItem =
     ParecelableItem(
         this.id,
         this.datetime,
@@ -16,11 +16,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,10 +30,8 @@ fun ParecelableItem.toModel(): SelfossModel.Item =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags.split(","),
+        this.tags.split(",")
-        this.author,
     )
-
 data class ParecelableItem(
     val id: Int,
     val datetime: String,
@@ -47,17 +43,15 @@ data class ParecelableItem(
     val icon: String?,
     val link: String,
     val sourcetitle: String,
-    val tags: String,
+    val tags: String
-    val author: String?,
 ) : Parcelable {
+
     companion object {
         @JvmField
-        val CREATOR: Parcelable.Creator<ParecelableItem> =
+        val CREATOR: Parcelable.Creator<ParecelableItem> = object : Parcelable.Creator<ParecelableItem> {
-            object : Parcelable.Creator<ParecelableItem> {
+            override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source)
-                override fun 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 +65,12 @@ data class ParecelableItem(
         icon = source.readString(),
         link = source.readString().orEmpty(),
         sourcetitle = source.readString().orEmpty(),
-        tags = source.readString().orEmpty(),
+        tags = source.readString().orEmpty()
-        author = source.readString().orEmpty(),
     )
 
     override fun describeContents() = 0
 
-    override fun writeToParcel(
+    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest: Parcel,
-        flags: Int,
-    ) {
         dest.writeInt(id)
         dest.writeString(datetime)
         dest.writeString(title)
@@ -92,6 +82,5 @@ data class ParecelableItem(
         dest.writeString(link)
         dest.writeString(sourcetitle)
         dest.writeString(tags)
-        dest.writeString(author)
     }
 }

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

@@ -21,13 +21,12 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
+import org.kodein.di.instance
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
-class SettingsActivity :
+class SettingsActivity : AppCompatActivity(),
-    AppCompatActivity(),
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
-    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
-    DIAware {
     override val di by closestDI()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -37,9 +36,9 @@ class SettingsActivity :
         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)
         }
@@ -73,67 +72,57 @@ class SettingsActivity :
     }
 
     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.instantiate(
                 classLoader,
-                pref.fragment.toString(),
+                pref.fragment
-            ).apply {
+        ).apply {
-                arguments = args
+            arguments = args
-                setTargetFragment(caller, 0)
+            setTargetFragment(caller, 0)
-            }
+        }
         // Replace the existing Fragment with the new Fragment
         supportFragmentManager.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>("currentMode")?.onPreferenceChangeListener =
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                Preference.OnPreferenceChangeListener { _, newValue ->
+                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
-                    AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                true
-                    true
+            }
-                }
 
-            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                Preference.OnPreferenceClickListener { _ ->
+                context?.let {
-                    context?.let {
+                    LibsBuilder()
-                        LibsBuilder()
+                        .withAboutIconShown(true)
-                            .withAboutIconShown(true)
+                        .withAboutVersionShown(true)
-                            .withAboutVersionShown(true)
+                        .start(it)
-                            .start(it)
-                    }
-                    true
                 }
+                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 = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
             editTextPreference?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.filters =
+                editText.filters = arrayOf(
-                    arrayOf(
                         InputFilter { source, _, _, dest, _, _ ->
                             try {
                                 val input: Int = (dest.toString() + source.toString()).toInt()
@@ -143,53 +132,31 @@ class SettingsActivity :
                                 Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                             }
                             ""
-                        },
+                        }
-                    )
+                )
             }
         }
     }
 
     class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_viewer, rootKey)
 
             val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
-                editText.addTextChangedListener {
+                editText.addTextChangedListener { object : TextWatcher {
-                    object : TextWatcher {
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                        override fun beforeTextChanged(
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                            charSequence: CharSequence,
+                    override fun afterTextChanged(editable: Editable) {
-                            i: Int,
+                        try {
-                            i1: Int,
+                            editText.textSize = editable.toString().toInt().toFloat()
-                            i2: Int,
+                        } catch (e: NumberFormatException) {
-                        ) {
+                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
-                            // 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()
@@ -198,33 +165,26 @@ class SettingsActivity :
                                 nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                             }
                             ""
-                        },
+                        }
-                    )
+                )
             }
         }
     }
 
     class OfflinePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_offline, rootKey)
         }
     }
 
     class ThemePreferenceFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_theme, rootKey)
 
-            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener =
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                Preference.OnPreferenceChangeListener { _, newValue ->
+                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
-                    AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                true
-                    true
+            }
-                }
         }
     }
 
@@ -234,37 +194,28 @@ class SettingsActivity :
             startActivity(browserIntent)
         }
 
-        override fun onCreatePreferences(
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            savedInstanceState: Bundle?,
-            rootKey: String?,
-        ) {
             setPreferencesFromResource(R.xml.pref_links, rootKey)
 
-            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(AppSettingsService.trackerUrl))
-                    openUrl(Uri.parse(AppSettingsService.trackerUrl))
+                true
-                    true
+            }
-                }
 
-            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(AppSettingsService.sourceUrl))
-                    openUrl(Uri.parse(AppSettingsService.sourceUrl))
+                false
-                    false
+            }
-                }
 
-            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(AppSettingsService.translationUrl))
-                    openUrl(Uri.parse(AppSettingsService.translationUrl))
+                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/utils/AppUtils.kt

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

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

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

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

@@ -21,13 +21,14 @@ fun Context.openItemUrl(
     currentItem: Int,
     linkDecoded: String,
     articleViewer: Boolean,
-    app: Activity,
+    app: Activity
 ) {
+
     if (!linkDecoded.isUrlValid()) {
         Toast.makeText(
             this,
             this.getString(R.string.cant_open_invalid_url),
-            Toast.LENGTH_LONG,
+            Toast.LENGTH_LONG
         ).show()
     } else {
         if (articleViewer) {
@@ -43,7 +44,8 @@ fun Context.openItemUrl(
     }
 }
 
-fun String.isUrlValid(): Boolean = this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+fun String.isUrlValid(): Boolean =
+    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlInvalid(): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
@@ -64,10 +66,7 @@ fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) {
 }
 
 class LinkOnTouchListener : View.OnTouchListener {
-    override fun onTouch(
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        v: View?,
-        event: MotionEvent?,
-    ): Boolean {
         var ret = false
         val widget: TextView = v as TextView
         val text: CharSequence = widget.text

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

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

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

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

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

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

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

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

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawerContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity"
     android:fitsSystemWindows="true"
-    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
@@ -27,14 +28,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <androidx.appcompat.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
                         android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
-                        android:theme="@style/ToolBarStyle"
-                        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,7 +77,6 @@
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
         <com.ashokvarma.bottomnavigation.BottomNavigationBar
             android:id="@+id/bottomBar"
             android:layout_width="match_parent"

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

@@ -1,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"
 
-            />
+             />
 
     </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,30 +1,31 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center_horizontal"
     android:orientation="vertical"
     tools:context="bou.amine.apps.readerforselfossv2.android.LoginActivity">
-
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ToolBarStyle"
+
-            app:popupTheme="?attr/toolbarPopupTheme" />
+             />
 
     </com.google.android.material.appbar.AppBarLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:padding="@dimen/activity_horizontal_margin">
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
         <!-- Login progress -->
         <ProgressBar
             android:id="@+id/loginProgress"
@@ -32,72 +33,67 @@
             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="wrap_content"
+            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
+                <Button
-                android:id="@+id/signInButton"
+                    android:id="@+id/signInButton"
-                style="?android:textAppearanceSmall"
+                    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_marginTop="16dp"
+                    android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
+                    android:layout_marginBottom="16dp"
-                android:text="@string/action_sign_in"
+                    android:text="@string/action_sign_in"
-                android:textStyle="bold" />
+                    android:textStyle="bold" />
 
-        </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
     </LinearLayout>
 
 </LinearLayout>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -20,11 +20,6 @@
           android:orderInCategory="2"
           app:showAsAction="ifRoom"/>
 
-    <item android:id="@+id/action_sources"
-        android:title="@string/menu_home_sources"
-        android:orderInCategory="97"
-        app:showAsAction="never"/>
-
     <item android:id="@+id/action_settings"
         android:title="@string/title_activity_settings"
         android:orderInCategory="98"
@@ -36,12 +31,6 @@
         android:orderInCategory="101"
         android:title="@string/menu_home_refresh" />
 
-    <item
-        android:id="@+id/issue_tracker"
-        app:showAsAction="never"
-        android:orderInCategory="103"
-        android:title="@string/issue_tracker_link" />
-
     <item android:id="@+id/action_disconnect"
           android:title="@string/action_disconnect"
           android:orderInCategory="104"

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

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

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

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

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -33,8 +33,8 @@
     <string name="addStringNoUrl">"Accede pra engadir fontes."</string>
     <string name="cant_get_sources">"Non se pode obter a lista de fontes."</string>
     <string name="cant_create_source">"Non se pode crear unha fonte."</string>
-    <string name="cant_get_spouts_no_network">"Non se pode obter a lista de spouts por mor dun erro de rede."</string>
+    <string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
-    <string name="cant_get_spouts">"Non se pode obter a lista de spoits. Pode que haxa algún problema coa api."</string>
+    <string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
     <string name="form_not_complete">"O formulario non está completo"</string>
     <string name="pref_header_links">"Ligazóns"</string>
     <string name="issue_tracker_link">"Rastrexador de Incidencias"</string>
@@ -116,19 +116,14 @@
     <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
     <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
     <string name="remove_source">Eliminar fonte</string>
-    <string name="pref_theme_title">Modo Claro/Escuro</string>
+    <string name="pref_theme_title">Light/Dark mode</string>
-    <string name="mode_dark">Modo escuro</string>
+    <string name="mode_dark">Dark mode</string>
-    <string name="mode_system">Seguir axustes do sistema</string>
+    <string name="mode_system">Follow the system setting</string>
-    <string name="mode_light">Modo claro</string>
+    <string name="mode_light">Light mode</string>
-    <string name="gdpr_dialog_title">A aplicación non comparte ningún dato persoal seu.</string>
+    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[O envío de informes de erros está habilitado. Pode deshabilitarse dende a páxina de axustes. Ten en conta que os informes de erros son esenciais para o desenvolvemento da aplicación.]]></string>
+    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
-    <string name="crash_toast_text">Ocurriu un erro. Enviando os detalles o desenvolvedor.</string>
+    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
-    <string name="pref_switch_disable_acra">"Deshabilitar o reporte automático de erros. "</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
-    <string name="menu_home_filter">Filtros</string>
+    <string name="menu_home_filter">Filters</string>
-    <string name="application_selfoss_only">Esta aplicación só funciona cunha instancia de Selfoss, e con ningún outro filtro RSS.</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -90,7 +90,7 @@
     <string name="pref_switch_items_caching">Save items for offline use</string>
     <string name="pref_switch_update_sources">Check for new sources and tags</string>
     <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
-    <string name="network_connectivity_lost">"Koneksi jaringan hilang"</string>
+    <string name="network_connectivity_lost">"Network connection lost"</string>
     <string name="network_connectivity_retrieved">"Network connection is now available"</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

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

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -125,10 +125,5 @@
     <string name="crash_toast_text">发生崩溃。请将细节发送给开发人员。</string>
     <string name="pref_switch_disable_acra">"禁用自动错误报告 "</string>
     <string name="menu_home_filter">筛选器</string>
-    <string name="application_selfoss_only">此应用只适用于 Selfoss 实例，不适用于其他 RSS 。</string>
+    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">源</string>
-    <string name="update_source">更新源</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -126,9 +126,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
-    <string name="disable_ssl">Disable SSL</string>
 </resources>

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

@@ -12,5 +12,4 @@
     <color name="refresh_progress_2">@color/colorAccent</color>
     <color name="refresh_progress_3">@color/pink</color>
     <color name="dark">#FF282828</color>
-    <color name="transparent_dark_background">#33000000</color>
 </resources>

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

@@ -6,7 +6,6 @@
     <string name="error_invalid_password">"Password not long enough"</string>
     <string name="error_field_required">"Field required"</string>
     <string name="prompt_url">"Url"</string>
-    <string name="disable_ssl">"Disable SSL"</string>
     <string name="withLoginSwitch">"Login required ?"</string>
     <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
     <string name="prompt_login">"Username"</string>
@@ -130,8 +129,4 @@
     <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
     <string name="menu_home_filter">Filters</string>
     <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-    <string name="confirm_disconnect_title">Disconnect ?</string>
-    <string name="confirm_disconnect_description">You will be disconnected from your selfoss instance.</string>
 </resources>

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

@@ -26,16 +26,4 @@
         <item name="android:textColorSecondary">@color/white</item>
         <item name="actionMenuTextColor">@color/white</item>
     </style>
-
-    <style name="Theme.AppCompat.ImageActivity" parent="NoBar">
-        <item name="android:windowBackground">@color/transparent_dark_background</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-    </style>
-
-    <style name="circleImageView" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">50%</item>
-    </style>
-
 </resources>

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

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

androidApp/src/test/kotlin/DatesTest.kt

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

androidApp/src/test/kotlin/RepositoryTest.kt

@@ -18,20 +18,6 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 
-private const val BASE_URL = "https://test.com/selfoss/"
-
-private const val USERNAME = "username"
-
-private const val SPOUT = "spouts\\rss\\fulltextrss"
-
-private const val IMAGE_URL = "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-
-private const val IMAGE_URL_2 = "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-
-private const val FEED_URL = "https://test.com/feed"
-
-private const val TAGS = "Test, New"
-
 class RepositoryTest {
     private val db = mockk<ReaderForSelfossDB>(relaxed = true)
     private val appSettingsService = mockk<AppSettingsService>()
@@ -42,16 +28,16 @@ class RepositoryTest {
     private val NUMBER_STARRED = 20
     private lateinit var repository: Repository
 
+
     private fun initializeRepository(
-        isConnectionAvailable: MutableStateFlow<Boolean> =
+        isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(
-            MutableStateFlow(
+            true
-                true,
+        )
-            ),
     ) {
         repository = Repository(api, appSettingsService, isConnectionAvailable, db)
 
         runBlocking {
-            repository.updateApiInformation()
+            repository.updateApiVersion()
         }
     }
 
@@ -59,23 +45,19 @@ class RepositoryTest {
     fun setup() {
         clearAllMocks()
         every { appSettingsService.getApiVersion() } returns 4
-        every { appSettingsService.getBaseUrl() } returns BASE_URL
+        every { appSettingsService.getBaseUrl() } returns "https://test.com/selfoss/"
-        every { appSettingsService.getUserName() } returns USERNAME
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
 
-        coEvery { api.apiInformation() } returns
+        coEvery { api.version() } returns StatusAndData(
-            StatusAndData(
+            success = true,
-                success = true,
+            data = SelfossModel.ApiVersion("2.19-ba1e8e3", "4.0.0")
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
+        )
-            )
+        coEvery { api.stats() } returns StatusAndData(
-        coEvery { api.stats() } returns
+            success = true,
-            StatusAndData(
+            data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED)
-                success = true,
+        )
-                data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED),
-            )
 
-        every { db.itemsQueries.deleteItemsWhereSource(any()) } returns Unit
         every { db.itemsQueries.items().executeAsList() } returns generateTestDBItems()
         every { db.tagsQueries.deleteAllTags() } returns Unit
         every { db.tagsQueries.transaction(any(), any()) } returns Unit
@@ -86,7 +68,7 @@ class RepositoryTest {
     fun instantiate_repository() {
         initializeRepository()
 
-        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 1) { api.version() }
     }
 
     @Test
@@ -95,7 +77,7 @@ class RepositoryTest {
 
         initializeRepository(MutableStateFlow(false))
 
-        coVerify(exactly = 0) { api.apiInformation() }
+        coVerify(exactly = 0) { api.version() }
         coVerify(exactly = 0) { api.stats() }
     }
 
@@ -103,7 +85,7 @@ class RepositoryTest {
     fun get_api_4_date_with_api_1_version_stored() {
         every { appSettingsService.getApiVersion() } returns 1
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = true, data = generateTestApiItem())
+                StatusAndData(success = true, data = generateTestApiItem())
         every { appSettingsService.updateApiVersion(any()) } returns Unit
 
         initializeRepository()
@@ -115,81 +97,17 @@ class RepositoryTest {
         verify(exactly = 1) { appSettingsService.updateApiVersion(4) }
     }
 
-    @Test
-    fun get_public_access() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
-            StatusAndData(
-                success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
-            )
-        every { appSettingsService.getUserName() } returns ""
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 1) { appSettingsService.updatePublicAccess(true) }
-    }
-
-    @Test
-    fun get_public_access_username_not_empty() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
-            StatusAndData(
-                success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
-            )
-        every { appSettingsService.getUserName() } returns "username"
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
-    }
-
-    @Test
-    fun get_public_access_no_auth() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
-            StatusAndData(
-                success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false)),
-            )
-        every { appSettingsService.getUserName() } returns ""
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
-    }
-
-    @Test
-    fun get_public_access_disabled() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns
-            StatusAndData(
-                success = true,
-                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
-            )
-        every { appSettingsService.getUserName() } returns ""
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
-    }
-
     @Test
     fun get_api_1_date_with_api_4_version_stored() {
         every { appSettingsService.getApiVersion() } returns 4
-        coEvery { api.apiInformation() } returns StatusAndData(success = false, null)
+        coEvery { api.version() } returns StatusAndData(success = false, null)
         val itemParameters = FakeItemParameters()
         itemParameters.datetime = "2021-04-23 11:45:32"
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(
+                StatusAndData(
-                success = true,
+                    success = true,
-                data = generateTestApiItem(itemParameters),
+                    data = generateTestApiItem(itemParameters)
-            )
+                )
 
         initializeRepository()
         runBlocking {
@@ -202,7 +120,7 @@ class RepositoryTest {
     @Test
     fun get_newer_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = true, data = generateTestApiItem())
+                StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         runBlocking {
@@ -217,7 +135,7 @@ class RepositoryTest {
     @Test
     fun get_all_newer_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = true, data = generateTestApiItem())
+                StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.displayedItems = ItemType.ALL
@@ -233,7 +151,7 @@ class RepositoryTest {
     @Test
     fun get_newer_starred_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = true, data = generateTestApiItem())
+                StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.displayedItems = ItemType.STARRED
@@ -270,10 +188,10 @@ class RepositoryTest {
         itemParameter3.tags = "Other, Tag"
         itemParameter3.id = "3"
         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1,
+            itemParameter1
         ) +
-            generateTestDBItems(itemParameter2) +
+                generateTestDBItems(itemParameter2) +
-            generateTestDBItems(itemParameter3)
+                generateTestDBItems(itemParameter3)
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
@@ -298,26 +216,22 @@ class RepositoryTest {
         itemParameter3.sourcetitle = "Other"
         itemParameter3.id = "3"
         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1,
+            itemParameter1
         ) +
-            generateTestDBItems(itemParameter2) +
+                generateTestDBItems(itemParameter2) +
-            generateTestDBItems(itemParameter3)
+                generateTestDBItems(itemParameter3)
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
         initializeRepository(MutableStateFlow(false))
-        repository.setSourceFilter(
+        repository.setSourceFilter(SelfossModel.Source(
-            SelfossModel.SourceDetail(
+            1,
-                1,
+            "Test",
-                "Test",
+            listOf("tags"),
-                null,
+            "spouts\\rss\\fulltextrss",
-                listOf("tags"),
+            "",
-                SPOUT,
+            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-                "",
+        ))
-                IMAGE_URL,
-                SelfossModel.SourceParams("url"),
-            ),
-        )
         runBlocking {
             repository.getNewerItems()
         }
@@ -330,7 +244,7 @@ class RepositoryTest {
     @Test
     fun get_older_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = true, data = generateTestApiItem())
+                StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.items = ArrayList(generateTestApiItem())
@@ -346,7 +260,7 @@ class RepositoryTest {
     @Test
     fun get_all_older_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = true, data = generateTestApiItem())
+                StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.items = ArrayList(generateTestApiItem())
@@ -363,7 +277,7 @@ class RepositoryTest {
     @Test
     fun get_older_starred_items() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = true, data = generateTestApiItem())
+                StatusAndData(success = true, data = generateTestApiItem())
 
         initializeRepository()
         repository.displayedItems = ItemType.STARRED
@@ -600,16 +514,14 @@ class RepositoryTest {
     }
 
     private fun prepareTags(): Pair<List<SelfossModel.Tag>, List<TAG>> {
-        val tags =
+        val tags = listOf(
-            listOf(
+            SelfossModel.Tag("test", "red", 6),
-                SelfossModel.Tag("test", "red", 6),
+            SelfossModel.Tag("second", "yellow", 0)
-                SelfossModel.Tag("second", "yellow", 0),
+        )
-            )
+        val tagsDB = listOf(
-        val tagsDB =
+            TAG("test_DB", "red", 6),
-            listOf(
+            TAG("second_DB", "yellow", 0)
-                TAG("test_DB", "red", 6),
+        )
-                TAG("second_DB", "yellow", 0),
-            )
 
         coEvery { api.tags() } returns StatusAndData(success = true, data = tags)
         coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
@@ -620,63 +532,55 @@ class RepositoryTest {
     fun get_sources() {
         val (sources, sourcesDB) = prepareSources()
         initializeRepository()
-        var testSources: List<SelfossModel.Source>
+        var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
-        assertEquals(sources, testSources)
+        assertSame(sources, testSources)
         assertNotEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 1) { api.sourcesDetailed() }
+        coVerify(exactly = 1) { api.sources() }
     }
 
-    private fun prepareSources(): Pair<ArrayList<SelfossModel.SourceDetail>, List<SOURCE>> {
+    private fun prepareSources(): Pair<ArrayList<SelfossModel.Source>, List<SOURCE>> {
-        val sources =
+        val sources = arrayListOf(
-            arrayListOf(
+            SelfossModel.Source(
-                SelfossModel.SourceDetail(
+                1,
-                    1,
+                "First source",
-                    "First source",
+                listOf("Test", "second"),
-                    null,
+                "spouts\\rss\\fulltextrss",
-                    listOf("Test", "second"),
+                "",
-                    SPOUT,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-                    "",
+            ),
-                    IMAGE_URL_2,
+            SelfossModel.Source(
-                    SelfossModel.SourceParams("url"),
+                2,
-                ),
+                "Second source",
-                SelfossModel.SourceDetail(
+                listOf("second"),
-                    2,
+                "spouts\\rss\\fulltextrss",
-                    "Second source",
+                "",
-                    null,
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-                    listOf("second"),
-                    SPOUT,
-                    "",
-                    IMAGE_URL,
-                    SelfossModel.SourceParams("url"),
-                ),
             )
-        val sourcesDB =
+        )
-            listOf(
+        val sourcesDB = listOf(
-                SOURCE(
+            SOURCE(
-                    "1",
+                "1",
-                    "First DB source",
+                "First DB source",
-                    "Test,second",
+                "Test,second",
-                    SPOUT,
+                "spouts\\rss\\fulltextrss",
-                    "",
+                "",
-                    IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-                    "url",
+            ),
-                ),
+            SOURCE(
-                SOURCE(
+                "2",
-                    "2",
+                "Second source",
-                    "Second source",
+                "second",
-                    "second",
+                "spouts\\rss\\fulltextrss",
-                    SPOUT,
+                "",
-                    "",
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-                    IMAGE_URL,
-                    "url",
-                ),
             )
+        )
 
-        coEvery { api.sourcesDetailed() } returns StatusAndData(success = true, data = sources)
+        coEvery { api.sources() } returns StatusAndData(success = true, data = sources)
         every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
         return Pair(sources, sourcesDB)
     }
@@ -690,13 +594,13 @@ class RepositoryTest {
         initializeRepository()
         var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
             // Sources will be fetched from the database on the second call, thus testSources != sources
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
-        coVerify(exactly = 1) { api.sourcesDetailed() }
+        coVerify(exactly = 1) { api.sources() }
-        assertNotEquals(sources, testSources)
+        assertNotSame(sources, testSources)
         assertEquals(sourcesDB.map { it.toView() }, testSources)
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
@@ -708,13 +612,13 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         every { appSettingsService.isItemCachingEnabled() } returns false
         initializeRepository()
-        var testSources: List<SelfossModel.Source>
+        var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
-        assertEquals(sources, testSources)
+        assertSame(sources, testSources)
-        coVerify(exactly = 1) { api.sourcesDetailed() }
+        coVerify(exactly = 1) { api.sources() }
         verify(exactly = 0) { db.sourcesQueries }
     }
 
@@ -725,13 +629,13 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns false
         initializeRepository()
-        var testSources: List<SelfossModel.Source>
+        var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
-        assertEquals(sources, testSources)
+        assertSame(sources, testSources)
-        coVerify(exactly = 1) { api.sourcesDetailed() }
+        coVerify(exactly = 1) { api.sources() }
         verify(atLeast = 1) { db.sourcesQueries }
     }
 
@@ -739,13 +643,13 @@ class RepositoryTest {
     fun get_sources_without_connection() {
         val (_, sourcesDB) = prepareSources()
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>
+        var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
         assertEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 0) { api.sourcesDetailed() }
+        coVerify(exactly = 0) { api.sources() }
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
 
@@ -756,13 +660,13 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>
+        var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
         assertEquals(emptyList<SelfossModel.Source>(), testSources)
-        coVerify(exactly = 0) { api.sourcesDetailed() }
+        coVerify(exactly = 0) { api.sources() }
         verify(exactly = 0) { db.sourcesQueries.sources().executeAsList() }
     }
 
@@ -773,13 +677,13 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns true
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>
+        var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
         assertEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 0) { api.sourcesDetailed() }
+        coVerify(exactly = 0) { api.sources() }
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
 
@@ -790,31 +694,31 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         initializeRepository(MutableStateFlow(false))
-        var testSources: List<SelfossModel.Source>
+        var testSources: List<SelfossModel.Source>?
         runBlocking {
-            testSources = repository.getSourcesDetails()
+            testSources = repository.getSources()
         }
 
         assertEquals(sourcesDB.map { it.toView() }, testSources)
-        coVerify(exactly = 0) { api.sourcesDetailed() }
+        coVerify(exactly = 0) { api.sources() }
         verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() }
     }
 
     @Test
     fun create_source() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
-            SuccessResponse(true)
+                SuccessResponse(true)
 
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response =
+            response = repository.createSource(
-                repository.createSource(
+                "test",
-                    "test",
+                "https://test.com/feed",
-                    FEED_URL,
+                "spouts\\rss\\fulltextrss",
-                    SPOUT,
+                "Test, New",
-                    TAGS,
+                ""
-                )
+            )
         }
 
         coVerify(exactly = 1) {
@@ -823,6 +727,7 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
+                any(),
             )
         }
         assertSame(true, response)
@@ -830,19 +735,19 @@ class RepositoryTest {
 
     @Test
     fun create_source_but_response_fails() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
-            SuccessResponse(false)
+                SuccessResponse(false)
 
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response =
+            response = repository.createSource(
-                repository.createSource(
+                "test",
-                    "test",
+                "https://test.com/feed",
-                    FEED_URL,
+                "spouts\\rss\\fulltextrss",
-                    SPOUT,
+                "Test, New",
-                    TAGS,
+                ""
-                )
+            )
         }
 
         coVerify(exactly = 1) {
@@ -851,6 +756,7 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
+                any(),
             )
         }
         assertSame(false, response)
@@ -858,19 +764,19 @@ class RepositoryTest {
 
     @Test
     fun create_source_without_connection() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
-            SuccessResponse(true)
+                SuccessResponse(true)
 
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
-            response =
+            response = repository.createSource(
-                repository.createSource(
+                "test",
-                    "test",
+                "https://test.com/feed",
-                    FEED_URL,
+                "spouts\\rss\\fulltextrss",
-                    SPOUT,
+                "Test, New",
-                    TAGS,
+                ""
-                )
+            )
         }
 
         coVerify(exactly = 0) {
@@ -879,6 +785,7 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
+                any()
             )
         }
         assertSame(false, response)
@@ -891,11 +798,10 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5, "src")
+            response = repository.deleteSource(5)
         }
 
         coVerify(exactly = 1) { api.deleteSource(5) }
-        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(true, response)
     }
 
@@ -906,11 +812,10 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5, "src")
+            response = repository.deleteSource(5)
         }
 
         coVerify(exactly = 1) { api.deleteSource(5) }
-        coVerify(exactly = 0) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(false, response)
     }
 
@@ -921,21 +826,19 @@ class RepositoryTest {
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5, "src")
+            response = repository.deleteSource(5)
         }
 
         coVerify(exactly = 0) { api.deleteSource(5) }
-        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(false, response)
     }
 
     @Test
     fun update_remote() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
+            success = true,
-                success = true,
+            data = "finished"
-                data = "finished",
+        )
-            )
 
         initializeRepository()
         var response: Boolean
@@ -949,11 +852,10 @@ class RepositoryTest {
 
     @Test
     fun update_remote_but_response_fails() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
+            success = false,
-                success = false,
+            data = "unallowed access"
-                data = "unallowed access",
+        )
-            )
 
         initializeRepository()
         var response: Boolean
@@ -967,11 +869,10 @@ class RepositoryTest {
 
     @Test
     fun update_remote_with_unallowed_access() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
+            success = true,
-                success = true,
+            data = "unallowed access"
-                data = "unallowed access",
+        )
-            )
 
         initializeRepository()
         var response: Boolean
@@ -985,11 +886,10 @@ class RepositoryTest {
 
     @Test
     fun update_remote_without_connection() {
-        coEvery { api.update() } returns
+        coEvery { api.update() } returns StatusAndData(
-            StatusAndData(
+            success = true,
-                success = true,
+            data = "undocumented..."
-                data = "undocumented...",
+        )
-            )
 
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
@@ -1049,14 +949,14 @@ class RepositoryTest {
         coEvery { appSettingsService.refreshLoginInformation(any(), any(), any()) } returns Unit
 
         initializeRepository()
-        repository.refreshLoginInformation(BASE_URL, "login", "password")
+        repository.refreshLoginInformation("https://test.com/selfoss/", "login", "password")
 
         coVerify(exactly = 1) { api.refreshLoginInformation() }
         coVerify(exactly = 1) {
             appSettingsService.refreshLoginInformation(
-                BASE_URL,
+                "https://test.com/selfoss/",
                 "login",
-                "password",
+                "password"
             )
         }
     }
@@ -1076,14 +976,13 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
+                any()
-            )
-        } returnsMany
-            listOf(
-                StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
-                StatusAndData(success = true, data = generateTestApiItem(itemParameter2)),
-                StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
             )
+        } returnsMany listOf(
+            StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
+            StatusAndData(success = true, data = generateTestApiItem(itemParameter2)),
+            StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
+        )
 
         initializeRepository()
         prepareSearch()
@@ -1097,7 +996,7 @@ class RepositoryTest {
     @Test
     fun cache_items_but_response_fails() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = false, data = generateTestApiItem())
+                StatusAndData(success = false, data = generateTestApiItem())
 
         initializeRepository()
         prepareSearch()
@@ -1111,7 +1010,7 @@ class RepositoryTest {
     @Test
     fun cache_items_without_connection() {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-            StatusAndData(success = false, data = generateTestApiItem())
+                StatusAndData(success = false, data = generateTestApiItem())
 
         initializeRepository(MutableStateFlow(false))
         prepareSearch()
@@ -1125,16 +1024,14 @@ class RepositoryTest {
     private fun prepareSearch() {
         repository.setTagFilter(SelfossModel.Tag("Tag", "read", 0))
         repository.setSourceFilter(
-            SelfossModel.SourceDetail(
+            SelfossModel.Source(
                 1,
                 "First source",
-                5,
                 listOf("Test", "second"),
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                 "",
-                IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-                SelfossModel.SourceParams("url"),
+            )
-            ),
         )
         repository.searchFilter = "search"
     }

androidApp/src/test/kotlin/TestUtils.kt

@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.repository
 import bou.amine.apps.readerforselfossv2.dao.ITEM
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 
+
 fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<ITEM> {
     return listOf(
         ITEM(
@@ -16,9 +17,8 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I
             icon = item.icon,
             link = item.link,
             sourcetitle = item.sourcetitle,
-            tags = item.tags,
+            tags = item.tags
-            author = item.author,
+        )
-        ),
     )
 }
 
@@ -35,9 +35,8 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S
             icon = item.icon,
             link = item.link,
             sourcetitle = item.sourcetitle,
-            tags = item.tags.split(','),
+            tags = item.tags.split(',')
-            author = item.author,
+        )
-        ),
     )
 }
 
@@ -55,5 +54,4 @@ class FakeItemParameters {
         "https://ilblogdellasci.wordpress.com/2022/09/09/etica-della-ricerca-sotto-i-riflettori/"
     var sourcetitle = "La Chimica e la Società"
     var tags = "Chimica, Testing"
-    var author = "Someone important"
 }

build.gradle.kts

@@ -1,25 +1,28 @@
 buildscript {
     dependencies {
         // SqlDelight
-        classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
+        classpath("com.squareup.sqldelight:gradle-plugin:1.5.4")
     }
 }
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.1.2").apply(false)
+    id("com.android.application").version("7.3.1").apply(false)
-    id("com.android.library").version("8.1.2").apply(false)
+    id("com.android.library").version("7.3.1").apply(false)
-    id("org.jetbrains.kotlin.android").version("1.9.10").apply(false)
+    kotlin("android").version("1.7.20").apply(false)
-    kotlin("multiplatform").version("1.9.10").apply(false)
+    kotlin("multiplatform").version("1.7.20").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
-    id("org.jetbrains.kotlinx.kover").version("0.6.1").apply(true)
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 allprojects {
     repositories {
-        google()
+        maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
-        mavenCentral()
+        // IMPORTANT : Add back when new library added
-        maven { url = uri("https://www.jitpack.io") }
+        // google()
+        // mavenCentral()
+        // jcenter()
+        // maven { url = uri("https://www.jitpack.io") }
     }
 }
 

docs/index.html

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

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle.kts

@@ -1,15 +1,32 @@
+val pushCache: String by settings
+
 pluginManagement {
     repositories {
-        google()
+        maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
-        gradlePluginPortal()
+        // IMPORTANT : Add back when new plugin added
-        mavenCentral()
+        // google()
+        // gradlePluginPortal()
+        // mavenCentral()
     }
 }
 
 dependencyResolutionManagement {
     repositories {
-        google()
+        maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
-        mavenCentral()
+        // IMPORTANT : Add back when new library added
+        // google()
+        // mavenCentral()
+    }
+}
+
+
+buildCache {
+    remote<HttpBuildCache> {
+        url = uri("http://18.0.0.7:3071/cache/")
+        isAllowInsecureProtocol = true
+        isAllowUntrustedServer = true
+        isUseExpectContinue = true
+        isPush = (pushCache == "true")
     }
 }
 

shared/build.gradle.kts

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

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

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

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

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

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

@@ -21,13 +21,13 @@ actual fun SelfossModel.Item.getThumbnail(baseUrl: String): String {
 actual fun SelfossModel.Item.getImages(): ArrayList<String> {
     val allImages = ArrayList<String>()
 
-    for (image in Jsoup.parse(content).getElementsByTag("img")) {
+    for ( image in Jsoup.parse(content).getElementsByTag("img")) {
         val url = image.attr("src")
         if (url.lowercase(Locale.US).contains(".jpg") ||
             url.lowercase(Locale.US).contains(".jpeg") ||
             url.lowercase(Locale.US).contains(".png") ||
-            url.lowercase(Locale.US).contains(".webp")
+            url.lowercase(Locale.US).contains(".webp"))
-        ) {
+        {
             allImages.add(url)
         }
     }
@@ -38,11 +38,7 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
     return constructUrl(baseUrl, "favicons", icon)
 }
 
-actual fun constructUrl(
+actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String {
     return if (file == null || file == "null" || file.isEmpty()) {
         ""
     } else {

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

@@ -2,12 +2,14 @@ package bou.amine.apps.readerforselfossv2.DI
 
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
+import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import org.kodein.di.DI
 import org.kodein.di.bind
 import org.kodein.di.instance
 import org.kodein.di.singleton
 
 val networkModule by DI.Module {
+    bind<AppSettingsService>() with singleton { AppSettingsService() }
     bind<SelfossApi>() with singleton { SelfossApi(instance()) }
     bind<MercuryApi>() with singleton { MercuryApi() }
 }

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

@@ -3,14 +3,12 @@ package bou.amine.apps.readerforselfossv2.model
 import kotlinx.serialization.Serializable
 
 class MercuryModel {
+
     @Serializable
     class ParsedContent(
-        val title: String? = null,
+        val title: String,
-        val content: String? = null,
+        val content: String?,
-        val lead_image_url: String? = null, // NOSONAR
+        val lead_image_url: String?,
-        val url: String? = null,
+        val url: String
-        val error: Boolean? = null,
-        val message: String? = null,
-        val failed: Boolean? = null,
     )
 }

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

@@ -9,92 +9,53 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.encoding.encodeCollection
 import kotlinx.serialization.json.*
 
 class SelfossModel {
+
     @Serializable
     data class Tag(
         val tag: String,
         val color: String,
-        val unread: Int,
+        val unread: Int
     )
 
     @Serializable
     class Stats(
         val total: Int,
-        val unread: Int? = null,
+        val unread: Int,
-        val starred: Int? = null,
+        val starred: Int
     )
 
     @Serializable
     data class Spout(
         val name: String,
-        val description: String,
+        val description: String
     )
 
     @Serializable
-    data class ApiInformation(
+    data class ApiVersion(
-        val version: String? = null,
+        val version: String?,
-        val apiversion: String? = null,
+        val apiversion: String?
-        val configuration: ApiConfiguration? = null,
     ) {
-        fun getApiMajorVersion(): Int {
+        fun getApiMajorVersion() : Int {
             var versionNumber = 0
             if (apiversion != null) {
                 versionNumber = apiversion.substringBefore(".").toInt()
             }
             return versionNumber
         }
-
-        fun getApiConfiguration() = configuration ?: ApiConfiguration(null, null)
     }
 
     @Serializable
-    data class ApiConfiguration(
+    data class Source(
-        @Serializable(with = BooleanSerializer::class)
+        val id: Int,
-        val publicMode: Boolean? = null,
+        val title: String,
-        @Serializable(with = BooleanSerializer::class)
-        val authEnabled: Boolean? = null,
-    ) {
-        fun isAuthEnabled() = authEnabled ?: true
-
-        fun isPublicModeEnabled() = publicMode ?: false
-    }
-
-    interface Source {
-        val id: Int
-        var title: String
-        var unread: Int?
-        var error: String?
-        var icon: String?
-    }
-
-    @Serializable
-    data class SourceStats(
-        override val id: Int,
-        override var title: String,
-        override var unread: Int? = null,
-        override var error: String? = null,
-        override var icon: String? = null,
-    ) : Source
-
-    @Serializable
-    data class SourceDetail(
-        override val id: Int,
-        override var title: String,
-        override var unread: Int? = null,
         @Serializable(with = TagsListSerializer::class)
-        var tags: List<String>? = null,
+        val tags: List<String>,
-        var spout: String? = null,
+        val spout: String,
-        override var error: String? = null,
+        val error: String,
-        override var icon: String? = null,
+        val icon: String?
-        var params: SourceParams? = null,
-    ) : Source
-
-    @Serializable
-    data class SourceParams(
-        val url: String? = null,
     )
 
     @Serializable
@@ -107,19 +68,23 @@ class SelfossModel {
         var unread: Boolean,
         @Serializable(with = BooleanSerializer::class)
         var starred: Boolean,
-        val thumbnail: String? = null,
+        val thumbnail: String?,
-        val icon: String? = null,
+        val icon: String?,
         val link: String,
         val sourcetitle: String,
         @Serializable(with = TagsListSerializer::class)
-        val tags: List<String>,
+        val tags: List<String>
-        val author: String? = null,
     ) {
+        // TODO: maybe find a better way to handle these kind of urls
         fun getLinkDecoded(): String {
             var stringUrl: String
             stringUrl =
-                if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
+                if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
-                    link.substringAfter("&amp;url=")
+                    if (link.contains("&amp;url=")) {
+                        link.substringAfter("&amp;url=")
+                    } else {
+                        this.link.replace("&amp;", "&")
+                    }
                 } else {
                     this.link.replace("&amp;", "&")
                 }
@@ -137,22 +102,8 @@ class SelfossModel {
             return stringUrl
         }
 
-        fun sourceAuthorAndDate(): String {
+        fun sourceAndDateText(): String =
-            var txt = this.sourcetitle.getHtmlDecoded()
+            this.sourcetitle.getHtmlDecoded() + DateUtils.parseRelativeDate(this.datetime)
-            if (!this.author.isNullOrBlank()) {
-                txt += " (by ${this.author}) "
-            }
-            txt += DateUtils.parseRelativeDate(this.datetime)
-            return txt
-        }
-
-        fun sourceAuthorOnly(): String {
-            var txt = this.sourcetitle.getHtmlDecoded()
-            if (!this.author.isNullOrBlank()) {
-                txt += " (by ${this.author}) "
-            }
-            return txt
-        }
 
         fun toggleStar(): Item {
             this.starred = !this.starred
@@ -163,20 +114,18 @@ class SelfossModel {
     // TODO: this seems to be super slow.
     object TagsListSerializer : KSerializer<List<String>> {
         override fun deserialize(decoder: Decoder): List<String> {
-            return when (val json = ((decoder as JsonDecoder).decodeJsonElement())) {
+            return when(val json = ((decoder as JsonDecoder).decodeJsonElement())) {
-                is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") }
+                is JsonArray -> json.toList().map { it.toString() }
                 else -> json.toString().split(",")
             }
+
         }
 
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING)
 
-        override fun serialize(
+        override fun serialize(encoder: Encoder, value: List<String>) {
-            encoder: Encoder,
+            TODO("Not yet implemented")
-            value: List<String>,
-        ) {
-            encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() }
         }
     }
 
@@ -193,10 +142,7 @@ class SelfossModel {
         override val descriptor: SerialDescriptor
             get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN)
 
-        override fun serialize(
+        override fun serialize(encoder: Encoder, value: Boolean) {
-            encoder: Encoder,
-            value: Boolean,
-        ) {
             TODO("Not yet implemented")
         }
     }

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

@@ -8,6 +8,7 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.*
 import io.github.aakira.napier.Napier
+import io.ktor.client.call.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -18,8 +19,9 @@ class Repository(
     private val api: SelfossApi,
     private val appSettingsService: AppSettingsService,
     val isConnectionAvailable: MutableStateFlow<Boolean>,
-    private val db: ReaderForSelfossDB,
+    private val db: ReaderForSelfossDB
 ) {
+
     var items = ArrayList<SelfossModel.Item>()
     var connectionMonitored = false
 
@@ -42,47 +44,49 @@ class Repository(
     private val _badgeStarred = MutableStateFlow(0)
     val badgeStarred = _badgeStarred.asStateFlow()
 
-    private var fetchedTags = false
     private var fetchedSources = false
+    private var fetchedTags = false
 
     private var _readerItems = ArrayList<SelfossModel.Item>()
-    private var _selectedSource: SelfossModel.SourceDetail? = null
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
+        // TODO: Use the updatedSince parameter
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
+        var fromDB = false
         if (isNetworkAvailable()) {
-            fetchedItems =
+            fetchedItems = api.getItems(
-                api.getItems(
+                displayedItems.type,
-                    displayedItems.type,
+                offset = 0,
-                    offset = 0,
+                tagFilter.value?.tag,
-                    tagFilter.value?.tag,
+                sourceFilter.value?.id?.toLong(),
-                    sourceFilter.value?.id?.toLong(),
+                searchFilter,
-                    searchFilter,
+                null
-                    null,
+            )
-                )
+        } else {
-        } else if (appSettingsService.isItemCachingEnabled()) {
+            if (appSettingsService.isItemCachingEnabled()) {
-            var dbItems =
+                fromDB = true
-                getDBItems().filter {
+                var dbItems = getDBItems().filter {
                     displayedItems == ItemType.ALL ||
-                        (it.unread && displayedItems == ItemType.UNREAD) ||
+                            (it.unread && displayedItems == ItemType.UNREAD) ||
-                        (it.starred && displayedItems == ItemType.STARRED)
+                            (it.starred && displayedItems == ItemType.STARRED)
                 }
-            if (tagFilter.value != null) {
+                if (tagFilter.value != null) {
-                dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
+                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
-            }
+                }
-            if (sourceFilter.value != null) {
+                if (sourceFilter.value != null) {
-                dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
+                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
-            }
+                }
-            val itemsList = ArrayList(dbItems.map { it.toView() })
+                fetchedItems = StatusAndData.succes(
-            itemsList.sortByDescending { DateUtils.parseDate(it.datetime) }
+                    dbItems.map { it.toView() }
-            fetchedItems =
-                StatusAndData.succes(
-                    itemsList,
                 )
+            }
         }
 
         if (fetchedItems.success && fetchedItems.data != null) {
             items = ArrayList(fetchedItems.data!!)
+            if (fromDB) {
+                items.sortByDescending { DateUtils.parseDate(it.datetime) }
+            }
         }
         return items
     }
@@ -91,15 +95,14 @@ class Repository(
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
         if (isNetworkAvailable()) {
             val offset = items.size
-            fetchedItems =
+            fetchedItems = api.getItems(
-                api.getItems(
+                displayedItems.type,
-                    displayedItems.type,
+                offset,
-                    offset,
+                tagFilter.value?.tag,
-                    tagFilter.value?.tag,
+                sourceFilter.value?.id?.toLong(),
-                    sourceFilter.value?.id?.toLong(),
+                searchFilter,
-                    searchFilter,
+                null
-                    null,
+            )
-                )
         } // When using the db cache, we load everything the first time, so there should be nothing more to load.
 
         if (fetchedItems.success && fetchedItems.data != null) {
@@ -110,16 +113,15 @@ class Repository(
 
     private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> {
         return if (isNetworkAvailable()) {
-            val items =
+            val items = api.getItems(
-                api.getItems(
+                itemType.type,
-                    itemType.type,
+                0,
-                    0,
+                null,
-                    null,
+                null,
-                    null,
+                null,
-                    null,
+                null,
-                    null,
+                200
-                    200,
+            )
-                )
             return if (items.success && items.data != null) {
                 items.data
             } else {
@@ -135,9 +137,9 @@ class Repository(
         if (isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
-                _badgeUnread.value = response.data.unread ?: 0
+                _badgeUnread.value = response.data.unread
                 _badgeAll.value = response.data.total
-                _badgeStarred.value = response.data.starred ?: 0
+                _badgeStarred.value = response.data.starred
                 success = true
             }
         } else if (appSettingsService.isItemCachingEnabled()) {
@@ -170,61 +172,40 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun getSpouts(): Map<String, SelfossModel.Spout> {
         return if (isNetworkAvailable()) {
             val spouts = api.spouts()
             if (spouts.success && spouts.data != null) {
                 spouts.data
             } else {
-                emptyMap()
+                emptyMap() // TODO: do something here
             }
         } else {
             throw NetworkUnavailableException()
         }
     }
 
-    suspend fun getSourcesDetailsOrStats(): ArrayList<SelfossModel.Source> {
+    suspend fun getSources(): ArrayList<SelfossModel.Source> {
-        var sources = ArrayList<SelfossModel.Source>()
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
+        return if (isNetworkAvailable() && !fetchedSources) {
-        if (shouldFetch && isNetworkAvailable()) {
+            val apiSources = api.sources()
-            if (appSettingsService.getPublicAccess()) {
+            if (apiSources.success && apiSources.data != null && isDatabaseEnabled) {
-                val apiSources = api.sourcesStats()
+                resetDBSourcesWithData(apiSources.data)
-                if (apiSources.success && apiSources.data != null) {
+                if (!appSettingsService.isUpdateSourcesEnabled()) {
                     fetchedSources = true
-                    sources = apiSources.data as ArrayList<SelfossModel.Source>
-                }
-            } else {
-                sources = getSourcesDetails() as ArrayList<SelfossModel.Source>
-            }
-        } else if (isDatabaseEnabled) {
-            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.Source>
-        }
-
-        return sources
-    }
-
-    suspend fun getSourcesDetails(): ArrayList<SelfossModel.SourceDetail> {
-        var sources = ArrayList<SelfossModel.SourceDetail>()
-        val isDatabaseEnabled =
-            appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-        val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
-        if (shouldFetch && isNetworkAvailable()) {
-            val apiSources = api.sourcesDetailed()
-            if (apiSources.success && apiSources.data != null) {
-                fetchedSources = true
-                sources = apiSources.data
-                if (isDatabaseEnabled) {
-                    resetDBSourcesWithData(sources)
                 }
             }
+            apiSources.data ?: ArrayList()
         } else if (isDatabaseEnabled) {
-            sources = getDBSources().map { it.toView() } as ArrayList<SelfossModel.SourceDetail>
+            ArrayList(getDBSources().map { it.toView() })
+        } else {
+            ArrayList()
         }
-        return sources
     }
 
+    // TODO: Add tests
     suspend fun markAsRead(item: SelfossModel.Item): Boolean {
         val success = markAsReadById(item.id)
 
@@ -243,6 +224,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
         val success = unmarkAsReadById(item.id)
 
@@ -261,6 +243,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun starr(item: SelfossModel.Item): Boolean {
         val success = starrById(item.id)
 
@@ -279,6 +262,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
         val success = unstarrById(item.id)
 
@@ -297,6 +281,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
@@ -358,6 +343,7 @@ class Repository(
         url: String,
         spout: String,
         tags: String,
+        filter: String
     ): Boolean {
         var response = false
         if (isNetworkAvailable()) {
@@ -366,44 +352,20 @@ class Repository(
                 url,
                 spout,
                 tags,
+                filter
             ).isSuccess == true
         }
 
         return response
     }
 
-    suspend fun updateSource(
+    suspend fun deleteSource(id: Int): Boolean {
-        id: Int,
-        title: String,
-        url: String,
-        spout: String,
-        tags: String,
-    ): Boolean {
-        var response = false
-        if (isNetworkAvailable()) {
-            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
-        }
-
-        return response
-    }
-
-    suspend fun deleteSource(
-        id: Int,
-        title: String,
-    ): Boolean {
         var success = false
         if (isNetworkAvailable()) {
             val response = api.deleteSource(id)
             success = response.isSuccess
         }
 
-        // We filter on success or if the network isn't available
-        if (success || !isNetworkAvailable()) {
-            items = ArrayList(items.filter { it.sourcetitle != title })
-            setReaderItems(items)
-            db.itemsQueries.deleteItemsWhereSource(title)
-        }
-
         return success
     }
 
@@ -422,25 +384,28 @@ class Repository(
                 val response = api.login()
                 result = response.isSuccess == true
             } catch (cause: Throwable) {
-                Napier.e("login failed", cause, tag = "RepositoryImpl.login")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.login")
             }
         }
         return result
     }
 
-    suspend fun checkIfFetchFails(): Boolean {
+    suspend fun shouldBeSelfossInstance(): Pair<Boolean, Boolean> {
         var fetchFailed = true
+        var showSelfossOnlyModal = false
         if (isNetworkAvailable()) {
             try {
                 // Trying to fetch one item, and check someone is trying to use the app with
                 // a random rss feed, that would throw a NoTransformationFoundException
                 fetchFailed = !api.getItemsWithoutCatch().success
+            } catch (e: NoTransformationFoundException) {
+                showSelfossOnlyModal = true
             } catch (e: Throwable) {
-                Napier.e("checkIfFetchFails failed", e, tag = "RepositoryImpl.shouldBeSelfossInstance")
+                Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance")
             }
         }
 
-        return fetchFailed
+        return Pair(fetchFailed, showSelfossOnlyModal)
     }
 
     suspend fun logout() {
@@ -451,7 +416,7 @@ class Repository(
                     Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
                 }
             } catch (cause: Throwable) {
-                Napier.e("logout failed", cause, tag = "RepositoryImpl.logout")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.logout")
             }
             appSettingsService.clearAll()
         } else {
@@ -459,43 +424,30 @@ class Repository(
         }
     }
 
-    fun refreshLoginInformation(
+    fun refreshLoginInformation(url: String, login: String, password: String) {
-        url: String,
-        login: String,
-        password: String,
-    ) {
         appSettingsService.refreshLoginInformation(url, login, password)
         baseUrl = url
         api.refreshLoginInformation()
     }
 
-    suspend fun updateApiInformation() {
+    suspend fun updateApiVersion() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
         if (isNetworkAvailable()) {
-            val fetchedInformation = api.apiInformation()
+            val fetchedVersion = api.version()
-            if (fetchedInformation.success && fetchedInformation.data != null) {
+            if (fetchedVersion.success && fetchedVersion.data != null && fetchedVersion.data.getApiMajorVersion() != apiMajorVersion) {
-                if (fetchedInformation.data.getApiMajorVersion() != apiMajorVersion) {
+                appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
-                    appSettingsService.updateApiVersion(fetchedInformation.data.getApiMajorVersion())
-                }
-                // Check if we're accessing the instance in public mode
-                // This happens when auth and public mode are enabled but
-                // no credentials are provided to login
-                if (appSettingsService.getUserName().isEmpty() &&
-                    fetchedInformation.data.getApiConfiguration().isAuthEnabled() &&
-                    fetchedInformation.data.getApiConfiguration().isPublicModeEnabled()
-                ) {
-                    appSettingsService.updatePublicAccess(true)
-                }
             }
         }
     }
 
     fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
 
-    private fun getDBActions(): List<ACTION> = db.actionsQueries.actions().executeAsList()
+    private fun getDBActions(): List<ACTION> =
+        db.actionsQueries.actions().executeAsList()
 
-    private fun deleteDBAction(action: ACTION) = db.actionsQueries.deleteAction(action.id)
+    private fun deleteDBAction(action: ACTION) =
+        db.actionsQueries.deleteAction(action.id)
 
     private fun getDBTags(): List<TAG> = db.tagsQueries.tags().executeAsList()
 
@@ -511,7 +463,7 @@ class Repository(
         }
     }
 
-    private fun resetDBSourcesWithData(sources: List<SelfossModel.SourceDetail>) {
+    private fun resetDBSourcesWithData(sources: List<SelfossModel.Source>) {
         db.sourcesQueries.deleteAllSources()
 
         db.sourcesQueries.transaction {
@@ -536,8 +488,9 @@ class Repository(
         read: Boolean = false,
         unread: Boolean = false,
         starred: Boolean = false,
-        unstarred: Boolean = false,
+        unstarred: Boolean = false
-    ) = db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
+    ) =
+        db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
 
     private fun updateDBItem(item: SelfossModel.Item) =
         db.itemsQueries.updateItem(
@@ -551,8 +504,7 @@ class Repository(
             item.link,
             item.sourcetitle,
             item.tags.joinToString(","),
-            item.author,
+            item.id.toString()
-            item.id.toString(),
         )
 
     suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> {
@@ -568,39 +520,34 @@ class Repository(
         return emptyList()
     }
 
+    // TODO: Add tests
     suspend fun handleDBActions() {
+
         val actions: List<ACTION> = getDBActions()
 
         actions.forEach { action ->
             when {
-                action.read ->
+                action.read -> doAndReportOnFail(
-                    doAndReportOnFail(
+                    markAsReadById(action.articleid.toInt()),
-                        markAsReadById(action.articleid.toInt()),
+                    action
-                        action,
+                )
-                    )
+                action.unread -> doAndReportOnFail(
-                action.unread ->
+                    unmarkAsReadById(action.articleid.toInt()),
-                    doAndReportOnFail(
+                    action
-                        unmarkAsReadById(action.articleid.toInt()),
+                )
-                        action,
+                action.starred -> doAndReportOnFail(
-                    )
+                    starrById(action.articleid.toInt()),
-                action.starred ->
+                    action
-                    doAndReportOnFail(
+                )
-                        starrById(action.articleid.toInt()),
+                action.unstarred -> doAndReportOnFail(
-                        action,
+                    unstarrById(action.articleid.toInt()),
-                    )
+                    action
-                action.unstarred ->
+                )
-                    doAndReportOnFail(
-                        unstarrById(action.articleid.toInt()),
-                        action,
-                    )
             }
         }
     }
 
-    private fun doAndReportOnFail(
+    private fun doAndReportOnFail(result: Boolean, action: ACTION) {
-        result: Boolean,
-        action: ACTION,
-    ) {
         if (result) {
             deleteDBAction(action)
         }
@@ -621,20 +568,4 @@ class Repository(
     fun getReaderItems(): ArrayList<SelfossModel.Item> {
         return _readerItems
     }
-
-    fun migrate(driverFactory: DriverFactory) {
-        ReaderForSelfossDB.Schema.migrate(driverFactory.createDriver(), 0, 1)
-    }
-
-    fun setSelectedSource(source: SelfossModel.SourceDetail) {
-        _selectedSource = source
-    }
-
-    fun unsetSelectedSource() {
-        _selectedSource = null
-    }
-
-    fun getSelectedSource(): SelfossModel.SourceDetail? {
-        return _selectedSource
-    }
 }

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

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

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

@@ -10,6 +10,7 @@ import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 
+
 suspend fun responseOrSuccessIf404(r: HttpResponse?): SuccessResponse {
     return if (r != null && r.status === HttpStatusCode.NotFound) {
         SuccessResponse(true)
@@ -22,9 +23,6 @@ suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
     return if (r != null && r.status.isSuccess()) {
         r.body()
     } else {
-        if (r != null) {
-            Napier.i("Error ${r.status}", tag = "maybeResponse")
-        }
         SuccessResponse(false)
     }
 }
@@ -39,7 +37,7 @@ suspend inline fun <reified T> bodyOrFailure(r: HttpResponse?): StatusAndData<T>
 
 inline fun tryToRequest(
     requestType: String,
-    fn: () -> HttpResponse,
+    fn: () -> HttpResponse
 ): HttpResponse? {
     var response: HttpResponse? = null
     try {
@@ -52,42 +50,26 @@ inline fun tryToRequest(
 
 suspend inline fun HttpClient.tryToGet(
     urlString: String,
-    crossinline block: HttpRequestBuilder.() -> Unit = {},
+    crossinline block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? =
+): HttpResponse? = tryToRequest("Get") { return this.get { url(urlString); block() } }
-    tryToRequest("Get") {
+
-        return this.get {
-            url(urlString)
-            block()
-        }
-    }
 
 suspend inline fun HttpClient.tryToPost(
     urlString: String,
-    block: HttpRequestBuilder.() -> Unit = {},
+    block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? =
+): HttpResponse? = tryToRequest("Post") { return this.post { url(urlString); block() } }
-    tryToRequest("Post") {
-        return this.post {
-            url(urlString)
-            block()
-        }
-    }
 
 suspend inline fun HttpClient.tryToDelete(
     urlString: String,
-    block: HttpRequestBuilder.() -> Unit = {},
+    block: HttpRequestBuilder.() -> Unit = {}
-): HttpResponse? =
+): HttpResponse? = tryToRequest("Delete") { return this.delete { url(urlString); block() } }
-    tryToRequest("Delete") {
+
-        return this.delete {
-            url(urlString)
-            block()
-        }
-    }
 
 suspend fun HttpClient.tryToSubmitForm(
     url: String,
     formParameters: Parameters = Parameters.Empty,
     encodeInQuery: Boolean = false,
-    block: HttpRequestBuilder.() -> Unit = {},
+    block: HttpRequestBuilder.() -> Unit = {}
 ): HttpResponse? =
     tryToRequest("SubmitForm") {
         return this.submitForm(formParameters, encodeInQuery) {

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

@@ -5,64 +5,41 @@ import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.model.SuccessResponse
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import io.github.aakira.napier.Napier
-import io.ktor.client.HttpClient
+import io.ktor.client.*
-import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.*
-import io.ktor.client.engine.cio.CIOEngineConfig
+import io.ktor.client.plugins.cache.*
-import io.ktor.client.plugins.HttpRequestRetry
+import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.cookies.*
-import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
+import io.ktor.client.plugins.logging.*
-import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.request.*
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.statement.*
-import io.ktor.client.plugins.cookies.HttpCookies
+import io.ktor.http.*
-import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.serialization.kotlinx.json.*
-import io.ktor.client.plugins.logging.Logger
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.client.request.get
-import io.ktor.client.request.headers
-import io.ktor.client.request.parameter
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.Parameters
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.util.encodeBase64
-import io.ktor.utils.io.charsets.Charsets
-import io.ktor.utils.io.core.toByteArray
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 
-expect fun setupInsecureHTTPEngine(config: CIOEngineConfig)
-
 class SelfossApi(private val appSettingsService: AppSettingsService) {
+
     var client = createHttpClient()
 
-    fun createHttpClient() =
+    private fun createHttpClient(): HttpClient {
-        HttpClient(CIO) {
+        val client = HttpClient {
-            if (appSettingsService.getSelfSigned()) {
-                engine {
-                    setupInsecureHTTPEngine(this)
-                }
-            }
             install(ContentNegotiation) {
                 install(HttpCache)
-                json(
+                json(Json {
-                    Json {
+                    prettyPrint = true
-                        prettyPrint = true
+                    isLenient = true
-                        isLenient = true
+                    ignoreUnknownKeys = true
-                        ignoreUnknownKeys = true
+                })
-                        explicitNulls = false
-                    },
-                )
             }
             install(Logging) {
-                logger =
+                logger = object : Logger {
-                    object : Logger {
+                    override fun log(message: String) {
-                        override fun log(message: String) {
+                        Napier.d(message, tag = "LogApiCalls")
-                            Napier.d(message, tag = "LogApiCalls")
-                        }
                     }
+                }
                 level = LogLevel.INFO
             }
             install(HttpTimeout) {
@@ -78,7 +55,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                     Napier.i("Will modify", tag = "HttpSend")
                     CoroutineScope(Dispatchers.Main).launch {
                         Napier.i("Will login", tag = "HttpSend")
-                        login()
+                        this@SelfossApi.login()
                         Napier.i("Did login", tag = "HttpSend")
                     }
                 }
@@ -86,33 +63,23 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             expectSuccess = false
         }
 
-    fun url(path: String) = "${appSettingsService.getBaseUrl()}$path"
+        return client
+    }
+
+    fun url(path: String) =
+        "${appSettingsService.getBaseUrl()}$path"
 
     fun refreshLoginInformation() {
         appSettingsService.refreshApiSettings()
         client = createHttpClient()
     }
 
-    fun constructBasicAuthValue(credentials: BasicAuthCredentials): String {
-        val authString = "${credentials.username}:${credentials.password}"
-        val authBuf = authString.toByteArray(Charsets.UTF_8).encodeBase64()
-
-        return "Basic $authBuf"
-    }
-
     // Api version was introduces after the POST login, so when there is a version, it should be available
     private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
-
+    private fun hasLoginInfo() = appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()
-    private fun hasLoginInfo() =
-        appSettingsService.getUserName().isNotEmpty() &&
-            appSettingsService.getPassword()
-                .isNotEmpty()
 
     suspend fun login(): SuccessResponse =
-        if (appSettingsService.getUserName().isNotEmpty() &&
+        if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword().isNotEmpty()) {
-            appSettingsService.getPassword()
-                .isNotEmpty()
-        ) {
             if (shouldHavePostLogin()) {
                 postLogin()
             } else {
@@ -122,50 +89,17 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             SuccessResponse(true)
         }
 
-    private suspend fun getLogin() =
+    private suspend fun getLogin() = maybeResponse(client.tryToGet(url("/login")) {
-        maybeResponse(
+        parameter("username", appSettingsService.getUserName())
-            client.tryToGet(url("/login")) {
+        parameter("password", appSettingsService.getPassword())
-                parameter("username", appSettingsService.getUserName())
+    })
-                parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
-    private suspend fun postLogin() =
+    private suspend fun postLogin() = maybeResponse(client.tryToPost(url("/login")) {
-        maybeResponse(
+        parameter("username", appSettingsService.getUserName())
-            client.tryToPost(url("/login")) {
+        parameter("password", appSettingsService.getPassword())
-                parameter("username", appSettingsService.getUserName())
+    })
-                parameter("password", appSettingsService.getPassword())
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     private fun shouldHaveNewLogout() = appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0
-
     suspend fun logout(): SuccessResponse =
         if (shouldHaveNewLogout()) {
             doLogout()
@@ -173,43 +107,9 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             maybeLogoutIfAvailable()
         }
 
-    private suspend fun maybeLogoutIfAvailable() =
+    private suspend fun maybeLogoutIfAvailable() = responseOrSuccessIf404(client.tryToGet(url("/logout")))
-        responseOrSuccessIf404(
-            client.tryToGet(url("/logout")) {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
-    private suspend fun doLogout() =
+    private suspend fun doLogout() = maybeResponse(client.tryToDelete(url("/api/session/current")))
-        maybeResponse(
-            client.tryToDelete(url("/api/session/current")) {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun getItems(
         type: String,
@@ -218,353 +118,132 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         source: Long?,
         search: String?,
         updatedSince: String?,
-        items: Int? = null,
+        items: Int? = null
     ): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/items")) {
-            client.tryToGet(url("/items")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+            parameter("type", type)
-                parameter("type", type)
+            parameter("tag", tag)
-                parameter("tag", tag)
+            parameter("source", source)
-                parameter("source", source)
+            parameter("search", search)
-                parameter("search", search)
+            parameter("updatedsince", updatedSince)
-                parameter("updatedsince", updatedSince)
+            parameter("items", items ?: appSettingsService.getItemsNumber())
-                parameter("items", items ?: appSettingsService.getItemsNumber())
+            parameter("offset", offset)
-                parameter("offset", offset)
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun getItemsWithoutCatch(): StatusAndData<List<SelfossModel.Item>> =
-        bodyOrFailure(
+        bodyOrFailure(client.get(url("/items")) {
-            client.get(url("/items")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+            parameter("type", "all")
-                parameter("type", "all")
+            parameter("items", 1)
-                parameter("items", 1)
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun stats(): StatusAndData<SelfossModel.Stats> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/stats")) {
-            client.tryToGet(url("/stats")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun tags(): StatusAndData<List<SelfossModel.Tag>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/tags")) {
-            client.tryToGet(url("/tags")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun update(): StatusAndData<String> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/update")) {
-            client.tryToGet(url("/update")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun spouts(): StatusAndData<Map<String, SelfossModel.Spout>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/sources/spouts")) {
-            client.tryToGet(url("/sources/spouts")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
-    suspend fun sourcesStats(): StatusAndData<ArrayList<SelfossModel.SourceStats>> =
+    suspend fun sources(): StatusAndData<ArrayList<SelfossModel.Source>> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/sources/list")) {
-            client.tryToGet(url("/sources/stats")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
-    suspend fun sourcesDetailed(): StatusAndData<ArrayList<SelfossModel.SourceDetail>> =
+    suspend fun version(): StatusAndData<SelfossModel.ApiVersion> =
-        bodyOrFailure(
+        bodyOrFailure(client.tryToGet(url("/api/about")))
-            client.tryToGet(url("/sources/list")) {
-                if (!shouldHavePostLogin()) {
-                    parameter("username", appSettingsService.getUserName())
-                    parameter("password", appSettingsService.getPassword())
-                }
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
-
-    suspend fun apiInformation(): StatusAndData<SelfossModel.ApiInformation> =
-        bodyOrFailure(
-            client.tryToGet(url("/api/about")) {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun markAsRead(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/mark/$id")) {
-            client.tryToPost(url("/mark/$id")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun unmarkAsRead(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/unmark/$id")) {
-            client.tryToPost(url("/unmark/$id")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun starr(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/starr/$id")) {
-            client.tryToPost(url("/starr/$id")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun unstarr(id: String): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToPost(url("/unstarr/$id")) {
-            client.tryToPost(url("/unstarr/$id")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 
     suspend fun markAllAsRead(ids: List<String>): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToSubmitForm(
-            client.tryToSubmitForm(
+            url = url("/mark"),
-                url = url("/mark"),
+            formParameters = Parameters.build {
-                formParameters =
+                if (!shouldHavePostLogin()) {
-                    Parameters.build {
+                    append("username", appSettingsService.getUserName())
-                        if (!shouldHavePostLogin()) {
+                    append("password", appSettingsService.getPassword())
-                            append("username", appSettingsService.getUserName())
+                }
-                            append("password", appSettingsService.getPassword())
+                ids.map { append("ids[]", it) }
-                        }
+            }
-                        ids.map { append("ids[]", it) }
+        ))
-                    },
-                block = {
-                    if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                        headers {
-                            append(
-                                HttpHeaders.Authorization,
-                                constructBasicAuthValue(
-                                    BasicAuthCredentials(
-                                        username = appSettingsService.getBasicUserName(),
-                                        password = appSettingsService.getBasicPassword(),
-                                    ),
-                                ),
-                            )
-                        }
-                    }
-                },
-            ),
-        )
 
     suspend fun createSourceForVersion(
         title: String,
         url: String,
         spout: String,
         tags: String,
+        filter: String
     ): SuccessResponse =
         maybeResponse(
             if (appSettingsService.getApiVersion() > 1) {
-                createSource("tags[]", title, url, spout, tags)
+                createSource("tags[]", title, url, spout, tags, filter)
             } else {
-                createSource("tags", title, url, spout, tags)
+                createSource("tags", title, url, spout, tags, filter)
-            },
+            }
         )
 
     private suspend fun createSource(
@@ -573,110 +252,28 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         url: String,
         spout: String,
         tags: String,
+        filter: String
     ): HttpResponse? =
         client.tryToSubmitForm(
             url = url("/source"),
-            formParameters =
+            formParameters = Parameters.build {
-                Parameters.build {
+                if (!shouldHavePostLogin()) {
-                    if (!shouldHavePostLogin()) {
+                    append("username", appSettingsService.getUserName())
-                        append("username", appSettingsService.getUserName())
+                    append("password", appSettingsService.getPassword())
-                        append("password", appSettingsService.getPassword())
-                    }
-                    append("title", title)
-                    append("url", url)
-                    append("spout", spout)
-                    append(tagsParamName, tags)
-                },
-            block = {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
                 }
-            },
+                append("title", title)
-        )
+                append("url", url)
-
+                append("spout", spout)
-    suspend fun updateSourceForVersion(
+                append(tagsParamName, tags)
-        id: Int,
+                append("filter", filter)
-        title: String,
+            }
-        url: String,
-        spout: String,
-        tags: String,
-    ): SuccessResponse =
-        maybeResponse(
-            if (appSettingsService.getApiVersion() > 1) {
-                updateSource(id, "tags[]", title, url, spout, tags)
-            } else {
-                updateSource(id, "tags", title, url, spout, tags)
-            },
-        )
-
-    private suspend fun updateSource(
-        id: Int,
-        tagsParamName: String,
-        title: String,
-        url: String,
-        spout: String,
-        tags: String,
-    ): HttpResponse? =
-        client.tryToSubmitForm(
-            url = url("/source/$id"),
-            formParameters =
-                Parameters.build {
-                    if (!shouldHavePostLogin()) {
-                        append("username", appSettingsService.getUserName())
-                        append("password", appSettingsService.getPassword())
-                    }
-                    append("title", title)
-                    append("url", url)
-                    append("spout", spout)
-                    append(tagsParamName, tags)
-                },
-            block = {
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
         )
 
     suspend fun deleteSource(id: Int): SuccessResponse =
-        maybeResponse(
+        maybeResponse(client.tryToDelete(url("/source/$id")) {
-            client.tryToDelete(url("/source/$id")) {
+            if (!shouldHavePostLogin()) {
-                if (!shouldHavePostLogin()) {
+                parameter("username", appSettingsService.getUserName())
-                    parameter("username", appSettingsService.getUserName())
+                parameter("password", appSettingsService.getPassword())
-                    parameter("password", appSettingsService.getPassword())
+            }
-                }
+        })
-                if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
-                }
-            },
-        )
 }

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

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

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

@@ -1,24 +1,17 @@
 package bou.amine.apps.readerforselfossv2.service
 
 import com.russhwolf.settings.Settings
+import io.github.aakira.napier.Napier
+import io.ktor.client.plugins.*
 
-class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
+class AppSettingsService {
-    val settings: Settings =
+    val settings: Settings = Settings()
-        if (acraSenderServiceProcess) {
-            ACRASettings()
-        } else {
-            Settings()
-        }
 
     // Api related
     private var _apiVersion: Int = -1
-    private var _publicAccess: Boolean? = null
-    private var _selfSigned: Boolean? = null
     private var _baseUrl: String = ""
     private var _userName: String = ""
-    private var _basicUserName: String = ""
     private var _password: String = ""
-    private var _basicPassword: String = ""
 
     // User settings related
     private var _itemsCaching: Boolean? = null
@@ -43,6 +36,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     private var _font: String = ""
     private var _theme: Int? = null
 
+
     init {
         refreshApiSettings()
         refreshUserSettings()
@@ -56,47 +50,10 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _apiVersion
     }
 
-    fun updateApiVersion(apiMajorVersion: Int) {
-        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
-        refreshApiVersion()
-    }
-
     private fun refreshApiVersion() {
         _apiVersion = settings.getInt(API_VERSION_MAJOR, -1)
     }
 
-    fun getPublicAccess(): Boolean {
-        if (_publicAccess == null) {
-            refreshPublicAccess()
-        }
-        return _publicAccess!!
-    }
-
-    fun updatePublicAccess(publicAccess: Boolean) {
-        settings.putBoolean(API_PUBLIC_ACCESS, publicAccess)
-        refreshPublicAccess()
-    }
-
-    private fun refreshPublicAccess() {
-        _publicAccess = settings.getBoolean(API_PUBLIC_ACCESS, false)
-    }
-
-    fun getSelfSigned(): Boolean {
-        if (_selfSigned == null) {
-            refreshSelfSigned()
-        }
-        return _selfSigned!!
-    }
-
-    fun updateSelfSigned(selfSigned: Boolean) {
-        settings.putBoolean(API_SELF_SIGNED, selfSigned)
-        refreshSelfSigned()
-    }
-
-    private fun refreshSelfSigned() {
-        _selfSigned = settings.getBoolean(API_SELF_SIGNED, false)
-    }
-
     fun getBaseUrl(): String {
         if (_baseUrl.isEmpty()) {
             refreshBaseUrl()
@@ -118,20 +75,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _password
     }
 
-    fun getBasicUserName(): String {
-        if (_basicUserName.isEmpty()) {
-            refreshBasicUsername()
-        }
-        return _basicUserName
-    }
-
-    fun getBasicPassword(): String {
-        if (_basicPassword.isEmpty()) {
-            refreshBasicPassword()
-        }
-        return _basicPassword
-    }
-
     fun getItemsNumber(): Int {
         if (_itemsNumber == null) {
             refreshItemsNumber()
@@ -140,13 +83,13 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     }
 
     private fun refreshItemsNumber() {
-        _itemsNumber =
+        _itemsNumber = try {
-            try {
+            settings.getString(API_ITEMS_NUMBER, "20").toInt()
-                settings.getString(API_ITEMS_NUMBER, "20").toInt()
+        } catch (e: Exception) {
-            } catch (e: Exception) {
+            settings.remove(API_ITEMS_NUMBER)
-                settings.remove(API_ITEMS_NUMBER)
+            20
-                20
+        }
-            }
+
     }
 
     fun getApiTimeout(): Long {
@@ -159,21 +102,18 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     private fun secToMs(n: Long) = n * 1000
 
     private fun refreshApiTimeout() {
-        _apiTimeout =
+        _apiTimeout = secToMs(try {
-            secToMs(
+            val settingsTimeout = settings.getString(API_TIMEOUT, "60")
-                try {
+            if (settingsTimeout.toLong() > 0) {
-                    val settingsTimeout = settings.getString(API_TIMEOUT, "60")
+                settingsTimeout.toLong()
-                    if (settingsTimeout.toLong() > 0) {
+            } else {
-                        settingsTimeout.toLong()
+                settings.remove(API_TIMEOUT)
-                    } else {
+                60
-                        settings.remove(API_TIMEOUT)
+            }
-                        60
+        } catch (e: Exception) {
-                    }
+            settings.remove(API_TIMEOUT)
-                } catch (e: Exception) {
+            60
-                    settings.remove(API_TIMEOUT)
+        })
-                    60
-                },
-            )
     }
 
     private fun refreshBaseUrl() {
@@ -188,14 +128,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         _password = settings.getString(PASSWORD, "")
     }
 
-    private fun refreshBasicUsername() {
-        _basicUserName = settings.getString(BASIC_LOGIN, "")
-    }
-
-    private fun refreshBasicPassword() {
-        _basicPassword = settings.getString(BASIC_PASSWORD, "")
-    }
-
     private fun refreshArticleViewerEnabled() {
         _articleViewer = settings.getBoolean(PREFER_ARTICLE_VIEWER, true)
     }
@@ -206,7 +138,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _articleViewer == true
     }
-
     private fun refreshShouldBeCardViewEnabled() {
         _shouldBeCardView = settings.getBoolean(CARD_VIEW_ACTIVE, false)
     }
@@ -217,7 +148,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _shouldBeCardView == true
     }
-
     private fun refreshDisplayUnreadCountEnabled() {
         _displayUnreadCount = settings.getBoolean(DISPLAY_UNREAD_COUNT, true)
     }
@@ -228,7 +158,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _displayUnreadCount == true
     }
-
     private fun refreshDisplayAllCountEnabled() {
         _displayAllCount = settings.getBoolean(DISPLAY_OTHER_COUNT, false)
     }
@@ -239,7 +168,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _displayAllCount == true
     }
-
     private fun refreshFullHeightCardsEnabled() {
         _fullHeightCards = settings.getBoolean(FULL_HEIGHT_CARDS, false)
     }
@@ -250,7 +178,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _fullHeightCards == true
     }
-
     private fun refreshUpdateSourcesEnabled() {
         _updateSources = settings.getBoolean(UPDATE_SOURCES, true)
     }
@@ -261,7 +188,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         }
         return _updateSources == true
     }
-
     private fun refreshPeriodicRefreshEnabled() {
         _periodicRefresh = settings.getBoolean(PERIODIC_REFRESH, false)
     }
@@ -331,6 +257,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _notifyNewItems == true
     }
 
+
     private fun refreshMarkOnScrollEnabled() {
         _markOnScroll = settings.getBoolean(MARK_ON_SCROLL, false)
     }
@@ -342,6 +269,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _markOnScroll == true
     }
 
+
     private fun refreshActiveAllignment() {
         _activeAlignment = settings.getInt(TEXT_ALIGN, JUSTIFY)
     }
@@ -405,12 +333,8 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     fun refreshApiSettings() {
         refreshPassword()
         refreshUsername()
-        refreshBasicUsername()
-        refreshBasicPassword()
         refreshBaseUrl()
         refreshApiVersion()
-        refreshPublicAccess()
-        refreshSelfSigned()
     }
 
     fun refreshUserSettings() {
@@ -439,19 +363,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     fun refreshLoginInformation(
         url: String,
         login: String,
-        password: String,
+        password: String
     ) {
-        val regex = """\/\/(\S+):(\S+)@""".toRegex()
+        settings.putString(BASE_URL, url)
-        val matchResult = regex.find(url)
-        if (matchResult != null) {
-            val (basicLogin, basicPassword) = matchResult.destructured
-            settings.putString(BASIC_LOGIN, basicLogin)
-            settings.putString(BASIC_PASSWORD, basicPassword)
-            val urlWithoutBasicAuth = url.replace(regex, "//")
-            settings.putString(BASE_URL, urlWithoutBasicAuth)
-        } else {
-            settings.putString(BASE_URL, url)
-        }
         settings.putString(LOGIN, login)
         settings.putString(PASSWORD, password)
         refreshApiSettings()
@@ -461,11 +375,14 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         settings.remove(BASE_URL)
         settings.remove(LOGIN)
         settings.remove(PASSWORD)
-        settings.remove(BASIC_LOGIN)
-        settings.remove(BASIC_PASSWORD)
         refreshApiSettings()
     }
 
+    fun updateApiVersion(apiMajorVersion: Int) {
+        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
+        refreshApiVersion()
+    }
+
     fun clearAll() {
         settings.clear()
         refreshApiSettings()
@@ -480,9 +397,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     companion object {
         const val translationUrl = "https://crwd.in/readerforselfoss"
 
-        const val sourceUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform"
+        const val sourceUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform"
 
-        const val trackerUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
+        const val trackerUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
 
         const val syncChannelId = "sync-channel-id"
 
@@ -494,10 +411,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val API_VERSION_MAJOR = "apiVersionMajor"
 
-        const val API_PUBLIC_ACCESS = "apiPublicAccess"
-
-        const val API_SELF_SIGNED = "apiSelfSigned"
-
         const val API_ITEMS_NUMBER = "prefer_api_items_number"
 
         const val API_TIMEOUT = "api_timeout"
@@ -508,10 +421,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val PASSWORD = "password"
 
-        const val BASIC_LOGIN = "basic_login"
-
-        const val BASIC_PASSWORD = "basic_password"
-
         const val PREFER_ARTICLE_VIEWER = "prefer_article_viewer"
 
         const val CARD_VIEW_ACTIVE = "card_view_active"
@@ -542,10 +451,12 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val PERIODIC_REFRESH_MINUTES = "periodic_refresh_minutes"
 
+
         const val INFINITE_LOADING = "infinite_loading"
 
         const val ITEMS_CACHING = "items_caching"
 
         const val CURRENT_THEME = "currentMode"
+
     }
 }

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

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

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

@@ -3,8 +3,7 @@ package bou.amine.apps.readerforselfossv2.utils
 enum class ItemType(val position: Int, val type: String) {
     UNREAD(1, "unread"),
     ALL(2, "all"),
-    STARRED(3, "starred"),
+    STARRED(3, "starred");
-    ;
 
     companion object {
         fun fromInt(value: Int) = values().first { it.position == value }

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

@@ -12,8 +12,4 @@ expect fun SelfossModel.Item.getImages(): ArrayList<String>
 
 expect fun SelfossModel.Source.getIcon(baseUrl: String): String
 
-expect fun constructUrl(
+expect fun constructUrl(baseUrl: String, path: String, file: String?): String
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String

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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.utils
 
-fun String?.isEmptyOrNullOrNullString(): Boolean = this == null || this == "null" || this.isEmpty()
+fun String?.isEmptyOrNullOrNullString(): Boolean =
+    this == null || this == "null" || this.isEmpty()
 
 fun String.longHash(): Long {
     var h = 98764321261L

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

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

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

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

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Items.sq

@@ -10,7 +10,6 @@ CREATE TABLE ITEM (
     `link` TEXT NOT NULL,
     `sourcetitle` TEXT NOT NULL,
     `tags` TEXT NOT NULL,
-    `author` TEXT,
     PRIMARY KEY(`id`)
 );
 
@@ -27,8 +26,5 @@ INSERT OR REPLACE INTO ITEM VALUES ?;
 deleteItem:
 DELETE FROM ITEM WHERE `id` = ?;
 
-deleteItemsWhereSource:
-DELETE FROM ITEM WHERE `sourcetitle` = ?;
-
 updateItem:
-UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ?, `author` = ? WHERE `id` = ?;
+UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ? WHERE `id` = ?;

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Sources.sq

@@ -5,7 +5,6 @@ CREATE TABLE SOURCE (
     `spout` TEXT NOT NULL,
     `error` TEXT NOT NULL,
     `icon` TEXT NOT NULL,
-    `url` TEXT,
     PRIMARY KEY(`id`)
 );
 

shared/src/iosArm64Main/kotlin/bou/amine/apps/readerforselfossv2/rest/setupInsecureHTTPEngine.kt

@@ -1,6 +0,0 @@
-package bou.amine.apps.readerforselfossv2.rest
-
-import io.ktor.client.engine.cio.CIOEngineConfig
-
-actual fun setupInsecureHTTPEngine(config: CIOEngineConfig) {
-}

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

@@ -22,10 +22,6 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
     TODO("Not yet implemented")
 }
 
-actual fun constructUrl(
+actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
-    baseUrl: String,
-    path: String,
-    file: String?,
-): String {
     TODO("Not yet implemented")
 }