Merge remote-tracking branch 'origin/master' into dev

.github/workflows/screenShotTest.yml

@@ -93,7 +93,7 @@ jobs:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}}
             -   name: Archive Espresso results
-                uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+                uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
                 if: ${{ always() }}
                 with:
                     name: Report-${{ matrix.color }}-${{ matrix.scheme }}

.github/workflows/unit-tests.yml

@@ -49,7 +49,7 @@ jobs:
                     fail_ci_if_error: true
             -   name: Upload jacoco artifacts
                 if: ${{ failure() }}
-                uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+                uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
                 with:
                     name: test-results
                     path: app/build/reports/tests/testGplayDebugUnitTest/

app/build.gradle

@@ -259,7 +259,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
+        kotlinCompilerExtensionVersion = "1.5.12"
     }
 }
 
@@ -271,12 +271,12 @@ dependencies {
     }
 
     // Jetpack Compose
-    implementation(platform("androidx.compose:compose-bom:2024.04.00"))
+    implementation(platform("androidx.compose:compose-bom:2024.04.01"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.material3:material3")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.6.5")
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.5'
+    implementation("androidx.compose.ui:ui-tooling-preview:1.6.6")
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.6'
 
     compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
     // remove after entire switch to lib v2

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

@@ -56,6 +56,7 @@
     <string name="assistant_screen_task_types_error_state_message">تعذّر جلب أنواع المهام. قم رجاءً بالتحقُّق من اتصالك بالإنترنت.</string>
     <string name="assistant_screen_top_bar_title">المُساعِد</string>
     <string name="assistant_screen_unknown_task_status_text">غير معروف</string>
+    <string name="assistant_task_detail_screen_input_button_title">مُدخَلات</string>
     <string name="assistant_task_detail_screen_output_button_title">المُخرَجَات</string>
     <string name="associated_account_not_found">الحساب المرتبط غير موجود!</string>
     <string name="auth_access_failed">فشل الوصول لـ: %1$s</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -42,6 +42,7 @@
     <string name="assistant_screen_successful_task_text">Dokončeno</string>
     <string name="assistant_screen_task_delete_success_message">Úloha úspěšně smazána</string>
     <string name="assistant_screen_unknown_task_status_text">Neznámé</string>
+    <string name="assistant_task_detail_screen_input_button_title">Vstup</string>
     <string name="assistant_task_detail_screen_output_button_title">Výstup</string>
     <string name="associated_account_not_found">Související účet nenalezen!</string>
     <string name="auth_access_failed">Přístup se nezdařil: %1$s</string>

app/src/main/res/values-es-rMX/strings.xml

@@ -56,6 +56,8 @@
     <string name="assistant_screen_task_types_error_state_message">No se pudieron obtener los tipos de tareas, por favor, revise su conexión a internet.</string>
     <string name="assistant_screen_top_bar_title">Asistente</string>
     <string name="assistant_screen_unknown_task_status_text">Desconocido</string>
+    <string name="assistant_task_detail_screen_input_button_title">Entrada</string>
+    <string name="assistant_task_detail_screen_output_button_title">Salida</string>
     <string name="associated_account_not_found">¡No se encontró la cuenta asociada!</string>
     <string name="auth_access_failed">Acceso fallido:%1$s</string>
     <string name="auth_account_does_not_exist">La cuenta aún no ha sido agregada a este dispositivo </string>

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

@@ -56,6 +56,8 @@
     <string name="assistant_screen_task_types_error_state_message">Не вдалося отримати типи завдань. Перевірте з\'єднання з мережею.</string>
     <string name="assistant_screen_top_bar_title">Помічник</string>
     <string name="assistant_screen_unknown_task_status_text">Невідомо</string>
+    <string name="assistant_task_detail_screen_input_button_title">Введення</string>
+    <string name="assistant_task_detail_screen_output_button_title">Виведення</string>
     <string name="associated_account_not_found">Пов\'язаний обліковий запис не знайдено!</string>
     <string name="auth_access_failed">Доступ невдалий: %1$s</string>
     <string name="auth_account_does_not_exist">Обліковий запис все ще не створено на цьому пристрої</string>

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

@@ -997,7 +997,7 @@
     <string name="thumbnail_for_new_file_desc">Thumbnail for new file</string>
     <string name="thumbnail_for_existing_file_description">Thumbnail for existing file</string>
     <string name="invalid_url">Invalid URL</string>
-    <string name="conflict_dialog_error">Conflict resolver dialog cannot able to created</string>
+    <string name="conflict_dialog_error">Conflict resolver dialog cannot be created</string>
     <string name="qr_could_not_be_read">QR code could not be read!</string>
     <string name="note_icon_hint">Note icon</string>
     <string name="add_another_public_share_link">Add another link</string>

gradle/verification-metadata.xml

@@ -766,6 +766,11 @@
             <sha256 value="cdb0671aaefe5a52325294eb98f76379fd3e859c31371ba9cdc786a63465fe6a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.compose" name="compose-bom" version="2024.04.01">
+         <artifact name="compose-bom-2024.04.01.pom">
+            <sha256 value="cf9707c211b4c053ffe971616eb358bd7353f429a457527e52018064636282bc" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation-core" version="1.0.0-beta03">
          <artifact name="animation-core-1.0.0-beta03.aar">
             <sha256 value="4626086855eb6582dda9c3050c05bb56632f5a0308a3bb71a0f58def958602ca" origin="Generated by Gradle" reason="Artifact is not signed"/>