Skip to content

Commit fafebe7

Browse files
committed
Merge branch 'develop'
2 parents b9a66a1 + 0f6a823 commit fafebe7

File tree

255 files changed

+3430
-131036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+3430
-131036
lines changed

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
20+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
2121
with:
2222
egress-policy: audit
2323

2424
- name: 'Checkout Repository'
2525
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0
27+
uses: actions/dependency-review-action@38ecb5b593bf0eb19e335c03f97670f792489a8b # v4.7.0

.github/workflows/quality-check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Harden Runner
21-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
21+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
2222
with:
2323
egress-policy: audit
2424

@@ -52,7 +52,7 @@ jobs:
5252
build-mode: manual
5353
steps:
5454
- name: Harden Runner
55-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
55+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
5656
with:
5757
egress-policy: audit
5858

@@ -69,7 +69,7 @@ jobs:
6969

7070
# Initializes the CodeQL tools for scanning.
7171
- name: Initialize CodeQL
72-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
72+
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
7373
with:
7474
languages: ${{ matrix.language }}
7575
build-mode: ${{ matrix.build-mode }}
@@ -83,6 +83,6 @@ jobs:
8383
./flutterw build apk --profile -t lib/main_play.dart --flavor play
8484
8585
- name: Perform CodeQL Analysis
86-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
86+
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
8787
with:
8888
category: "/language:${{matrix.language}}"

.github/workflows/release.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
id-token: write
1919
steps:
2020
- name: Harden Runner
21-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
21+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
2222
with:
2323
egress-policy: audit
2424

@@ -43,15 +43,20 @@ jobs:
4343
# `KEY_JKS` should contain the result of:
4444
# gpg -c --armor keystore.jks
4545
# `KEY_JKS_PASSPHRASE` should contain the passphrase used for the command above
46+
# The SkSL bundle must be produced with the same Flutter engine as the one used to build the artifact
47+
# flutter build <subcommand> --bundle-sksl-path shaders.sksl.json
48+
# do not bundle shaders for izzy/libre flavours, to avoid crashes in some environments:
49+
# cf https://github.com/deckerst/aves/issues/388
50+
# cf https://github.com/deckerst/aves/issues/398
4651
run: |
4752
echo "${{ secrets.KEY_JKS }}" > release.keystore.asc
4853
gpg -d --passphrase "${{ secrets.KEY_JKS_PASSPHRASE }}" --batch release.keystore.asc > $AVES_STORE_FILE
4954
rm release.keystore.asc
5055
mkdir outputs
5156
scripts/apply_flavor_play.sh
52-
./flutterw build appbundle -t lib/main_play.dart --flavor play
57+
./flutterw build appbundle -t lib/main_play.dart --flavor play --bundle-sksl-path shaders.sksl.json
5358
cp build/app/outputs/bundle/playRelease/*.aab outputs
54-
./flutterw build apk -t lib/main_play.dart --flavor play
59+
./flutterw build apk -t lib/main_play.dart --flavor play --bundle-sksl-path shaders.sksl.json
5560
cp build/app/outputs/apk/play/release/*.apk outputs
5661
scripts/apply_flavor_izzy.sh
5762
./flutterw build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi
@@ -70,7 +75,7 @@ jobs:
7075
AVES_GOOGLE_API_KEY: ${{ secrets.AVES_GOOGLE_API_KEY }}
7176

7277
- name: Generate artifact attestation
73-
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
78+
uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
7479
with:
7580
subject-path: 'outputs/*'
7681

@@ -93,15 +98,15 @@ jobs:
9398
runs-on: ubuntu-latest
9499
steps:
95100
- name: Harden Runner
96-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
101+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
97102
with:
98103
egress-policy: audit
99104

100105
- name: Checkout repository
101106
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
102107

103108
- name: Get appbundle from artifacts
104-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
109+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
105110
with:
106111
name: appbundle
107112

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Harden Runner
34-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
34+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
3535
with:
3636
egress-policy: audit
3737

@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
74+
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
7575
with:
7676
sarif_file: results.sarif

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,6 @@ app.*.map.json
4747
# screenshot generation
4848
/test_driver/assets/screenshots/
4949
/screenshots/
50+
51+
# generated files
52+
/lib/l10ngen/app_localizations*

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
44

55
## <a id="unreleased"></a>[Unreleased]
66

7+
## <a id="v1.13.0"></a>[v1.13.0] - 2025-05-12
8+
9+
### Added
10+
11+
- Albums: groups
12+
- Collection: sort by storage path
13+
- Search: week day filters
14+
15+
### Changed
16+
17+
- revert to Skia rendering engine
18+
719
## <a id="v1.12.10"></a>[v1.12.10] - 2025-04-16
820

921
### Added

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,6 @@
331331
android:value="2" />
332332
<meta-data
333333
android:name="io.flutter.embedding.android.EnableImpeller"
334-
android:value="true" />
334+
android:value="false" />
335335
</application>
336336
</manifest>

android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataFetchHandler.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
10071007
result.success(metadataMap)
10081008
}
10091009

1010-
// return description from these fields (by precedence):
1010+
// returns description from these fields (by precedence):
10111011
// - XMP / dc:description
10121012
// - IPTC / caption-abstract
10131013
// - Exif / UserComment
@@ -1192,8 +1192,8 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
11921192
result.success(null)
11931193
}
11941194

1195-
// return XMP components
1196-
// return an empty list if there is no XMP
1195+
// returns XMP components
1196+
// returns an empty list if there is no XMP
11971197
private fun getXmp(call: MethodCall, result: MethodChannel.Result) {
11981198
val mimeType = call.argument<String>("mimeType")
11991199
val uri = call.argument<String>("uri")?.toUri()

android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/RegionFetcher.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import kotlin.math.roundToInt
3131
class RegionFetcher internal constructor(
3232
private val context: Context,
3333
) {
34-
// return decoded bytes in ARGB_8888, with trailer bytes:
34+
// returns decoded bytes in ARGB_8888, with trailer bytes:
3535
// - width (int32)
3636
// - height (int32)
3737
fun fetch(

android/app/src/main/res/values-el/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
<string name="analysis_channel_name">Σάρωση πολυμέσων</string>
99
<string name="analysis_notification_default_title">Σάρωση στοιχείων</string>
1010
<string name="analysis_notification_action_stop">Διακοπή</string>
11-
</resources>
11+
<string name="map_shortcut_short_label">Χάρτης</string>
12+
</resources>

0 commit comments

Comments
 (0)