test

.gitea/workflows/on_merge_on_release-test.yml

@@ -0,0 +1,138 @@
+name: Create tag
+on:
+  push:
+    branches:
+      - test-releas
+  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
+               echo "AAAAAAAAAAA
+          
+               --------------------------------------------------------------------
+          
+               $(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"
+               git checkout master
+               git merge release
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: master
+      - name: Merge master in release
+        run: |
+          git merge release
+      - name: Push changes
+        uses: appleboy/git-push-action@v1.0.0
+        with:
+          author_name: giteadrone
+          author_email: aminecmi+giteadrone@pm.me
+          remote: ${{ secrets.REMOTE_URL }}
+          followtags: true
+          ssh_key: ${{ secrets.PRIVATE_KEY }}
+          tags: true
+          branch: master
+#      - name: copy file via ssh password
+#        uses: appleboy/scp-action@v0.1.7
+#        with:
+#          host: amine-bouabdallaoui.fr
+#          username: ubuntu
+#          key: ${{ secrets.PRIVATE_KEY }}
+#          source: "version.txt"
+#          target: "/home/ubuntu/"
+#      - name: deploy version file
+#        uses: appleboy/ssh-action@v1.2.0
+#        with:
+#          host: amine-bouabdallaoui.fr
+#          username: ubuntu
+#          key: ${{ secrets.PRIVATE_KEY }}
+#          script: cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
+#  release:
+#    runs-on: ubuntu-latest
+#    needs: createTagAndChangelog
+#    steps:
+#      - name: Check out repository code
+#        uses: actions/checkout@v4
+#        with:
+#          fetch-depth: 0
+#      - name: Fetch tags
+#        id: version
+#        run: |
+#          git fetch --tags -p
+#          PREV=$(git describe --tags --abbrev=0)
+#          echo $PREV
+#          echo "VERSION=$PREV" >> $GITHUB_OUTPUT
+#      - uses: actions/setup-java@v4
+#        with:
+#          distribution: 'temurin'
+#          java-version: '17'
+#          cache: gradle
+#      - name: Setup Android SDK
+#        uses: android-actions/setup-android@v3
+#      - name: Configure gradle...
+#        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+#      - name: setup go
+#        uses: https://github.com/actions/setup-go@v4
+#        with:
+#          go-version: '>=1.20.1'
+#      - name: Generate APK
+#        run: ./gradlew :androidApp:assembleGithubConfigRelease
+#      - name: Get Key
+#        run: wget ${{ secrets.KEY_URL }}
+#      - name: Zippalign
+#        run: |
+#          sdkmanager "build-tools;31.0.0"
+#          ls $ANDROID_HOME/build-tools
+#          $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
+#      - name: Sigh
+#        run: $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias ${{ secrets.KEY_ALIAS }} --ks-pass pass:${{ secrets.KEYSTORE_PASSWORD }} --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
+#      - name: Verify
+#        run: $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
+#      - name: Release
+#        uses: https://gitea.com/actions/gitea-release-action@main
+#        with:
+#          files: signed.apk
+#          token: ${{ secrets.API_KEY }}
+#          tag_name: ${{ steps.version.outputs.VERSION }}
+#          name: ${{ steps.version.outputs.VERSION }}
+#      - name: Send mail
+#        uses: https://github.com/dawidd6/action-send-mail@v4
+#        with:
+#          connection_url: ${{ secrets.MAIL_CONNECTION }}
+#          to: ${{ secrets.MAIL_TO }}
+#          from: ${{ secrets.MAIL_FROM }}
+#          subject: Mapping file
+#          priority: high
+#          convert_markdown: true
+#          body: Nouveau fichier de mapping pour la version ${{ steps.version.outputs.VERSION }}
+#          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt

.gitea/workflows/on_merge_on_release.yml

@@ -16,7 +16,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: master
       - name: Config git
         run: |
           git config --global user.email aminecmi+giteadrone@pm.me
@@ -51,7 +50,7 @@ jobs:
           followtags: true
           ssh_key: ${{ secrets.PRIVATE_KEY }}
           tags: true
-          branch: master
+          branch: release
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7
         with:
@@ -125,4 +124,4 @@ jobs:
           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
+          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt

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

@@ -56,7 +56,7 @@ class HomeActivityTest {
     fun testMenuActions() {
         onView(withId(R.id.action_search)).perform(click())
         onView(
-            withId(com.google.android.material.R.id.search_src_text),
+            withId(R.id.search_src_text),
         ).check(matches(isFocused()))
         onView(isRoot()).perform(ViewActions.pressBack())
 

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

@@ -118,8 +118,8 @@ class ArticleFragment :
                 e.sendSilentlyWithAcra()
             }
 
-            colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
-            colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
+            colorOnSurface = getColorFromAttr(R.attr.colorOnSurface)
+            colorSurface = getColorFromAttr(R.attr.colorSurface)
 
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()

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

@@ -83,15 +83,7 @@ class FilterSheetFragment :
         val sourceGroup = binding.sourcesGroup
 
         repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
-            val c: Chip? =
-                maybeIfContext {
-                    Chip(it)
-                } as Chip?
-
-            if (c == null) {
-                return
-            }
-
+            val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
 
             maybeIfContext {
@@ -153,11 +145,7 @@ class FilterSheetFragment :
         val tags = repository.getTags()
 
         tags.forEachIndexed { _, tag ->
-            val c: Chip? = maybeIfContext { Chip(it) } as Chip?
-            if (c == null) {
-                return
-            }
-
+            val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 

gradle.properties

@@ -19,11 +19,11 @@ kotlin.code.style=official
 android.useAndroidX=true
 #android.nonTransitiveRClass=true
 android.enableJetifier=false
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=false
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
-org.gradle.configureondemand=true
+org.gradle.configureondemand=true