.drone.yml

@@ -0,0 +1,170 @@
+kind: pipeline
+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
+      - echo "---------------------------------------------------------"
+      - echo "Configure java..."
+      - . ~/.bash_profile
+      - jenv global 17.0
+      - java --version
+      - date
+      - echo "---------------------------------------------------------"
+      - echo "Building and testing..."
+      - ./gradlew build
+      - echo "---------------------------------------------------------"
+trigger:
+  event:
+    - push
+    - pull_request
+
+---
+kind: pipeline
+type: docker
+name: Publish
+
+steps:
+  - name: createTagAndChangelog
+    image: ubuntu:latest
+    commands:
+      - apt-get update && apt-get install -y git
+      - git fetch --tags -p
+      - PREV=$(git describe --tags --abbrev=0)
+      - ./build.sh --publish --from-ci
+      - VER=$(git describe --tags --abbrev=0)
+      - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+      - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+      - git add CHANGELOG.md
+      - git commit -m "Changelog for $VER [CI SKIP]"
+    environment:
+      TZ: Europe/Paris
+
+  - name: git-push
+    image: appleboy/drone-git-push
+    settings:
+      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
+      username: ubuntu
+      key:
+        from_secret: privateKey
+      port: 22
+      target: /home/ubuntu/
+      source: version.txt
+
+  - name: deploy
+    image: appleboy/drone-ssh
+    settings:
+      host: amine-bouabdallaoui.fr
+      user: ubuntu
+      key:
+        from_secret: privateKey
+      command_timeout: 2m
+      script:
+        - cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
+
+trigger:
+  event:
+    - promote
+  target:
+    - production
+
+---
+kind: pipeline
+type: docker
+name: Release
+
+steps:
+  - name: build
+    image: mingc/android-build-box:latest
+    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Fetch tags..."
+      - 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
+      - echo "---------------------------------------------------------"
+      - echo "Generate APK"
+      - ./gradlew :androidApp:assembleGithubConfigRelease
+      - echo "---------------------------------------------------------"
+      - echo "Get Key"
+      - wget https://amine-bouabdallaoui.fr/key
+      - echo "---------------------------------------------------------"
+      - echo "Zipalign"
+      - $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
+      - echo "---------------------------------------------------------"
+      - echo "Sign"
+      - $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias $YOUR_KEY_ALIAS --ks-pass pass:$YOUR_KEYSTORE_PASSWORD --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
+      - echo "---------------------------------------------------------"
+      - echo "Verify"
+      - $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
+    environment:
+      TZ: Europe/Paris
+      YOUR_KEYSTORE_PASSWORD:
+        from_secret: keyPass
+      YOUR_KEY_ALIAS:
+        from_secret: keyAlias
+
+  - name: gitea_release
+    image: plugins/gitea-release
+    settings:
+      api_key:
+        from_secret: giteaAPI
+      base_url: https://gitea.amine-bouabdallaoui.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

.gitea/workflows/common_build.yml

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

.gitea/workflows/on_merge_on_release.yml

@@ -1,126 +0,0 @@
-name: Create tag
-on:
-  push:
-    branches:
-      - release
-  workflow_dispatch:
-
-jobs:
-  build:
-    uses: ./.gitea/workflows/common_build.yml
-  createTagAndChangelog:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Config git
-        run: |
-          git config --global user.email aminecmi+giteadrone@pm.me
-          git config --global user.name giteadrone
-      - name: Creating the tag and generate changelog
-        run: |
-          git fetch --tags -p
-          PREV=$(git describe --tags --abbrev=0)
-          ./build.sh --publish --from-ci
-          VER=$(git describe --tags --abbrev=0)
-          CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
-          echo "**$VER
-          
-          $CHANGELOG
-          
-          --------------------------------------------------------------------
-          
-          $(cat CHANGELOG.md)" > CHANGELOG.md
-          git add CHANGELOG.md
-          touch ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
-          echo "**$VER**
-          
-          $CHANGELOG" > ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
-          git add ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
-          git commit -m "Changelog for $VER"
-      - name: Push changes
-        uses: appleboy/git-push-action@v1.0.0
-        with:
-          author_name: giteadrone
-          author_email: aminecmi+giteadrone@pm.me
-          remote: ${{ secrets.REMOTE_URL }}
-          followtags: true
-          ssh_key: ${{ secrets.PRIVATE_KEY }}
-          tags: true
-          branch: release
-      - name: copy file via ssh password
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: amine-bouabdallaoui.fr
-          username: ubuntu
-          key: ${{ secrets.PRIVATE_KEY }}
-          source: "version.txt"
-          target: "/home/ubuntu/"
-      - name: deploy version file
-        uses: appleboy/ssh-action@v1.2.0
-        with:
-          host: amine-bouabdallaoui.fr
-          username: ubuntu
-          key: ${{ secrets.PRIVATE_KEY }}
-          script: cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
-  release:
-    runs-on: ubuntu-latest
-    needs: createTagAndChangelog
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Fetch tags
-        id: version
-        run: |
-          git fetch --tags -p
-          PREV=$(git describe --tags --abbrev=0)
-          echo $PREV
-          echo "VERSION=$PREV" >> $GITHUB_OUTPUT
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-      - name: Configure gradle...
-        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
-      - name: setup go
-        uses: https://github.com/actions/setup-go@v4
-        with:
-          go-version: '>=1.20.1'
-      - name: Generate APK
-        run: ./gradlew :androidApp:assembleGithubConfigRelease
-      - name: Get Key
-        run: wget ${{ secrets.KEY_URL }}
-      - name: Zippalign
-        run: |
-          sdkmanager "build-tools;31.0.0"
-          ls $ANDROID_HOME/build-tools 
-          $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
-      - name: Sigh
-        run: $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias ${{ secrets.KEY_ALIAS }} --ks-pass pass:${{ secrets.KEYSTORE_PASSWORD }} --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
-      - name: Verify
-        run: $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
-      - name: Release
-        uses: https://gitea.com/actions/gitea-release-action@main
-        with:
-          files: signed.apk
-          token: ${{ secrets.API_KEY }}
-          tag_name: ${{ steps.version.outputs.VERSION }}
-          name: ${{ steps.version.outputs.VERSION }}
-      - name: Send mail
-        uses: https://github.com/dawidd6/action-send-mail@v4
-        with:
-          connection_url: ${{ secrets.MAIL_CONNECTION }}
-          to: ${{ secrets.MAIL_TO }}
-          from: ${{ secrets.MAIL_FROM }}
-          subject: Mapping file
-          priority: high
-          convert_markdown: true
-          body: Nouveau fichier de mapping pour la version ${{ steps.version.outputs.VERSION }}
-          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt

.gitea/workflows/on_pr.yml

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

.gitea/workflows/on_push.yml

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

CHANGELOG.md

@@ -1,21 +1,3 @@
-**v124113311
-
-- chore: update versions. (#165)
-- chore: fastlane changelog.
-- chore: fastlane fixes.
-- Changelog for v124113301
-
---------------------------------------------------------------------
-
-**v124113301**
-
-- chore: Gitea Action
-- Merge pull request 'chore: Gitea Action' (#164) from runner into master
-- chore: Gitea Action
-- chore: Readme update.
-
---------------------------------------------------------------------
-
 **v124041081**
 
 - chore: comment.

README.md

@@ -1,4 +1,4 @@
-# ReaderForSelfoss-multiplatform [![Build Status](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/actions/workflows/on_push.yml/badge.svg)](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/actions?workflow=on_push.yml&actor=0&status=0)
+# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-bouabdallaoui.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform)
 
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
@@ -10,6 +10,10 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 <a href="https://f-droid.org/packages/bou.amine.apps.readerforselfossv2.android"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
 
+## Screen captures
+
+<img src="res//fr-card.png?raw=true" alt="card view" width="400"/> <img src="res//fr-list.png?raw=true" alt="list view" width="400"/>
+
 ## Like my app ?
 
 <a href="https://www.buymeacoffee.com/aminecmi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>

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

@@ -13,11 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import androidx.recyclerview.widget.*
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
@@ -62,7 +58,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener
     private lateinit var binding: ActivityHomeBinding
 
-    private var recyclerAdapter: ItemsAdapter<out RecyclerView.ViewHolder>? = null
+    private var recyclerAdapter: RecyclerView.Adapter<*>? = null
 
     private var fromTabShortcut: Boolean = false
 
@@ -502,7 +498,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
             binding.recyclerView.adapter = recyclerAdapter
         } else {
-            recyclerAdapter!!.updateAllItems(items)
+            (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
         }
 
         reloadBadges()

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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,6 +14,7 @@ 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.openInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -30,10 +32,11 @@ import org.kodein.di.instance
 
 class ItemCardAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
-    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override var items: ArrayList<SelfossModel.Item>,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
-    override lateinit var binding: CardItemBinding
+    private lateinit var binding: CardItemBinding
+    private val c: Context = app.baseContext
     private val imageMaxHeight: Int =
         c.resources.getDimension(R.dimen.card_image_max_height).toInt()
 
@@ -49,8 +52,8 @@ class ItemCardAdapter(
         return ViewHolder(binding)
     }
 
-    private fun handleClickListeners(holderBinding: CardItemBinding, position: Int) {
-        holderBinding.favButton.setOnClickListener {
+    private fun handleClickListeners(position: Int) {
+        binding.favButton.setOnClickListener {
             val item = items[position]
             if (item.starred) {
                 CoroutineScope(Dispatchers.IO).launch {
@@ -75,15 +78,27 @@ class ItemCardAdapter(
         }
     }
 
+    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[position]
+            val itm = items[holder.bindingAdapterPosition]
 
-            handleClickListeners(binding, position)
-            handleLinkOpening(binding, position)
+            handleClickListeners(holder.bindingAdapterPosition)
+            handleLinkOpening(holder.bindingAdapterPosition)
 
             binding.favButton.isSelected = itm.starred
             if (appSettingsService.getPublicAccess()) {
@@ -125,5 +140,9 @@ class ItemCardAdapter(
         }
     }
 
+    override fun getItemCount(): Int {
+        return items.size
+    }
+
     inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root)
 }

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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
@@ -9,6 +10,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -21,10 +23,11 @@ import org.kodein.di.instance
 
 class ItemListAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
-    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override var items: ArrayList<SelfossModel.Item>,
+    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
-    override lateinit var binding: ListItemBinding
+    private lateinit var binding: ListItemBinding
+    private val c: Context = app.baseContext
 
     override val di: DI by closestDI(app)
     override val repository: Repository by instance()
@@ -43,9 +46,17 @@ class ItemListAdapter(
         position: Int,
     ) {
         with(holder) {
-            val itm = items[position]
+            val itm = items[holder.bindingAdapterPosition]
 
-            handleLinkOpening(binding, position)
+            binding.root.setOnClickListener {
+                repository.setReaderItems(items)
+                c.openItemUrl(
+                    holder.bindingAdapterPosition,
+                    items[holder.bindingAdapterPosition].getLinkDecoded(),
+                    appSettingsService.isArticleViewerEnabled(),
+                    app,
+                )
+            }
 
             binding.title.text = itm.title.getHtmlDecoded()
 
@@ -72,5 +83,7 @@ class ItemListAdapter(
         }
     }
 
+    override fun getItemCount(): Int = items.size
+
     inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root)
 }

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

@@ -1,13 +1,10 @@
 package bou.amine.apps.readerforselfossv2.android.adapters
 
 import android.app.Activity
-import android.content.Context
 import android.graphics.Color
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -19,20 +16,16 @@ import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
-    abstract val items: ArrayList<SelfossModel.Item>
+    abstract var items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
-    abstract val binding: ViewBinding
     abstract val appSettingsService: AppSettingsService
     abstract val app: Activity
-    abstract val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit
-
-    protected val c: Context get() = app.baseContext
+    abstract val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items.clear()
-        this.items.addAll(items)
-        updateHomeItems(items)
+        this.items = items
         notifyDataSetChanged()
+        updateItems(this.items)
     }
 
     private fun unmarkSnackbar(
@@ -77,18 +70,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    protected fun handleLinkOpening(holderBinding: ViewBinding, position: Int) {
-        holderBinding.root.setOnClickListener {
-            repository.setReaderItems(items)
-            c.openItemUrl(
-                position,
-                items[position].getLinkDecoded(),
-                appSettingsService.isArticleViewerEnabled(),
-                app,
-            )
-        }
-    }
-
     fun handleItemAtIndex(position: Int) {
         if (items[position].unread) {
             readItemAtIndex(items[position], position)
@@ -109,7 +90,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
             items.remove(item)
             notifyItemRemoved(position)
             notifyItemRangeChanged(position, itemCount)
-            updateHomeItems(items)
+            updateItems(items)
         } else {
             notifyItemChanged(position)
         }
@@ -138,15 +119,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     ) {
         items.add(position, item)
         notifyItemInserted(position)
-        updateHomeItems(items)
+        updateItems(items)
     }
 
     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
         val oldSize = items.size
         items.addAll(newItems)
         notifyItemRangeInserted(oldSize, newItems.size)
-        updateHomeItems(items)
+        updateItems(items)
     }
-
-    override fun getItemCount(): Int = items.size
 }

build.gradle.kts

@@ -7,8 +7,8 @@ buildscript {
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.7.2").apply(false)
-    id("com.android.library").version("8.7.2").apply(false)
+    id("com.android.application").version("8.1.2").apply(false)
+    id("com.android.library").version("8.1.2").apply(false)
     id("org.jetbrains.kotlin.android").version("1.9.10").apply(false)
     kotlin("multiplatform").version("1.9.10").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)

fastlane/metadata/android/en-US/changelogs/v124113311.txt

@@ -1,6 +0,0 @@
-**v124113311**
-
-- chore: update versions. (#165)
-- chore: fastlane changelog.
-- chore: fastlane fixes.
-- Changelog for v124113301

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-A new RSS reader for selfoss (http://selfoss.aditu.de/)
+A new RSS reader for <a href="http://selfoss.aditu.de/">selfoss</a>.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Nov 25 22:48:24 CET 2024
+#Thu Jul 13 11:41:19 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -191,7 +191,7 @@ class SelfossModel {
         }
 
         override val descriptor: SerialDescriptor
-            get() = PrimitiveSerialDescriptor("BooleanOrIntForSomeSelfossVersions", PrimitiveKind.BOOLEAN)
+            get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN)
 
         override fun serialize(
             encoder: Encoder,

sonar-project.properties

@@ -0,0 +1,5 @@
+sonar.projectKey=RFS2
+sonar.coverage.jacoco.xmlReportPaths=build/reports/kover/merged/xml/report.xml
+sonar.sourceEncoding=UTF-8
+sonar.sources=.
+sonar.exclusions=shared/src/iosArm64Main/**, shared/src/iosX64Main/**, docs/**