Merge branch 'develop'

.flutter

@@ -1 +1 @@
-Subproject commit efbf63d9c66b9f6ec30e9ad4611189aa80003d31
+Subproject commit e1e47221e86272429674bec4f1bd36acc4fc7b77

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
+## <a id="v1.9.2"></a>[v1.9.2] - 2023-08-24
+
+### Changed
+
+- upgraded Flutter to stable v3.13.1
+- building without FFmpeg `neon` libs
+- building with gradle toolchain resolver plugin
+
 ## <a id="v1.9.1"></a>[v1.9.1] - 2023-08-22
 
 ### Fixed

android/app/build.gradle

@@ -63,6 +63,13 @@ android {
         disable 'InvalidPackage'
     }
 
+    packagingOptions {
+        // The Amazon Developer console mistakenly considers the app to not be 64-bit compatible
+        // if there are some libs in `lib/armeabi-v7a` unmatched by libs in `lib/arm64-v8a`,
+        // so we exclude the extra `neon` libs bundled by `FFmpegKit`.
+        exclude 'lib/armeabi-v7a/*_neon.so'
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }

android/app/src/main/AndroidManifest.xml

@@ -32,20 +32,16 @@
 
     <!-- to access media with original metadata with scoped storage (API >=29) -->
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
-    <!-- to analyze media in a service -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <!-- to fetch map tiles -->
+    <!-- TODO TLAD still needed to fetch map tiles / reverse geocoding / else ? check in release mode -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- from Android 12 (API 31), users can optionally grant access to the media management special permission -->
     <uses-permission
         android:name="android.permission.MANAGE_MEDIA"
         tools:ignore="ProtectedPermissions" />
-    <!-- to show foreground service progress via notification -->
+    <!-- to show analysis service progress via notification -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <!-- to change wallpaper -->
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
-    <!-- to unlock vaults (API >=28) -->
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <!-- TODO TLAD remove this permission when this is fixed: https://github.com/flutter/flutter/issues/42451 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
@@ -53,11 +49,25 @@
         android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
         android:maxSdkVersion="25" />
 
+    <!-- additional permissions added by plugins:
+
+    `{package}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION` by `androidx.appcompat:appcompat`
+
+    `android.permission.ACCESS_NETWORK_STATE`,
+    `android.permission.FOREGROUND_SERVICE`,
+    `android.permission.RECEIVE_BOOT_COMPLETED`,
+    `android.permission.WAKE_LOCK` by `androidx.work:work-runtime-ktx`, to analyze media in a service
+
+    `android.permission.ACCESS_NETWORK_STATE` by `dev.fluttercommunity.plus.connectivity`, TODO TLAD still needed?
+
+    `android.permission.USE_BIOMETRIC` by `io.flutter.plugins.localauth`, to unlock vaults (API >=28)
+    -->
+
     <!--
     allow install on API 19, despite the `minSdkVersion` declared in dependencies:
     - Google Maps is from API 20
     - the Security library is from API 21
-    - FFmpegKit for Flutter is from API 24
+    - FFmpegKit for Flutter is from API 24 (when not LTS)
     -->
     <uses-sdk tools:overrideLibrary="io.flutter.plugins.googlemaps, androidx.security:security-crypto, com.arthenica.ffmpegkit.flutter" />
 

android/settings.gradle

@@ -1,11 +0,0 @@
-include ':app'
-
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
-
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

android/settings.gradle.kts

@@ -0,0 +1,26 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.4.0")
+}
+
+include(":app")
+
+val localPropertiesFile = File(rootProject.projectDir, "local.properties")
+val properties = java.util.Properties()
+
+assert(localPropertiesFile.exists())
+localPropertiesFile.reader(Charsets.UTF_8).also { reader -> properties.load(reader) }
+
+val flutterSdkPath: String? = properties.getProperty("flutter.sdk")
+assert(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+
+apply {
+    from("$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle")
+}

fastlane/metadata/android/en-US/changelogs/103.txt

@@ -0,0 +1,5 @@
+In v1.9.2:
+- play your animated AVIF, AV1, and HDR videos
+- filter by rating ranges
+- judge tonal distributions with the viewer histogram
+Full changelog available on GitHub

fastlane/metadata/android/en-US/changelogs/10301.txt

@@ -0,0 +1,5 @@
+In v1.9.2:
+- play your animated AVIF, AV1, and HDR videos
+- filter by rating ranges
+- judge tonal distributions with the viewer histogram
+Full changelog available on GitHub

flutterw

@@ -4,7 +4,7 @@
 ##
 ##  Flutter start up script for UN*X
 ##  Version: v1.3.1
-##  Date: 2022-11-26 11:30:13
+##  Date: 2023-08-23 23:34:25
 ##
 ##  Use this flutter wrapper to bundle Flutter within your project to make
 ##  sure everybody builds with the same version.

lib/l10n/app_sk.arb

@@ -278,11 +278,11 @@
   "@videoControlsPlayOutside": {},
   "mapStyleGoogleNormal": "Google mapy",
   "@mapStyleGoogleNormal": {},
-  "mapStyleGoogleHybrid": "Google mapy (Hybridne)",
+  "mapStyleGoogleHybrid": "Google mapy (Hybridné)",
   "@mapStyleGoogleHybrid": {},
   "mapStyleHuaweiNormal": "Mapy Petal",
   "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Mapy Petal (terén)",
+  "mapStyleHuaweiTerrain": "Mapy Petal (Terén)",
   "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "Humanitarian OSM",
   "@mapStyleOsmHot": {},
@@ -899,5 +899,118 @@
   "filePickerShowHiddenFiles": "Ukázať skryté súbory",
   "@filePickerShowHiddenFiles": {},
   "aboutPageTitle": "O aplikácií",
-  "@aboutPageTitle": {}
+  "@aboutPageTitle": {},
+  "vaultLockTypePattern": "Vzor",
+  "@vaultLockTypePattern": {},
+  "vaultLockTypePassword": "Heslo",
+  "@vaultLockTypePassword": {},
+  "settingsVideoEnablePip": "Obraz-v-obraze",
+  "@settingsVideoEnablePip": {},
+  "videoResumptionModeAlways": "Vždy",
+  "@videoResumptionModeAlways": {},
+  "widgetTapUpdateWidget": "Aktualizovať widget",
+  "@widgetTapUpdateWidget": {},
+  "aboutDataUsageCache": "Cache",
+  "@aboutDataUsageCache": {},
+  "maxBrightnessNever": "Nikdy",
+  "@maxBrightnessNever": {},
+  "maxBrightnessAlways": "Vždy",
+  "@maxBrightnessAlways": {},
+  "videoResumptionModeNever": "Nikdy",
+  "@videoResumptionModeNever": {},
+  "albumPickPageTitlePick": "Vyber album",
+  "@albumPickPageTitlePick": {},
+  "albumDownload": "Stiahnuť",
+  "@albumDownload": {},
+  "overlayHistogramLuminance": "Svietivosť",
+  "@overlayHistogramLuminance": {},
+  "storageAccessDialogMessage": "Prosím vyber {directory} - “{volume}” v ďalšom okne aby aplikácia mala prístup k dátam v priečinku.",
+  "@storageAccessDialogMessage": {
+    "placeholders": {
+      "directory": {
+        "type": "String",
+        "description": "the name of a directory, using the output of `rootDirectoryDescription` or `otherDirectoryDescription`"
+      },
+      "volume": {
+        "type": "String",
+        "example": "SD card",
+        "description": "the name of a storage volume"
+      }
+    }
+  },
+  "notEnoughSpaceDialogMessage": "Táto operácia potrebuje {neededSize} voľnej pamäti “{volume}” na dokončenie, dostupných je však iba {freeSize}.",
+  "@notEnoughSpaceDialogMessage": {
+    "placeholders": {
+      "neededSize": {
+        "type": "String",
+        "example": "314 MB"
+      },
+      "freeSize": {
+        "type": "String",
+        "example": "123 MB"
+      },
+      "volume": {
+        "type": "String",
+        "example": "SD card",
+        "description": "the name of a storage volume"
+      }
+    }
+  },
+  "unsupportedTypeDialogMessage": "{count, plural, =1{Táto operácia neni podporovaná pre {types} súbor.} other{Táto operácia neni podporovaná pre {types} súbory.}}",
+  "@unsupportedTypeDialogMessage": {
+    "placeholders": {
+      "count": {},
+      "types": {
+        "type": "String",
+        "example": "GIF, TIFF, MP4",
+        "description": "a list of unsupported types"
+      }
+    }
+  },
+  "albumPickPageTitleExport": "Exportovať do albumu",
+  "@albumPickPageTitleExport": {},
+  "albumPickPageTitleMove": "Presunúť do Albumu",
+  "@albumPickPageTitleMove": {},
+  "overlayHistogramNone": "Žiadne",
+  "@overlayHistogramNone": {},
+  "overlayHistogramRGB": "RGB",
+  "@overlayHistogramRGB": {},
+  "otherDirectoryDescription": "“{name}” priečinok",
+  "@otherDirectoryDescription": {
+    "placeholders": {
+      "name": {
+        "type": "String",
+        "example": "Pictures",
+        "description": "the name of a specific directory"
+      }
+    }
+  },
+  "restrictedAccessDialogMessage": "Táto aplikácia nemôže modifikovať súbory v {directory} - “{volume}”.\n\nProsím použi predinštalovanú aplikáciu na presun súborov do iného priečinka.",
+  "@restrictedAccessDialogMessage": {
+    "placeholders": {
+      "directory": {
+        "type": "String",
+        "description": "the name of a directory, using the output of `rootDirectoryDescription` or `otherDirectoryDescription`"
+      },
+      "volume": {
+        "type": "String",
+        "example": "SD card",
+        "description": "the name of a storage volume"
+      }
+    }
+  },
+  "albumPickPageTitleCopy": "Kopírovať do Albumu",
+  "@albumPickPageTitleCopy": {},
+  "albumCamera": "Kamera",
+  "@albumCamera": {},
+  "albumScreenshots": "Snímky obrazovky",
+  "@albumScreenshots": {},
+  "albumScreenRecordings": "Nahrávania obrazovky",
+  "@albumScreenRecordings": {},
+  "authenticateToConfigureVault": "Na konfiguráciu trezora je potrebné overenie",
+  "@authenticateToConfigureVault": {},
+  "lengthUnitPercent": "%",
+  "@lengthUnitPercent": {},
+  "vaultLockTypePin": "PIN",
+  "@vaultLockTypePin": {}
 }

lib/l10n/app_zh.arb

@@ -189,7 +189,7 @@
   "@filterRecentlyAddedLabel": {},
   "filterRatingRejectedLabel": "拒绝",
   "@filterRatingRejectedLabel": {},
-  "filterTypeAnimatedLabel": "动画",
+  "filterTypeAnimatedLabel": "动图",
   "@filterTypeAnimatedLabel": {},
   "filterTypeMotionPhotoLabel": "动态照片",
   "@filterTypeMotionPhotoLabel": {},
@@ -277,7 +277,7 @@
   "@videoPlaybackSkip": {},
   "videoPlaybackMuted": "静音播放",
   "@videoPlaybackMuted": {},
-  "videoPlaybackWithSound": "带音播放",
+  "videoPlaybackWithSound": "有声播放",
   "@videoPlaybackWithSound": {},
   "themeBrightnessLight": "浅色",
   "@themeBrightnessLight": {},
@@ -825,7 +825,7 @@
   "@settingsViewerSectionTitle": {},
   "settingsViewerGestureSideTapNext": "轻触屏幕边缘显示上/下一个项目",
   "@settingsViewerGestureSideTapNext": {},
-  "settingsViewerUseCutout": "使用剪切区域",
+  "settingsViewerUseCutout": "使用刘海/挖孔区域",
   "@settingsViewerUseCutout": {},
   "settingsViewerMaximumBrightness": "最大亮度",
   "@settingsViewerMaximumBrightness": {},
@@ -879,9 +879,9 @@
   "@settingsSlideshowTransitionTile": {},
   "settingsSlideshowIntervalTile": "时间间隔",
   "@settingsSlideshowIntervalTile": {},
-  "settingsSlideshowVideoPlaybackTile": "视频回放",
+  "settingsSlideshowVideoPlaybackTile": "视频播放",
   "@settingsSlideshowVideoPlaybackTile": {},
-  "settingsSlideshowVideoPlaybackDialogTitle": "视频回放",
+  "settingsSlideshowVideoPlaybackDialogTitle": "视频播放",
   "@settingsSlideshowVideoPlaybackDialogTitle": {},
   "settingsVideoPageTitle": "视频设置",
   "@settingsVideoPageTitle": {},

lib/model/app/dependencies.dart

@@ -69,8 +69,9 @@ class Dependencies {
     ),
     Dependency(
       name: 'Dynamic Color',
-      license: bsd3,
-      sourceUrl: 'https://github.com/material-foundation/material-dynamic-color-flutter',
+      license: apache2,
+      licenseUrl: 'https://github.com/material-foundation/flutter-packages/blob/main/packages/dynamic_color/LICENSE',
+      sourceUrl: 'https://github.com/material-foundation/flutter-packages/tree/main/packages/dynamic_color',
     ),
     Dependency(
       name: 'Floating',

plugins/aves_video_mpv/pubspec.lock

@@ -268,10 +268,10 @@ packages:
     dependency: transitive
     description:
       name: screen_brightness
-      sha256: "62fd61a64e68b32b98b840bad7d8b6822bbc40e63c2b569a5f85528484c86b41"
+      sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.2+1"
   screen_brightness_android:
     dependency: transitive
     description:

pubspec.lock

@@ -1197,10 +1197,10 @@ packages:
     dependency: "direct main"
     description:
       name: screen_brightness
-      sha256: "62fd61a64e68b32b98b840bad7d8b6822bbc40e63c2b569a5f85528484c86b41"
+      sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.2+1"
   screen_brightness_android:
     dependency: transitive
     description:
@@ -1713,4 +1713,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.1.0-185.0.dev <4.0.0"
-  flutter: ">=3.13.0"
+  flutter: ">=3.13.1"

pubspec.yaml

@@ -7,13 +7,13 @@ repository: https://github.com/deckerst/aves
 # - play changelog:   /whatsnew/whatsnew-en-US
 # - izzy changelog:   /fastlane/metadata/android/en-US/changelogs/XXX01.txt
 # - libre changelog:  /fastlane/metadata/android/en-US/changelogs/XXX.txt
-version: 1.9.1+102
+version: 1.9.2+103
 publish_to: none
 
 environment:
   # this project bundles Flutter SDK via `flutter_wrapper`
   # cf https://github.com/passsy/flutter_wrapper
-  flutter: 3.13.0
+  flutter: 3.13.1
   sdk: ">=3.0.0 <4.0.0"
 
 # use `scripts/apply_flavor_{flavor}.sh` to set the right dependencies for the flavor

untranslated.json

@@ -6995,41 +6995,13 @@
   ],
 
   "sk": [
-    "lengthUnitPercent",
-    "maxBrightnessNever",
-    "maxBrightnessAlways",
-    "overlayHistogramNone",
-    "overlayHistogramRGB",
-    "overlayHistogramLuminance",
-    "vaultLockTypePattern",
-    "vaultLockTypePin",
-    "vaultLockTypePassword",
-    "settingsVideoEnablePip",
-    "videoResumptionModeNever",
-    "videoResumptionModeAlways",
-    "widgetTapUpdateWidget",
-    "otherDirectoryDescription",
-    "storageAccessDialogMessage",
-    "restrictedAccessDialogMessage",
-    "notEnoughSpaceDialogMessage",
-    "unsupportedTypeDialogMessage",
-    "authenticateToConfigureVault",
     "videoStreamSelectionDialogTrack",
-    "aboutDataUsageCache",
     "aboutCreditsSectionTitle",
     "sortOrderHighestFirst",
     "sortOrderLowestFirst",
     "albumGroupTier",
     "albumGroupVolume",
     "albumMimeTypeMixed",
-    "albumPickPageTitleCopy",
-    "albumPickPageTitleExport",
-    "albumPickPageTitleMove",
-    "albumPickPageTitlePick",
-    "albumCamera",
-    "albumDownload",
-    "albumScreenshots",
-    "albumScreenRecordings",
     "albumVideoCaptures",
     "albumPageTitle",
     "albumEmpty",

whatsnew/whatsnew-en-US

@@ -1,4 +1,4 @@
-In v1.9.1:
+In v1.9.2:
 - play your animated AVIF, AV1, and HDR videos
 - filter by rating ranges
 - judge tonal distributions with the viewer histogram