Merge pull request 'bump' (#182) from bump into master

Reviewed-on: #182

.drone.yml

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

.editorconfig

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

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

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

.gitea/workflows/common_build.yml

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

.gitea/workflows/on_merge_on_release.yml

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

.gitea/workflows/on_pr.yml

@@ -0,0 +1,28 @@
+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'
+          java-version: '17'
+          cache: gradle
+      - name: Install klint
+        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
+      - name: Install detekt
+        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip
+      - name: Linting...
+        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build'
+      - name: Detecting...
+        run: ./detekt-cli-1.23.7/bin/detekt-cli -c detekt.yml --excludes '**/shared/build/**/*.kt'
+  build:
+    needs: Lint
+    uses: ./.gitea/workflows/common_build.yml

.gitea/workflows/on_push.yml

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

.gitignore

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

CHANGELOG.md

@@ -1,3 +1,110 @@
+**v125010241
+
+- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
+- refactor: context fragments issues.
+- logs: Context issues.
+- fix: Handle empty url issue, again.
+- fix: Link not opening.
+- Changelog for v125010201
+
+--------------------------------------------------------------------
+
+**v125010201
+
+- fix: Handle empty url issue.
+- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
+- chore: changing actions in reader fragment.
+- Changelog for v125010131
+
+--------------------------------------------------------------------
+
+**v125010131
+
+- fix: reload the adapter when it's needed. Fixes #128. (#176)
+- feat: basic auth and images loading. Fixes #172. (#175)
+- Changelog for v125010111
+
+--------------------------------------------------------------------
+
+**v125010111
+
+- Debug trying to fix context issues. (#174)
+- Changelog for v125010031
+
+--------------------------------------------------------------------
+
+**v125010031
+
+- Merge pull request 'Bump dependencies' (#173) from upgarde into master
+- chore: "faster" action.
+- fastlane: icon change.
+- chore: ignoring a pixel issue.
+- test: fixed an ui test issue.
+- fix: center the loading thing.
+- test: items displaying.
+- bump: sqldelight.
+- bump: material, desugar jdk, jsoup, kodein, settings, napier, mock.
+- bump: androix and coroutines.
+- bump: ktor. Closes #67.
+- Changelog for v124123651
+
+--------------------------------------------------------------------
+
+**v124123651
+
+- Merge pull request 'Bugfixes' (#171) from bugfixes into master
+- config: crowdin
+- chore: can links be empty ?
+- fix: Context issues in article fragment.
+- fix: Context issues in fragment sheet.
+- fix: build.
+- chore: compile issue fix.
+- chore: filter some bugs.
+- bugfix: catch users using something other than selfoss.
+- bugfix: No browser, no link.
+- translations
+- chore: remove log.
+- translation
+- Changelog for v124123641
+
+--------------------------------------------------------------------
+
+**v124123641
+
+- Chore: no tests on build.
+- Merge pull request 'testing' (#170) from testing into master
+- fix: Displaying fixes. Fixes #155
+- test: coverage
+- chore: update and use multiplatform datetime
+- Changelog for v124123421
+
+--------------------------------------------------------------------
+
+**v124123421
+
+- fix: Trying to fix the serialization issue.
+- Changelog for v124113311
+
+--------------------------------------------------------------------
+
+**v124113311
+
+- chore: update versions. (#165)
+- chore: fastlane changelog.
+- chore: fastlane fixes.
+- Changelog for v124113301
+
+--------------------------------------------------------------------
+
+**v124113301**
+
+- chore: Gitea Action
+- Merge pull request 'chore: Gitea Action' (#164) from runner into master
+- chore: Gitea Action
+- chore: Readme update.
+
+--------------------------------------------------------------------
+
 **v124041081**
 
 - chore: comment.