Merge branch 'dev' into upgrade-compose-compiler

.github/workflows/release.yml

@@ -22,44 +22,53 @@ jobs:
       - name: Prepare keystore
         run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks
 
-      - name: Build signed packages
+      - name: Build signed package (APK)
         # AboutLibraries 10.6.3 doesn't show any dependencies when configuration cache is used
-        run: ./gradlew --no-configuration-cache --no-daemon app:bundleRelease app:assembleRelease
+        run: ./gradlew --no-configuration-cache --no-daemon app:assembleRelease
         env:
           ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks
           ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
           ANDROID_KEY_ALIAS: ${{ secrets.android_key_alias }}
           ANDROID_KEY_PASSWORD: ${{ secrets.android_key_password }}
 
+      - name: Build signed bundle (AAB)
+        # AboutLibraries 10.6.3 doesn't show any dependencies when configuration cache is used
+        run: ./gradlew --no-configuration-cache --no-daemon app:bundleRelease
+        env:
+          ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
+          ANDROID_KEY_ALIAS: ${{ secrets.upload_key_alias }}
+          ANDROID_KEY_PASSWORD: ${{ secrets.upload_key_password }}
+
       - name: Create Github release (from standard flavor)
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
           files: app/build/outputs/apk/standard/release/*.apk
           generate_release_notes: true
           fail_on_unmatched_files: true
 
-      - uses: cardinalby/git-get-release-action@v1
-        id: get_release
-        env:
-          GITHUB_TOKEN: ${{ github.token }}  # or your personal access token
-        with:
-          id: ${{ steps.create_release.outputs.id }}
+#      - uses: cardinalby/git-get-release-action@v1
+#        id: get_release
+#        env:
+#          GITHUB_TOKEN: ${{ github.token }}  # or your personal access token
+#        with:
+#          id: ${{ steps.create_release.outputs.id }}
 
-      - name: Write release notes
-        run: |
-          mkdir -p release-notes
-          touch release-notes/whatsnew-en-US
-          echo ${{ steps.get_release.outputs.body }} >> release-notes/whatsnew-en-US
+#      - name: Write release notes
+#        run: |
+#          mkdir -p release-notes
+#          touch release-notes/whatsnew-en-US
+#          echo ${{ steps.get_release.outputs.body }} >> release-notes/whatsnew-en-US
 
       - name: Upload to Google Play (gplay flavor)
         uses: r0adkll/upload-google-play@v1
         with:
           serviceAccountJsonPlainText: ${{ secrets.google_play_service_account_json }}
           packageName: at.bitfire.icsdroid
-          releaseFiles: app/build/outputs/apk/gplay/release/*.aab
+          releaseFiles: app/build/outputs/bundle/gplayRelease/*.aab
           mappingFile: app/build/outputs/mapping/gplayRelease/mapping.txt
           track: internal
           status: completed
-          whatsNewDirectory: release-notes
+#          whatsNewDirectory: release-notes

app/build.gradle.kts

@@ -18,8 +18,8 @@ android {
         minSdk = 23
         targetSdk = 34
 
-        versionCode = 74
-        versionName = "2.2-beta.2"
+        versionCode = 75
+        versionName = "2.2"
 
         setProperty("archivesBaseName", "icsx5-$versionCode-$versionName")
 

app/src/main/res/values-ca/strings.xml

@@ -11,6 +11,7 @@
   <string name="notification_channel_sync_problem">Problemes de sincronització</string>
   <string name="permissions_grant">Concedir</string>
   <string name="install_browser">Per favor, instal·la un explorador web</string>
+  <string name="required_annotation">Necessari</string>
   <!--CalendarListActivity-->
   <string name="title_activity_calendar_list">Les meues subscripcions</string>
   <string name="calendar_list_empty_info">Per a subscriure\'t a un fil Webcal, prem el botó +, o obre una URL Webcal.</string>
@@ -21,6 +22,9 @@
   <string name="calendar_list_battery_whitelist_title">Optimització de bateria</string>
   <string name="calendar_list_battery_whitelist_text">Les optimitzacions de bateria poden prevenir intervals de sincronització més curts d\'un dia. Estableix %s a \"No optimitzat\"</string>
   <string name="calendar_list_battery_whitelist_open_settings">Obrir configuració</string>
+  <string name="calendar_list_autorevoke_permissions_title">Revoca els permisos automàticament</string>
+  <string name="calendar_list_autorevoke_permissions_text">Android suprimeix els permisos d\'aplicacions que no s\'obren molt a sovint. Per favor, desactiva aquesta opció per a %s.</string>
+  <string name="calendar_list_autorevoke_permissions_instruction">Desactiva \"Posa en pausa l\'activitat a l\'aplicació quan no s\'utilitza\"</string>
   <!--settings, currently in CalendarListActivity-->
   <string name="calendar_list_privacy_policy">Política de privacitat</string>
   <string name="set_sync_interval_title">Estableix el període de sincronització:</string>
@@ -40,15 +44,19 @@
   <string name="add_calendar_authentication_without_https_warning">Altres persones poden interceptar les teues credencials, utilitza HTTPS per a una autentificació segura.</string>
   <string name="add_calendar_created">Subscrit correctament</string>
   <string name="add_calendar_password">Contrassenya</string>
+  <string name="add_calendar_password_hide">Amagar contrasenya</string>
+  <string name="add_calendar_password_show">Mostrar contrasenya</string>
   <string name="add_calendar_requires_authentication">Cal autenticar-se</string>
   <string name="add_calendar_title">Títol i Color</string>
   <string name="add_calendar_title_hint">Nom del calendari</string>
+  <string name="add_calendar_pick_color">Triar color</string>
   <string name="add_calendar_url_text">Introdueix una direcció Webcal:</string>
   <string name="add_calendar_pick_file_text">També pots seleccionar un fitxer de l\'emmagatzematge local.</string>
   <string name="add_calendar_pick_file">Tria un fitxer</string>
   <string name="add_calendar_user_name">Nom d\'usuari</string>
   <string name="add_calendar_validating">Validant el recurs de calendari…</string>
   <string name="add_calendar_alarms_title">Alarmes</string>
+  <string name="add_calendar_alarms_ignore_title">Ignora les alertes integrades al calendari</string>
   <string name="add_calendar_alarms_ignore_description">Si està habilitat, totes les alarmes que vinguen del servidor seran eliminades.</string>
   <string name="add_calendar_alarms_default_all_day_title">Afegeix una alarma per defecte per als esdeveniments de tot el dia</string>
   <string name="default_alarm_dialog_title">Afegir alarma per defecte</string>
@@ -63,6 +71,10 @@
   <string name="edit_calendar_deleted">S\'ha desubscrit correctament</string>
   <string name="edit_calendar_dismiss">Amaga</string>
   <string name="edit_calendar_really_delete">Segur que et vols desubscriure d\'aquest calendari?</string>
+  <string name="edit_calendar_edit">Edita</string>
+  <string name="edit_calendar_need_valid_credentials">Nom d\'usuari i contrasenya necessaris</string>
+  <string name="edit_calendar_need_username">Nom d\'usuari necessari</string>
+  <string name="edit_calendar_need_password">Contrasenya necessaria</string>
   <string name="edit_calendar_save">Desa</string>
   <string name="edit_calendar_saved">Canvis desats</string>
   <string name="edit_calendar_send_url">Envia la URL</string>
@@ -75,6 +87,7 @@
   <!--InfoActivity-->
   <string name="activity_app_info">Informació de l\'app</string>
   <string name="app_info_version">Versió %1$s-%2$s</string>
+  <string name="app_info_copyright">© Ricki Hirner, Bernhard Stockmann (bitfire web engineering GmbH) i contribuïdors</string>
   <string name="app_info_gplv3_note"><![CDATA[\"
 Aquest programa és programari lliure: el podeu redistribuir i/o modificar
 sota els termes de la Llicència Pública General de GNU publicada per

app/src/main/res/values-ru/strings.xml

@@ -22,6 +22,9 @@
   <string name="calendar_list_battery_whitelist_title">Оптимизация батареи</string>
   <string name="calendar_list_battery_whitelist_text">Оптимизация батареи может предотвратить интервалы синхронизации короче одного дня. Установите %s на \"Не оптимизировано\".</string>
   <string name="calendar_list_battery_whitelist_open_settings">Открыть настройки</string>
+  <string name="calendar_list_autorevoke_permissions_title">Автоотзыв разрешений</string>
+  <string name="calendar_list_autorevoke_permissions_text">Android отзывает разрешения у редко используемых приложений. Пожалуйста, отключите отзыв разрешений для %s.</string>
+  <string name="calendar_list_autorevoke_permissions_instruction">Нажмите \"Разрешения\" &gt; снимите флажок \"Удалять разрешения, если приложение не используется\".</string>
   <!--settings, currently in CalendarListActivity-->
   <string name="calendar_list_privacy_policy">Политика конфиденциальности</string>
   <string name="set_sync_interval_title">Задание интервала синхронизации:</string>
@@ -84,6 +87,7 @@
   <!--InfoActivity-->
   <string name="activity_app_info">Информация о приложении</string>
   <string name="app_info_version">Версия %1$s-%2$s</string>
+  <string name="app_info_copyright">© Ricki Hirner, Bernhard Stockmann (bitfire web engineering GmbH) and contributors</string>
   <string name="app_info_gplv3_note"><![CDATA[\"
 Эта программа является свободным программным обеспечением: вы можете распространять ее и/или изменять в соответствии с условиями General Public License GNU, опубликованной Фондом свободного программного обеспечения, либо версии 3 Лицензии, либо (по вашему выбору) любой более поздней версии.
 

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 aboutLibs = "11.1.0"
-agp = "8.3.0"
+agp = "8.3.1"
 androidx-activityCompose = "1.8.2"
 androidx-appCompat = "1.6.1"
 androidx-archCore = "2.2.0"
@@ -18,10 +18,10 @@ commons-lang3 = "3.8.1"
 # Keep in sync with Kotlin version: https://developer.android.com/jetpack/androidx/releases/compose-kotlin
 compose-compiler = "1.5.11"
 compose-dialogs = "1.3.0"
-compose-material = "1.6.3"
+compose-material = "1.6.4"
 compose-material3 = "1.2.1"
-compose-runtime = "1.6.3"
-compose-ui = "1.6.3"
+compose-runtime = "1.6.4"
+compose-ui = "1.6.4"
 desugaring = "2.0.4"
 joda-time = "2.12.7"
 junit = "4.13.2"