Jetpack Compose Migration (#207)

* Note Signed-off-by: Arnau Mora <[email protected]> * Migrate to Kotlin DSL (#19) Signed-off-by: Arnau Mora <[email protected]> * Upgrade all dependencies (#22) * Upgrade to Android 14 (#21) Signed-off-by: Arnau Mora <[email protected]> * Rewrite CredentialsFragment to compose (#26) * Update import (#27) * Update README.md * Fix NPE on adding subscription (#33) Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Arnau Mora <[email protected]> * Make CredentialsFragment into a composable (#35) * Using regular ubuntu image Signed-off-by: Arnau Mora <[email protected]> * Migrate SubscriptionSettingsFragment to compose (#29) * Migrate `AddCalendarValidationFragment` to Jetpack Compose (#31) Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Migrate `AddCalendarEnterUrlFragment` to Jetpack Compose (#38) Signed-off-by: Arnau Mora <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Migrate AddCalendarDetailsFragment to compose (#40) * Upgrade AGP to 8.2.1 (#42) Signed-off-by: Arnau Mora Gras <[email protected]> * Upgrade Kotlin, KSP, Compose and others (#43) Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Migrate `AddCalendarActivity` to Jetpack Compose (#45) Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Added missing line break (#52) * Remove unused view and layout (#54) Signed-off-by: Arnau Mora Gras <[email protected]> * Added Dependabot (#51) * Bump github/codeql-action from 2 to 3 (#62) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/checkout from 3 to 4 (#61) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-java from 3 to 4 (#58) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump joda-time:joda-time from 2.12.5 to 2.12.6 (#56) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump androidx.work:work-testing from 2.8.1 to 2.9.0 (#60) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Using BOM for OkHttp and downgrade to stable (#64) Signed-off-by: Arnau Mora Gras <[email protected]> * Migrate EditCalendarActivity to jetpack compose (#46) * Bump actions/cache from 3 to 4 (#65) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.android.tools.build:gradle from 8.2.1 to 8.2.2 (#66) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump androidx.compose.runtime:runtime-livedata from 1.5.4 to 1.6.0 (#78) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump androidx.compose:compose-bom from 2023.10.01 to 2024.01.00 (#79) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.google.accompanist:accompanist-themeadapter-material from 0.32.0 to 0.34.0 (#80) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Arnau Mora <[email protected]> * Bump gradle/gradle-build-action from 2 to 3 (#82) Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Arnau Mora <[email protected]> * Fix: Can't add subscription after going back once (#83) * Update ical4android and cert4android (#73) Signed-off-by: Arnau Mora <[email protected]> * Cleanup of Dialogs (#67) Signed-off-by: Arnau Mora <[email protected]> Signed-off-by: Arnau Mora Gras <[email protected]> * Bump actions/upload-artifact from 2 to 4 (#63) Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Arnau Mora <[email protected]> * Migrate `DonateDialogFragment` to Jetpack Compose (#75) Signed-off-by: Arnau Mora <[email protected]> Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Final layout cleanup (#68) Signed-off-by: Arnau Mora <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Ensured toast error is never null (#91) Signed-off-by: Arnau Mora Gras <[email protected]> * Crash when going back into `CalendarListActivity` (standard flavour) (#90) Signed-off-by: Arnau Mora Gras <[email protected]> * Migrate ColorPickerActivity to Jetpack Compose (closes #53, #87) (#94) * Bump androidx.compose:compose-bom from 2024.01.00 to 2024.02.00 (#96) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump androidx.compose.runtime:runtime-livedata from 1.6.0 to 1.6.1 (#95) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump joda-time:joda-time from 2.12.6 to 2.12.7 (#93) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Edit Subscription: requires-auth toggle and credential fields trigger save-dismiss mechanism (#92) Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Arnau Mora Gras <[email protected]> * Removed package definition from manifest (#101) Signed-off-by: Arnau Mora Gras <[email protected]> * Bump com.maxkeppeler.sheets-compose-dialogs:core from 1.2.1 to 1.3.0 (#103) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Use compose theming engine, (drop compatibility MdcTheming etc) (#48) Signed-off-by: Arnau Mora Gras <[email protected]> Signed-off-by: Arnau Mora <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Migrated to Gradle Version Catalog (#99) Signed-off-by: Arnau Mora Gras <[email protected]> * Check if we can reuse more composables and improve project structure (#106) * Bump aboutLibs from 10.7.0 to 10.10.0 (#108) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.jetbrains.kotlinx:kotlinx-coroutines-android from 1.7.3 to 1.8.0 (#110) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Migrate to Material 3 (#109) * Bump compose-ui from 1.6.1 to 1.6.2 (#111) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump androidx.compose.material:material-icons-extended from 1.6.1 to 1.6.2 (#112) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump androidx.compose.runtime:runtime-livedata from 1.6.1 to 1.6.2 (#113) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Arnau Mora <[email protected]> * Quickfix for pull to refresh (#114) Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> * Fix warnings (#115) Signed-off-by: Arnau Mora Gras <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> --------- Signed-off-by: Arnau Mora <[email protected]> Signed-off-by: Arnau Mora Gras <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Sunik Kupfer <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
bitfireAT · Feb 25, 2024 · d833b76 · d833b76
1 parent fdd0aaf
commit d833b76
Show file tree

Hide file tree

Showing 108 changed files with 3,019 additions and 2,912 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "gradle"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -25,25 +25,25 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 17
-    - uses: gradle/gradle-build-action@v2
+    - uses: gradle/actions/setup-gradle@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     - name: Build
       run: ./gradlew --no-daemon app:assembleStandardDebug
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/dependent-issues.yml b/.github/workflows/dependent-issues.yml
@@ -51,4 +51,5 @@ jobs:
           # (Optional) A custom comment body. It supports `{{ dependencies }}` token.
           comment: >
             This PR/issue depends on:
+            
             {{ dependencies }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,14 +10,14 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Prepare keystore
         run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks

diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml
@@ -5,42 +5,42 @@ jobs:
     name: Tests without emulator
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Check
         run: ./gradlew app:lintStandardDebug app:testStandardDebugUnitTest
 
       - name: Archive results
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-unit
           path: |
             app/build/outputs/lint*
             app/build/reports
 
   test_on_emulator:
     name: Tests with emulator
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         api-level: [31]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@v3
 
       - name: Enable KVM group perms
         run: |
@@ -49,7 +49,7 @@ jobs:
             sudo udevadm trigger --name-match=kvm
 
       - name: Cache AVD
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: avd-cache
         with:
           path: |
@@ -80,8 +80,8 @@ jobs:
 
       - name: Archive results
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-instrumented-${{ matrix.api-level }}
           path: |
             app/build/reports
diff --git a/README.md b/README.md
@@ -17,6 +17,11 @@ News and updates: [@[email protected]](https://fosstodon.org/@davx5app)
 
 Help, discussion, ideas, bug reports: [ICSx⁵ forum](https://icsx5.bitfire.at/forums/)
 
+> [!IMPORTANT]
+> 
+> This repository is a fork of the official [ICSx⁵](https://github.com/bitfireAT/icsx5).
+> This is a major rewrite for making sure ICSx⁵ works as it should.
+
 
 
 Contributions

diff --git a/app/build.gradle b/app/build.gradle